diff --git a/README.md b/README.md
index ffbd038b0f..64e3dec08f 100644
--- a/README.md
+++ b/README.md
@@ -196,7 +196,7 @@ section about webpack for links.
 Copyright and License
 -------
 
-Copyright (c) 2011-2023, JEDLSoft
+Copyright (c) 2011-2024, JEDLSoft
 
 Ilib is licensed under the Apache License, Version 2.0 (the "License");
 you may not use this library except in compliance with the License.
diff --git a/bin/zic b/bin/zic
index bdca5ce776..dbe7dc5199 100755
--- a/bin/zic
+++ b/bin/zic
@@ -22,7 +22,7 @@ then
 fi
 if [ "$JAVA_HOME" = "" ]
 then
-	export JAVA_HOME=/usr/lib/jvm/java-11-oracle
+	export JAVA_HOME=/usr/lib/jvm/jdk-17.0.9
 fi
 export CLASSPATH="$JAVA_HOME/lib:$ILIB_HOME/java/output/release/*:$ILIB_HOME/java/lib:$ILIB_HOME/java/lib/*"
 
diff --git a/build.properties b/build.properties
index 0e395a9e5a..a66202ac73 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2023, JEDLSoft
+# Copyright (c) 2012-2024, JEDLSoft
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=14.19.0
\ No newline at end of file
+version=14.20.0
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 08b2da7f5c..cd763847f4 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,13 +1,25 @@
 Release Notes for Version 14
 ============================
 
+Build 029
+-------
+Published as version 14.20.0
+
+New Features:
+* Update to CLDR v44.1 data
+* Update to Unicode Character Database (UCD) version 15.1.0
+* Updated to detect the webOS Platform with `webOSSystem` value. The previous PalmSystem has been renamed.
+
+Bug Fixes:
+* Updated timezone info to 2024a
+
 Build 028
 -------
 Published as version 14.19.0
 
 New Features:
-* Update to CLDR v43.1 data
-* Added new `getCLDRVersion()` API to know the cldr version that the currently adoped on.
+* Updated to CLDR v43.1 data
+* Added new `getCLDRVersion()` API to know the cldr version that the current version of ilib uses
 
 Bug Fixes:
 * Removed docs/localeSpecDoc/ directory which is not maintained.
diff --git a/js/build.xml b/js/build.xml
index c7d60c1ae0..c4868980ba 100644
--- a/js/build.xml
+++ b/js/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 build.xml - build the javascript parts
-Copyright © 2012-2023, JEDLSoft
+Copyright © 2012-2024, JEDLSoft
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -53,7 +53,7 @@ limitations under the License.
     <property name="nm.bin"                         value="${build.base}/../node_modules/.bin"/>
     <property name="jar.ilib"					    value="ilib.jar"/>
     <property name="locales.default"                value="en-AU,en-CA,en-GB,en-IN,en-NG,en-PH,en-PK,en-SG,en-US,en-ZA,de-DE,fr-CA,fr-FR,es-AR,es-ES,es-MX,id-ID,it-IT,ja-JP,ko-KR,pt-BR,ru-RU,tr-TR,vi-VN,zxx-XX,zh-Hans-CN,zh-Hant-HK,zh-Hant-TW,zh-Hans-SG"/>
-    <property name="locales.unittest"               value="aa-DJ,af-NA,agq-CM,ak-GH,am-ET,ar-AE,ar-BH,ar-DJ,ar-DZ,ar-EG,ar-IQ,ar-JO,ar-KW,ar-LB,ar-LY,ar-MA,ar-MR,ar-OM,ar-QA,ar-SA,ar-SD,ar-SY,ar-TN,ar-YE,asa-TZ,as-IN,az-Latn-AZ,bas-CM,be-BY,bem-ZM,bg-BG,bh-IN,bm-ML,bn-IN,br-FR,bs-BS,bs-Cyrl-BA,bs-Latn-BA,bs-ME,ca-FR,cic-US,cop-EG,crh-UA,cs-CZ,da-DK,de-AT,de-CH,de-DE,dz-BT,el-GR,en-AM,en-AU,en-CA,en-ET,en-FM,en-GB,en-GH,en-GM,en-HK,en-IE,en-IN,en-IS,en-KE,en-LK,en-LR,en-MP,en-MV,en-MW,en-MY,en-NG,en-NZ,en-PA,en-PH,en-PK,en-PR,en-RW,en-SD,en-SG,en-SL,en-TZ,en-UG,en-US,en-ZA,en-ZM,es-AR,es-BO,es-CL,es-CO,es-CR,es-DO,es-EC,es-ES,es-GQ,es-GT,es-HN,es-MX,es-NI,es-PA,es-PE,es-PH,es-PR,es-PY,es-SV,es-US,es-UY,es-VE,et-EE,eu-ES,fa-AF,fa-IR,ff-SN,fi-FI,fj-FJ,fo-FO,fr-AD,fr-BE,fr-BF,fr-BJ,fr-CA,fr-CD,fr-CF,fr-CG,fr-CH,fr-CI,fr-CM,fr-DJ,fr-DZ,fr-FR,fr-GA,fr-GN,fr-LB,fr-LU,fr-MG,fr-ML,fr-RW,fr-SN,fr-TG,fr-YT,ga-IE,gl-ES,gu-IN,ha-Latn-NG,he-IL,hi-IN,hr-HR,hr-ME,hu-HU,hy-AZ,hy-AM,id-ID,id-MY,ig-NG,it-CH,it-IT,is-IS,it-SM,ja-JP,ka-GE,ka-IR,kk-Cyrl-KZ,km-KH,kn-IN,ko-KR,ks-Arab-IN,ku-Arab-IQ,ku-Arab-IR,ku-IR,ky-KG,lb-LU,lg-UG,ln-CF,lo-LA,lt-LT,lv-LV,fr-Latn-MA,mi-CK,mk-MK,ml-IN,mm-MM,mn-CN,mn-Cyrl-MN,mr-IN,ms-BN,ms-MY,mt-MT,mus-US,my-MM,ne-NP,nl-BE,nl-NL,nb-NO,nn-NO,no-NO,no-SJ,ojs-CA,om-ET,or-IN,os-RU,pa-Arab,pa-IN,pa-Arab-PK,pl-PL,ps-AF,ps-PK,pt-AO,pt-BR,pt-CV,pt-GW,pt-GQ,pt-MO,pt-MZ,pt-PT,pt-ST,pt-TL,ro-RO,ro-RS,ru-GE,ru-KG,ru-KZ,ru-RU,ru-TM,shi-Tfng-MA,si-LK,sk-SK,sl-SI,sl-SL,so-ET,so-SO,sq-AL,sq-ME,sq-MK,sr-Cyrl-BA,sr-Latn-BA,sr-Latn-RS,sr-Latn-ME,sr-RS,sr-Latn-RS,ss-SZ,ss-ZA,st-LS,sv-FI,sv-SE,sw-KE,sw-UG,ta-IN,ta-LK,ta-MY,ta-SG,te-IN,tg-TJ,th-TH,tk-TM,tr-TR,tr-CY,uk-UA,ur-IN,ur-PK,uz-AF,uz-Arab-AF,uz-Cyrl-UZ,uz-Latn-UZ,uz-UZ,vai-Latn-LR,vi-VN,wo-SN,yo-BJ,yo-NG,zh-Hans-CN,zh-Hant-HK,zh-Hans-HK,zh-Hans-MY,zh-Hant-TW,zh-Hans-MO,zh-Hant-MO,zh-Hans-SG,zh-Hant-US,zu-ZA,zxx-Cyrl-XX,zxx-Hans-XX,zxx-Hebr-XX,zxx-XX,zxx-XA,zxx-XB"/>
+    <property name="locales.unittest"               value="aa-DJ,af-NA,agq-CM,ak-GH,am-ET,ar-AE,ar-BH,ar-DJ,ar-DZ,ar-EG,ar-IQ,ar-JO,ar-KW,ar-LB,ar-LY,ar-MA,ar-MR,ar-OM,ar-QA,ar-SA,ar-SD,ar-SY,ar-TN,ar-YE,asa-TZ,as-IN,az-Latn-AZ,bas-CM,be-BY,bem-ZM,bg-BG,bh-IN,bm-ML,bn-IN,br-FR,bs-BS,bs-Cyrl-BA,bs-Latn-BA,bs-ME,ca-FR,cic-US,cop-EG,crh-UA,cs-CZ,da-DK,de-AT,de-CH,de-DE,dz-BT,el-GR,en-AM,en-AU,en-CA,en-ET,en-FM,en-GB,en-GH,en-GM,en-HK,en-ID,en-IE,en-IN,en-IS,en-KE,en-LK,en-LR,en-MP,en-MV,en-MW,en-MY,en-NG,en-NZ,en-PA,en-PH,en-PK,en-PR,en-RW,en-SD,en-SG,en-SL,en-TZ,en-UG,en-US,en-ZA,en-ZM,es-AR,es-BO,es-CL,es-CO,es-CR,es-CU,es-DO,es-EC,es-ES,es-GQ,es-GT,es-HN,es-MX,es-NI,es-PA,es-PE,es-PH,es-PR,es-PY,es-SV,es-US,es-UY,es-VE,et-EE,eu-ES,fa-AF,fa-IR,ff-SN,fi-FI,fj-FJ,fo-FO,fr-AD,fr-BE,fr-BF,fr-BJ,fr-CA,fr-CD,fr-CF,fr-CG,fr-CH,fr-CI,fr-CM,fr-DJ,fr-DZ,fr-FR,fr-GA,fr-GN,fr-LB,fr-LU,fr-MG,fr-ML,fr-RW,fr-SN,fr-TG,fr-YT,ga-IE,gl-ES,gu-IN,ha-Latn-NG,he-IL,hi-IN,hr-HR,hr-ME,hu-HU,hy-AZ,hy-AM,id-ID,id-MY,ig-NG,it-CH,it-IT,is-IS,it-SM,ja-JP,ka-GE,ka-IR,kk-Cyrl-KZ,km-KH,kn-IN,ko-KR,ks-Arab-IN,ku-Arab-IQ,ku-Arab-IR,ku-IR,kxv-IN,ky-KG,lb-LU,lg-UG,ln-CF,lo-LA,lt-LT,lv-LV,fr-Latn-MA,mi-CK,mic-CA,mk-MK,ml-IN,mm-MM,mn-CN,mn-Cyrl-MN,mr-IN,ms-BN,ms-MY,mt-MT,mus-US,my-MM,ne-NP,nl-BE,nl-NL,nb-NO,nn-NO,no-NO,no-SJ,ojs-CA,om-ET,or-IN,os-RU,pa-Arab,pa-IN,pa-Arab-PK,pl-PL,ps-AF,ps-PK,pt-AO,pt-BR,pt-CV,pt-GW,pt-GQ,pt-MO,pt-MZ,pt-PT,pt-ST,pt-TL,ro-RO,ro-RS,ru-GE,ru-KG,ru-KZ,ru-RU,ru-TM,shi-Tfng-MA,si-LK,sk-SK,sl-SI,sl-SL,so-ET,so-SO,sq-AL,sq-ME,sq-MK,sr-Cyrl-BA,sr-Latn-BA,sr-Latn-RS,sr-Latn-ME,sr-RS,sr-Latn-RS,ss-SZ,ss-ZA,st-LS,sv-FI,sv-SE,sw-KE,sw-UG,ta-IN,ta-LK,ta-MY,ta-SG,te-IN,tg-TJ,th-TH,tk-TM,tr-TR,tr-CY,uk-UA,ur-IN,ur-PK,uz-AF,uz-Arab-AF,uz-Cyrl-UZ,uz-Latn-UZ,uz-UZ,vai-Latn-LR,vi-VN,wo-SN,yo-BJ,yo-NG,zh-Hans-CN,zh-Hant-HK,zh-Hans-HK,zh-Hans-MY,zh-Hant-TW,zh-Hans-MO,zh-Hant-MO,zh-Hans-SG,zh-Hant-US,zu-ZA,zxx-Cyrl-XX,zxx-Hans-XX,zxx-Hebr-XX,zxx-XX,zxx-XA,zxx-XB"/>
     <property name="locales.demo"                   value="aa-DJ,af-NA,af-ZA,agq-CM,ak-GH,am-ET,ar-AE,ar-BH,ar-DJ,ar-DZ,ar-EG,ar-IQ,ar-JO,ar-KW,ar-LB,ar-LY,ar-MA,ar-MR,ar-OM,ar-QA,ar-SA,ar-SD,ar-SY,ar-TN,ar-YE,as-IN,asa-TZ,az-AZ,bas-CM,be-BY,bem-ZM,bg-BG,bh-IN,bm-ML,bn-IN,br-FR,bs-Cyrl-BA,bs-Latn-BA,bs-ME,ca-FR,cop-EG,crh-UA,cs-CZ,da-DK,de-AT,de-CH,de-DE,el-GR,en-AU,en-CA,en-ET,en-GB,en-GH,en-GM,en-HK,en-IE,en-IN,en-KE,en-LK,en-LR,en-MV,en-MW,en-MY,en-NG,en-NZ,en-PH,en-PK,en-PR,en-RW,en-SG,en-SL,en-TZ,en-UG,en-US,en-ZA,en-ZM,es-AR,es-CO,es-CR,es-DO,es-EC,es-ES,es-GQ,es-GT,es-HN,es-MX,es-PH,es-SV,es-UY,es-VE,et-EE,eu-ES,fa-AF,fa-IR,ff-SN,fi-FI,fj-FJ,fr-AD,fr-BE,fr-BF,fr-BJ,fr-CA,fr-CD,fr-CF,fr-CG,fr-CH,fr-CI,fr-CM,fr-DJ,fr-DZ,fr-FR,fr-GA,fr-GN,fr-LB,fr-LU,fr-MG,fr-ML,fr-RW,fr-SN,fr-TG,fr-YT,ga-IE,gl-ES,gu-IN,ha-Latn-NG,he-IL,hi-IN,hr-HR,hr-ME,hu-HU,hy-AM,hy-AZ,id-ID,id-MY,ig-NG,it-CH,it-IT,is-IS,it-SM,ja-JP,ka-GE,ka-IR,kk-Cyrl-KZ,km-KH,kn-IN,ko-KR,ks-Arab-IN,ku-IR,ky-KG,lb-LU,lg-UG,ln-CF,lo-LA,lt-LT,lv-LV,mi-CK,mk-MK,ml-IN,mn-CN,mr-IN,ms-BN,ms-MY,mt-MT,my-MM,nb-NO,ne-IN,ne-NP,nl-BE,nl-CW,nl-GF,nl-NL,nl-SR,no-BV,no-NO,no-SJ,ojs-CA,om-ET,or-IN,os-RU,pa-Arab-PK,pl-PL,ps-AF,ps-PK,pt-AO,pt-BR,pt-CV,pt-GW,pt-MO,pt-MZ,pt-PT,pt-ST,pt-TL,ro-RO,ro-RS,ru-KG,ru-KZ,ru-RU,ru-TM,si-LK,sk-SK,sl-SI,so-ET,so-SO,sq-AL,sq-ME,sq-MK,sr-Cyrl-BA,sr-Latn-BA,sr-Latn-ME,sr-Latn-RS,sr-RS,ss-SZ,ss-ZA,st-LS,sv-FI,sv-SE,sw-UG,ta-LK,ta-MY,ta-SG,te-IN,tg-TJ,th-TH,tk-TM,tr-TR,tr-CY,uk-UA,ur-IN,ur-PK,uz-AF,uz-Arab-AF,uz-Cyrl-UZ,uz-Latn-UZ,vai-Latn-LR,vi-VN,wo-SN,yo-BJ,yo-NG,zh-Hans-CN,zh-Hans-MO,zh-Hans-MY,zh-Hans-SG,zh-Hant-HK,zh-Hant-TW,zh-Hant-US,zu-ZA,zxx-Cyrl-XX,zxx-Hans-XX,zxx-Hebr-XX,zxx-XX"/>
     <property name="keep.these.comments"            value="/(\!data|\!loadLocaleData|\!defineLocaleData|\!macro|eslint-)/"/>
 
diff --git a/js/data/locale/aa/unitfmt.json b/js/data/locale/aa/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/aa/unitfmt.json
+++ b/js/data/locale/aa/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ab/unitfmt.json b/js/data/locale/ab/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ab/unitfmt.json
+++ b/js/data/locale/ab/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/af/unitfmt.json b/js/data/locale/af/unitfmt.json
index 688ef517a0..cbb160e93c 100644
--- a/js/data/locale/af/unitfmt.json
+++ b/js/data/locale/af/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfeer|#{n} atmosfere",
             "bar": "#{n} bar",
             "barrel": "one#{n} vat|#{n} vate",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bis",
             "bit-per-second": "#{n} bis per sekonde",
             "british-thermal-unit": "one#{n} Britse termiese eenheid|#{n} Britse termiese eenhede",
@@ -42,7 +43,7 @@
             "degree": "one#{n} graad|#{n} grade",
             "dessert-spoon": "#{n} dessertlepel",
             "dessert-spoon-imperial": "#{n} Engelse dessertlepel",
-            "dot": "#{n} stippel",
+            "dot": "one#{n} stippel|#{n} stippels",
             "dot-per-centimeter": "one#{n} stippel per sentimeter|#{n} stippels per sentimeter",
             "dot-per-inch": "one#{n} stippel per duim|#{n} stippels per duim",
             "dram": "#{n} dragme",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm.",
             "bar": "#{n} bar",
             "barrel": "one#{n} vat|#{n} vate",
+            "beaufort": "#B {n}",
             "bit": "#{n} bis",
             "bit-per-second": "#{n} bis/s.",
             "british-thermal-unit": "#{n} BTE",
@@ -248,7 +250,7 @@
             "degree": "#{n} gr.",
             "dessert-spoon": "#{n} dstlpl.",
             "dessert-spoon-imperial": "#{n} dstlpl. Eng.",
-            "dot": "#{n} px",
+            "dot": "",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dr. vl.",
diff --git a/js/data/locale/agq/ctrynames.json b/js/data/locale/agq/ctrynames.json
index 2d51cf4dba..99fbe6bebe 100644
--- a/js/data/locale/agq/ctrynames.json
+++ b/js/data/locale/agq/ctrynames.json
@@ -37,6 +37,7 @@
     "Bosɨnyìa à Hɛ̀zɛ̀gòvinà": "BA",
     "Bòtɨ̀swǎnà": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bùkinà Fasò": "BF",
     "Bùlundì": "BI",
     "Bùugɛlìa": "BG",
@@ -67,7 +68,6 @@
     "Dɛ̀mùkàlatì Lèkpubèlè è Kuŋgù": "CD",
     "Dɛnɨmà": "DK",
     "Diego Garcia": "DG",
-    "Dɨŋò kɨ dzughùnstòʔ kɨ Endìa kɨ Bɨ̀letì kò": "IO",
     "Dòmenekà": "DM",
     "Dòmenekà Lèkpubèlè": "DO",
     "Dzàkpân": "JP",
diff --git a/js/data/locale/agq/ctryreverse.json b/js/data/locale/agq/ctryreverse.json
index 4dea6e56e8..aa63643279 100644
--- a/js/data/locale/agq/ctryreverse.json
+++ b/js/data/locale/agq/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Ezɨ̀lɛ̂",
     "IM": "Isle of Man",
     "IN": "Endìa",
-    "IO": "Dɨŋò kɨ dzughùnstòʔ kɨ Endìa kɨ Bɨ̀letì kò",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Èlâkɨ̀",
     "IR": "Èlân",
     "IS": "Aesɨ̀lân",
diff --git a/js/data/locale/agq/unitfmt.json b/js/data/locale/agq/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/agq/unitfmt.json
+++ b/js/data/locale/agq/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ak/ctrynames.json b/js/data/locale/ak/ctrynames.json
index b77db7257d..3c85ccca6f 100644
--- a/js/data/locale/ak/ctrynames.json
+++ b/js/data/locale/ak/ctrynames.json
@@ -42,7 +42,7 @@
     "Bɔtswana": "BW",
     "Brazil": "BR",
     "Britainfo Virgin Islands": "VG",
-    "Britenfo Hɔn Man Wɔ India Po No Mu": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brunae": "BN",
     "Burundi": "BI",
     "Butan": "BT",
diff --git a/js/data/locale/ak/ctryreverse.json b/js/data/locale/ak/ctryreverse.json
index 6a39b2168b..d96d869ef5 100644
--- a/js/data/locale/ak/ctryreverse.json
+++ b/js/data/locale/ak/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Britenfo Hɔn Man Wɔ India Po No Mu",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Aesland",
diff --git a/js/data/locale/ak/unitfmt.json b/js/data/locale/ak/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ak/unitfmt.json
+++ b/js/data/locale/ak/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/am/ctrynames.json b/js/data/locale/am/ctrynames.json
index 090d428b24..ae51675b6f 100644
--- a/js/data/locale/am/ctrynames.json
+++ b/js/data/locale/am/ctrynames.json
@@ -32,14 +32,13 @@
     "ሜላኔዥያ": "054",
     "ሜክሲኮ": "MX",
     "ሜይኦቴ": "YT",
-    "ምስራቃዊ አውሮፓ": "155",
     "ምስራቃዊ አፍሪካ": "011",
     "ምስራቃዊ እስያ": "030",
+    "ምስራቅ አውሮፓ": "151",
+    "ምስራቅ አፍሪካ": "014",
     "ምዕራባዊ ሳህራ": "EH",
-    "ምዕራባዊ አውሮፓ": "151",
-    "ምዕራባዊ አፍሪካ": "014",
     "ምዕራባዊ እስያ": "145",
-    "ምዕራባዊ ደቡብ እሲያ": "035",
+    "ምዕራብ አውሮፓ": "155",
     "ሞልዶቫ": "MD",
     "ሞሪሸስ": "MU",
     "ሞሪቴኒያ": "MR",
@@ -66,7 +65,6 @@
     "ሱዋዚላንድ": "SZ",
     "ሱዳን": "SD",
     "ሲሪላንካ": "LK",
-    "ሲሪያ": "SY",
     "ሲሼልስ": "SC",
     "ሲንት ማርተን": "SX",
     "ሲንጋፖር": "SG",
@@ -87,6 +85,7 @@
     "ስዊዘርላንድ": "CH",
     "ስዊድን": "SE",
     "ስፔን": "ES",
+    "ሶሪያ": "SY",
     "ቅዱስ በርቴሎሜ": "BL",
     "ቅዱስ ቪንሴንት እና ግሬናዲንስ": "VC",
     "ቅዱስ ኪትስ እና ኔቪስ": "KN",
@@ -181,7 +180,7 @@
     "እስራኤል": "IL",
     "ኦማን": "OM",
     "ኦስትሪያ": "AT",
-    "ኦሽኒአ": "009",
+    "ኦሺንያ": "009",
     "ከሰሃራ በታች አፍሪካ": "202",
     "ኩራሳዎ": "CW",
     "ኩባ": "CU",
@@ -195,7 +194,7 @@
     "ካዛኪስታን": "KZ",
     "ካይማን ደሴቶች": "KY",
     "ኬንያ": "KE",
-    "ኬፕ ቬርዴ": "CV",
+    "ኬፕቨርዴ": "CV",
     "ክሊፐርቶን ደሴት": "CP",
     "ክሪስማስ ደሴት": "CX",
     "ክሮኤሽያ": "HR",
@@ -204,7 +203,7 @@
     "ኮሞሮስ": "KM",
     "ኮስታሪካ": "CR",
     "ኮሶቮ": "XK",
-    "ኮት ዲቯር": "CI",
+    "ኮትዲቯር": "CI",
     "ኮንጎ ብራዛቪል": "CG",
     "ኮንጎ-ኪንሻሳ": "CD",
     "ኮኮስ(ኬሊንግ) ደሴቶች": "CC",
@@ -246,6 +245,7 @@
     "ደቡባዊ አውሮፓ": "039",
     "ደቡባዊ አፍሪካ": "018",
     "ደቡባዊ እሲያ": "034",
+    "ደቡብ ምስራቅ እሲያ": "035",
     "ደቡብ ሱዳን": "SS",
     "ደቡብ አሜሪካ": "005",
     "ደቡብ አፍሪካ": "ZA",
@@ -269,7 +269,7 @@
     "ጉዋደሉፕ": "GP",
     "ጉያና": "GY",
     "ጊኒ": "GN",
-    "ጊኒ ቢሳኦ": "GW",
+    "ጊኒ-ቢሳው": "GW",
     "ጋምቢያ": "GM",
     "ጋቦን": "GA",
     "ጋና": "GH",
diff --git a/js/data/locale/am/ctryreverse.json b/js/data/locale/am/ctryreverse.json
index c4c252b3a5..39e28603b6 100644
--- a/js/data/locale/am/ctryreverse.json
+++ b/js/data/locale/am/ctryreverse.json
@@ -3,10 +3,10 @@
     "002": "አፍሪካ",
     "003": "ሰሜን አሜሪካ",
     "005": "ደቡብ አሜሪካ",
-    "009": "ኦሽኒአ",
+    "009": "ኦሺንያ",
     "011": "ምስራቃዊ አፍሪካ",
     "013": "መካከለኛው አሜሪካ",
-    "014": "ምዕራባዊ አፍሪካ",
+    "014": "ምስራቅ አፍሪካ",
     "015": "ሰሜናዊ አፍሪካ",
     "017": "መካከለኛው አፍሪካ",
     "018": "ደቡባዊ አፍሪካ",
@@ -15,7 +15,7 @@
     "029": "ካሪቢያን",
     "030": "ምስራቃዊ እስያ",
     "034": "ደቡባዊ እሲያ",
-    "035": "ምዕራባዊ ደቡብ እሲያ",
+    "035": "ደቡብ ምስራቅ እሲያ",
     "039": "ደቡባዊ አውሮፓ",
     "053": "አውስትራሌዥያ",
     "054": "ሜላኔዥያ",
@@ -25,9 +25,9 @@
     "143": "መካከለኛው እሲያ",
     "145": "ምዕራባዊ እስያ",
     "150": "አውሮፓ",
-    "151": "ምዕራባዊ አውሮፓ",
+    "151": "ምስራቅ አውሮፓ",
     "154": "ሰሜናዊ አውሮፓ",
-    "155": "ምስራቃዊ አውሮፓ",
+    "155": "ምዕራብ አውሮፓ",
     "202": "ከሰሃራ በታች አፍሪካ",
     "419": "ላቲን አሜሪካ",
     "AC": "አሴንሽን ደሴት",
@@ -74,7 +74,7 @@
     "CF": "ማዕከላዊ አፍሪካ ሪፑብሊክ",
     "CG": "ኮንጎ ብራዛቪል",
     "CH": "ስዊዘርላንድ",
-    "CI": "ኮት ዲቯር",
+    "CI": "ኮትዲቯር",
     "CK": "ኩክ ደሴቶች",
     "CL": "ቺሊ",
     "CM": "ካሜሩን",
@@ -84,7 +84,7 @@
     "CQ": "Sark",
     "CR": "ኮስታሪካ",
     "CU": "ኩባ",
-    "CV": "ኬፕ ቬርዴ",
+    "CV": "ኬፕቨርዴ",
     "CW": "ኩራሳዎ",
     "CX": "ክሪስማስ ደሴት",
     "CY": "ሳይፕረስ",
@@ -129,7 +129,7 @@
     "GS": "ደቡብ ጆርጂያ እና የደቡብ ሳንድዊች ደሴቶች",
     "GT": "ጉዋቲማላ",
     "GU": "ጉዋም",
-    "GW": "ጊኒ ቢሳኦ",
+    "GW": "ጊኒ-ቢሳው",
     "GY": "ጉያና",
     "HK": "ሆንግ ኮንግ ልዩ የአስተዳደር ክልል ቻይና",
     "HM": "ኽርድ ደሴቶችና ማክዶናልድ ደሴቶች",
@@ -250,7 +250,7 @@
     "ST": "ሳኦ ቶሜ እና ፕሪንሲፔ",
     "SV": "ኤል ሳልቫዶር",
     "SX": "ሲንት ማርተን",
-    "SY": "ሲሪያ",
+    "SY": "ሶሪያ",
     "SZ": "ሱዋዚላንድ",
     "TA": "ትሪስታን ዲ ኩንሃ",
     "TC": "የቱርኮችና የካኢኮስ ደሴቶች",
diff --git a/js/data/locale/am/list.json b/js/data/locale/am/list.json
index aa2af57b2e..d129d904c1 100644
--- a/js/data/locale/am/list.json
+++ b/js/data/locale/am/list.json
@@ -1,25 +1,25 @@
 {
     "or": {
         "full": {
-            "2": "{0} ወይም {1}",
+            "2": "{0} ወይም {1}",
             "end": "{0}፣ ወይም {1}",
             "middle": "{0}፣ {1}",
             "start": "{0}፣ {1}"
         },
         "long": {
-            "2": "{0} ወይም {1}",
+            "2": "{0} ወይም {1}",
             "end": "{0}፣ ወይም {1}",
             "middle": "{0}፣ {1}",
             "start": "{0}፣ {1}"
         },
         "medium": {
-            "2": "{0} ወይም {1}",
+            "2": "{0} ወይም {1}",
             "end": "{0}፣ ወይም {1}",
             "middle": "{0}፣ {1}",
             "start": "{0}፣ {1}"
         },
         "short": {
-            "2": "{0} ወይም {1}",
+            "2": "{0} ወይም {1}",
             "end": "{0}፣ ወይም {1}",
             "middle": "{0}፣ {1}",
             "start": "{0}፣ {1}"
@@ -28,26 +28,27 @@
     "standard": {
         "full": {
             "2": "{0} እና {1}",
-            "end": "{0}, እና {1}",
+            "end": "{0}፣ እና {1}",
             "middle": "{0}፣ {1}",
             "start": "{0}፣ {1}"
         },
         "long": {
             "2": "{0} እና {1}",
-            "end": "{0}, እና {1}",
+            "end": "{0}፣ እና {1}",
             "middle": "{0}፣ {1}",
             "start": "{0}፣ {1}"
         },
         "medium": {
             "2": "{0} እና {1}",
-            "end": "{0}, እና {1}",
+            "end": "{0}፣ እና {1}",
             "middle": "{0}፣ {1}",
             "start": "{0}፣ {1}"
         },
         "short": {
             "2": "{0} እና {1}",
             "end": "{0}, እና {1}",
-            "middle": "{0}፣ {1}"
+            "middle": "{0}፣ {1}",
+            "start": "{0}፣ {1}"
         }
     },
     "unit": {
diff --git a/js/data/locale/am/sysres.json b/js/data/locale/am/sysres.json
index 4556843f40..f9448917ee 100644
--- a/js/data/locale/am/sysres.json
+++ b/js/data/locale/am/sysres.json
@@ -66,13 +66,13 @@
     "1#in 1 year|#in {num} years": "one#በ{num} ዓመታት ውስጥ|#በ{num} ዓመታት ውስጥ",
     "1#in 1 yr|#in {num} yrs": "one#በ{num} ዓመታት ውስጥ|#በ{num} ዓመታት ውስጥ",
     "B0": "እኩለ ሌሊት",
-    "B1": "ሌሊት1",
+    "B1": "በሌሊት",
     "B2": "ጥዋት",
-    "B3": "ጥዋት1",
+    "B3": "ጥዋት",
     "B4": "ቀትር",
-    "B5": "ከሰዓት 7 ሰዓት",
+    "B5": "ከሰዓት",
     "B6": "ከሰዓት",
-    "B7": "ማታ1",
+    "B7": "በምሽት",
     "E0": "እ",
     "E0-ethiopic": "እ",
     "E1": "ሰ",
@@ -131,7 +131,7 @@
     "EEEE6-ethiopic": "ቅዳሜ",
     "G-1": "ዓ/ዓ",
     "G1": "መዓ",
-    "MMM1": "ጃንዩ",
+    "MMM1": "ጃን",
     "MMM1-ethiopic": "መስከረም",
     "MMM10": "ኦክቶ",
     "MMM10-ethiopic": "ሰኔ",
@@ -140,7 +140,7 @@
     "MMM12": "ዲሴም",
     "MMM12-ethiopic": "ነሐሴ",
     "MMM13-ethiopic": "ጳጉሜን",
-    "MMM2": "ፌብሩ",
+    "MMM2": "ፌብ",
     "MMM2-ethiopic": "ጥቅምት",
     "MMM3": "ማርች",
     "MMM3-ethiopic": "ኅዳር",
@@ -156,7 +156,7 @@
     "MMM8-ethiopic": "ሚያዝያ",
     "MMM9": "ሴፕቴ",
     "MMM9-ethiopic": "ግንቦት",
-    "MMMM1": "ጃንዩወሪ",
+    "MMMM1": "ጃንዋሪ",
     "MMMM1-ethiopic": "መስከረም",
     "MMMM10": "ኦክቶበር",
     "MMMM10-ethiopic": "ሰኔ",
@@ -165,7 +165,7 @@
     "MMMM12": "ዲሴምበር",
     "MMMM12-ethiopic": "ነሐሴ",
     "MMMM13-ethiopic": "ጳጉሜን",
-    "MMMM2": "ፌብሩወሪ",
+    "MMMM2": "ፌብሩዋሪ",
     "MMMM2-ethiopic": "ጥቅምት",
     "MMMM3": "ማርች",
     "MMMM3-ethiopic": "ኅዳር",
diff --git a/js/data/locale/am/unitfmt.json b/js/data/locale/am/unitfmt.json
index e25655e13c..a328917c1f 100644
--- a/js/data/locale/am/unitfmt.json
+++ b/js/data/locale/am/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} ከባቢ አየር",
             "bar": "one#{n} አሞሌ|#{n} አሞሌዎች",
             "barrel": "one#{n} በርሜል|#{n} በርሜሎች",
+            "beaufort": "#B {n}",
             "bit": "#{n} ቢት",
             "bit-per-second": "#{n} ቢት/ሰከ",
             "british-thermal-unit": "#{n} Btu",
@@ -36,7 +37,6 @@
             "cup-metric": "#{n} mc",
             "dalton": "#{n} ዳተንስ",
             "day": "#{n} ቀናት",
-            "day-person": "#{n} ቀናት",
             "decade": "one#{n} ዓሠርተ-ዓመት|#{n} ዓሠርተ-ዓመታት",
             "deciliter": "#{n} ዴሲ ሊትር",
             "decimeter": "#{n} ዴሲ ሜትር",
@@ -57,7 +57,7 @@
             "fathom": "one#{n} ተዳክሞ|#{n} ተዳክሞዎች",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} Imp. fluid ኦንስስ",
-            "foodcalorie": "#{n} Cal",
+            "foodcalorie": "#{n} ካሎሪ",
             "foot": "#{n} ጫማ",
             "foot-per-second": "#{n} ጫማ/ሰከ",
             "furlong": "#{n} ፈሎን",
@@ -217,6 +217,7 @@
             "atmosphere": "#{n} ከባቢ አየር",
             "bar": "one#{n} አሞሌ|#{n} አሞሌዎች",
             "barrel": "#{n} በርሜል",
+            "beaufort": "#B {n}",
             "bit": "#{n} ቢት",
             "bit-per-second": "#{n} ቢት/ሰከ",
             "british-thermal-unit": "#{n} Btu",
@@ -263,7 +264,7 @@
             "fathom": "#{n} ተዳክሞ",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Cal",
+            "foodcalorie": "#{n} ካሎሪ",
             "foot": "#{n} ጫማ",
             "foot-per-second": "#{n} ጫማ/ሰከ",
             "furlong": "#{n} ፈሎን",
@@ -406,7 +407,7 @@
             "terabyte-per-second": "#{n} ቴራባይት/ሰከ",
             "therm-us": "#{n} US therm",
             "ton": "#{n} ቶን",
-            "tonne": "#{n} t",
+            "tonne": "#{n} ቶ",
             "volt": "#{n} V",
             "watt": "#{n} ዋ",
             "week": "one#{n} ሳምንት|#{n} ሳምንታት",
diff --git a/js/data/locale/an/unitfmt.json b/js/data/locale/an/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/an/unitfmt.json
+++ b/js/data/locale/an/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ann/unitfmt.json b/js/data/locale/ann/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ann/unitfmt.json
+++ b/js/data/locale/ann/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/apc/unitfmt.json b/js/data/locale/apc/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/apc/unitfmt.json
+++ b/js/data/locale/apc/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ar/AE/ctrynames.json b/js/data/locale/ar/AE/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/AE/ctrynames.json
+++ b/js/data/locale/ar/AE/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/AE/ctryreverse.json b/js/data/locale/ar/AE/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/AE/ctryreverse.json
+++ b/js/data/locale/ar/AE/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/AE/numfmt.jf b/js/data/locale/ar/AE/numfmt.jf
index acb1dca3e0..7b7d132601 100644
--- a/js/data/locale/ar/AE/numfmt.jf
+++ b/js/data/locale/ar/AE/numfmt.jf
@@ -7,7 +7,7 @@
         },
         "decimalChar": "٫",
         "digits": "٠١٢٣٤٥٦٧٨٩",
-        "exponential": "اس",
+        "exponential": "أس",
         "groupChar": "٬",
         "negativenumFmt": "؜-{n}",
         "negativepctFmt": "؜-{n}٪؜",
diff --git a/js/data/locale/ar/BH/ctrynames.json b/js/data/locale/ar/BH/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/BH/ctrynames.json
+++ b/js/data/locale/ar/BH/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/BH/ctryreverse.json b/js/data/locale/ar/BH/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/BH/ctryreverse.json
+++ b/js/data/locale/ar/BH/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/DJ/ctrynames.json b/js/data/locale/ar/DJ/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/DJ/ctrynames.json
+++ b/js/data/locale/ar/DJ/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/DJ/ctryreverse.json b/js/data/locale/ar/DJ/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/DJ/ctryreverse.json
+++ b/js/data/locale/ar/DJ/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/DZ/ctrynames.json b/js/data/locale/ar/DZ/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/DZ/ctrynames.json
+++ b/js/data/locale/ar/DZ/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/DZ/ctryreverse.json b/js/data/locale/ar/DZ/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/DZ/ctryreverse.json
+++ b/js/data/locale/ar/DZ/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/DZ/numfmt.jf b/js/data/locale/ar/DZ/numfmt.jf
index c1f4e85f7d..8f56a3e755 100644
--- a/js/data/locale/ar/DZ/numfmt.jf
+++ b/js/data/locale/ar/DZ/numfmt.jf
@@ -7,7 +7,7 @@
         },
         "decimalChar": "٫",
         "digits": "٠١٢٣٤٥٦٧٨٩",
-        "exponential": "اس",
+        "exponential": "أس",
         "groupChar": "٬",
         "negativenumFmt": "؜-{n}",
         "negativepctFmt": "؜-{n}٪؜",
diff --git a/js/data/locale/ar/EG/ctrynames.json b/js/data/locale/ar/EG/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/EG/ctrynames.json
+++ b/js/data/locale/ar/EG/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/EG/ctryreverse.json b/js/data/locale/ar/EG/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/EG/ctryreverse.json
+++ b/js/data/locale/ar/EG/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/EH/ctrynames.json b/js/data/locale/ar/EH/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/EH/ctrynames.json
+++ b/js/data/locale/ar/EH/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/EH/ctryreverse.json b/js/data/locale/ar/EH/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/EH/ctryreverse.json
+++ b/js/data/locale/ar/EH/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/EH/numfmt.jf b/js/data/locale/ar/EH/numfmt.jf
index acb1dca3e0..7b7d132601 100644
--- a/js/data/locale/ar/EH/numfmt.jf
+++ b/js/data/locale/ar/EH/numfmt.jf
@@ -7,7 +7,7 @@
         },
         "decimalChar": "٫",
         "digits": "٠١٢٣٤٥٦٧٨٩",
-        "exponential": "اس",
+        "exponential": "أس",
         "groupChar": "٬",
         "negativenumFmt": "؜-{n}",
         "negativepctFmt": "؜-{n}٪؜",
diff --git a/js/data/locale/ar/ER/ctrynames.json b/js/data/locale/ar/ER/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/ER/ctrynames.json
+++ b/js/data/locale/ar/ER/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/ER/ctryreverse.json b/js/data/locale/ar/ER/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/ER/ctryreverse.json
+++ b/js/data/locale/ar/ER/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/IL/ctrynames.json b/js/data/locale/ar/IL/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/IL/ctrynames.json
+++ b/js/data/locale/ar/IL/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/IL/ctryreverse.json b/js/data/locale/ar/IL/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/IL/ctryreverse.json
+++ b/js/data/locale/ar/IL/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/IQ/ctrynames.json b/js/data/locale/ar/IQ/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/IQ/ctrynames.json
+++ b/js/data/locale/ar/IQ/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/IQ/ctryreverse.json b/js/data/locale/ar/IQ/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/IQ/ctryreverse.json
+++ b/js/data/locale/ar/IQ/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/JO/ctrynames.json b/js/data/locale/ar/JO/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/JO/ctrynames.json
+++ b/js/data/locale/ar/JO/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/JO/ctryreverse.json b/js/data/locale/ar/JO/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/JO/ctryreverse.json
+++ b/js/data/locale/ar/JO/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/KM/ctrynames.json b/js/data/locale/ar/KM/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/KM/ctrynames.json
+++ b/js/data/locale/ar/KM/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/KM/ctryreverse.json b/js/data/locale/ar/KM/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/KM/ctryreverse.json
+++ b/js/data/locale/ar/KM/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/KW/ctrynames.json b/js/data/locale/ar/KW/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/KW/ctrynames.json
+++ b/js/data/locale/ar/KW/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/KW/ctryreverse.json b/js/data/locale/ar/KW/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/KW/ctryreverse.json
+++ b/js/data/locale/ar/KW/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/LB/ctrynames.json b/js/data/locale/ar/LB/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/LB/ctrynames.json
+++ b/js/data/locale/ar/LB/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/LB/ctryreverse.json b/js/data/locale/ar/LB/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/LB/ctryreverse.json
+++ b/js/data/locale/ar/LB/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/LY/ctrynames.json b/js/data/locale/ar/LY/ctrynames.json
index 73b6fa0369..af9fe9dc04 100644
--- a/js/data/locale/ar/LY/ctrynames.json
+++ b/js/data/locale/ar/LY/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/LY/ctryreverse.json b/js/data/locale/ar/LY/ctryreverse.json
index 212d0ff5ae..0a2aaa9628 100644
--- a/js/data/locale/ar/LY/ctryreverse.json
+++ b/js/data/locale/ar/LY/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/LY/numfmt.jf b/js/data/locale/ar/LY/numfmt.jf
index c1f4e85f7d..8f56a3e755 100644
--- a/js/data/locale/ar/LY/numfmt.jf
+++ b/js/data/locale/ar/LY/numfmt.jf
@@ -7,7 +7,7 @@
         },
         "decimalChar": "٫",
         "digits": "٠١٢٣٤٥٦٧٨٩",
-        "exponential": "اس",
+        "exponential": "أس",
         "groupChar": "٬",
         "negativenumFmt": "؜-{n}",
         "negativepctFmt": "؜-{n}٪؜",
diff --git a/js/data/locale/ar/MA/ctrynames.json b/js/data/locale/ar/MA/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/MA/ctrynames.json
+++ b/js/data/locale/ar/MA/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/MA/ctryreverse.json b/js/data/locale/ar/MA/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/MA/ctryreverse.json
+++ b/js/data/locale/ar/MA/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/MA/numfmt.jf b/js/data/locale/ar/MA/numfmt.jf
index c1f4e85f7d..8f56a3e755 100644
--- a/js/data/locale/ar/MA/numfmt.jf
+++ b/js/data/locale/ar/MA/numfmt.jf
@@ -7,7 +7,7 @@
         },
         "decimalChar": "٫",
         "digits": "٠١٢٣٤٥٦٧٨٩",
-        "exponential": "اس",
+        "exponential": "أس",
         "groupChar": "٬",
         "negativenumFmt": "؜-{n}",
         "negativepctFmt": "؜-{n}٪؜",
diff --git a/js/data/locale/ar/MR/ctrynames.json b/js/data/locale/ar/MR/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/MR/ctrynames.json
+++ b/js/data/locale/ar/MR/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/MR/ctryreverse.json b/js/data/locale/ar/MR/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/MR/ctryreverse.json
+++ b/js/data/locale/ar/MR/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/OM/ctrynames.json b/js/data/locale/ar/OM/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/OM/ctrynames.json
+++ b/js/data/locale/ar/OM/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/OM/ctryreverse.json b/js/data/locale/ar/OM/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/OM/ctryreverse.json
+++ b/js/data/locale/ar/OM/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/PS/ctrynames.json b/js/data/locale/ar/PS/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/PS/ctrynames.json
+++ b/js/data/locale/ar/PS/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/PS/ctryreverse.json b/js/data/locale/ar/PS/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/PS/ctryreverse.json
+++ b/js/data/locale/ar/PS/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/QA/ctrynames.json b/js/data/locale/ar/QA/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/QA/ctrynames.json
+++ b/js/data/locale/ar/QA/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/QA/ctryreverse.json b/js/data/locale/ar/QA/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/QA/ctryreverse.json
+++ b/js/data/locale/ar/QA/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/SA/ctrynames.json b/js/data/locale/ar/SA/ctrynames.json
index 0bb757c581..140426a263 100644
--- a/js/data/locale/ar/SA/ctrynames.json
+++ b/js/data/locale/ar/SA/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/SA/ctryreverse.json b/js/data/locale/ar/SA/ctryreverse.json
index a5973a0891..cd32e82a21 100644
--- a/js/data/locale/ar/SA/ctryreverse.json
+++ b/js/data/locale/ar/SA/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/SA/unitfmt.json b/js/data/locale/ar/SA/unitfmt.json
index 0ba853fa43..44306f187a 100644
--- a/js/data/locale/ar/SA/unitfmt.json
+++ b/js/data/locale/ar/SA/unitfmt.json
@@ -1,7 +1,7 @@
 {
     "unitfmt": {
         "long": {
-            "acre": "one#فدان|few#{n} أفدنة|many#{n} فدانًا|#{n} فدان",
+            "acre": "one#فدان|two#فدانان|few#{n} أفدنة|many#{n} فدانًا|#{n} فدان",
             "acre-foot": "#{n} فدان قدم",
             "ampere": "#{n} أمبير",
             "arc-minute": "one#دقيقة قوسية|two#دقيقتان قوسيتان|few#{n} دقائق قوسية|#{n} دقيقة قوسية",
@@ -10,6 +10,7 @@
             "atmosphere": "zero#{n} ض.ج|two#{n} ض.ج|few#{n} ض.ج|many#{n} ض.ج|#{n} ضغط جوي",
             "bar": "#{n} بار",
             "barrel": "one#برميل|two#برميلان|few#{n} براميل|many#{n} برميلًا|#{n} برميل",
+            "beaufort": "#بوفورت {n}",
             "bit": "#{n} بت",
             "bit-per-second": "#{n} بت في الثانية",
             "british-thermal-unit": "two#وحدتان حراريتان بريطانيتان|few#{n} وحدات حرارية بريطانية|#{n} وحدة حرارية بريطانية",
@@ -27,7 +28,7 @@
             "coordinateUnit": "",
             "cubic-centimeter": "two#سنتيمتران مكعبان|few#{n} سنتيمترات مكعبة|many#{n} سنتيمترًا مكعبًا|#{n} سنتيمتر مكعب",
             "cubic-foot": "one#قدم مكعبة|two#قدمان مكعبتان|few#{n} أقدام مكعبة|many#{n} أقدام مكعبة|#{n} قدم مكعبة",
-            "cubic-inch": "two#بوصتان مكعبات|few#{n} بوصات مكعبة|#{n} بوصة مكعبة",
+            "cubic-inch": "two#بوصتان مكعبات|few#{n} بوصات مكعبة|#{n} بوصة³",
             "cubic-kilometer": "two#كيلومتران مكعبان|few#{n} كيلومترات مكعبة|many#{n} كيلومترًا مكعبًا|#{n} كيلومتر مكعب",
             "cubic-meter": "two#متران مكعبان|few#{n} مترات مكعبة|many#{n} مترًا مكعبًا|#{n} متر مكعب",
             "cubic-mile": "two#ميلان مكعبان|few#{n} أميال مكعبة|many#{n} ميلًا مكعبًا|#{n} ميل مكعب",
@@ -43,7 +44,6 @@
             "degree": "one#درجة|two#درجتان|few#{n} درجات|#{n} درجة",
             "dessert-spoon": "#{n} ملعقة حلو",
             "dessert-spoon-imperial": "#{n} ملعقة حلو إمبراطوري",
-            "dot": "#{n} بكسل",
             "dot-per-centimeter": "two#نقطتان لكل سنتيمتر|few#{n} نقاط لكل سنتيمتر|#{n} نقطة لكل سنتيمتر",
             "dot-per-inch": "two#نقطتان لكل بوصة|few#{n} نقاط لكل بوصة|#{n} نقطة لكل بوصة",
             "dram": "zero#{n} درهم سائل|two#{n} درهم سائل|few#{n} درهم سائل|many#{n} درهم سائل|#{n} درهم",
@@ -169,7 +169,7 @@
             "pixel-per-centimeter": "#{n} بكسل لكل سنتيمتر",
             "pixel-per-inch": "#{n} بكسل لكل بوصة",
             "point": "one#نقطة|two#نقطتان|few#{n} نقاط|#{n} نقطة",
-            "pound": "two#رطلان|few#{n} أرطال|many#{n} رطلًا|#{n} رطل",
+            "pound": "two#رطلان|many#{n} رطلًا|#{n} رطل",
             "pound-force": "#{n} باوند قوة",
             "pound-force-foot": "#{n} باوند قدم",
             "pound-force-per-square-inch": "two#رطلان لكل بوصة مربعة|few#{n} أرطال لكل بوصة مربعة|many#{n} رطلًا لكل بوصة مربعة|#{n} رطل لكل بوصة مربعة",
@@ -217,6 +217,7 @@
             "atmosphere": "#{n} ض.ج",
             "bar": "#{n} بار",
             "barrel": "one#برميل|two#برميلان|few#{n} براميل|many#{n} برميلًا|#{n} برميل",
+            "beaufort": "#بوفورت {n}",
             "bit": "#{n} بت",
             "bit-per-second": "#{n} بت/ث",
             "british-thermal-unit": "few#{n} وحدات حرارية بريطانية|#{n} وحدة حرارية بريطانية",
@@ -234,7 +235,7 @@
             "coordinateUnit": "",
             "cubic-centimeter": "#{n} سم³",
             "cubic-foot": "#{n} قدم³",
-            "cubic-inch": "one#{n} بوصة مكعبة|#{n} بوصة³",
+            "cubic-inch": "#{n} بوصة³",
             "cubic-kilometer": "#{n} كم³",
             "cubic-meter": "#{n} م³",
             "cubic-mile": "#{n} ميل³",
@@ -249,9 +250,8 @@
             "degree": "one#درجة|two#درجتان|few#{n} درجات|#{n} درجة",
             "dessert-spoon": "#{n} ملعقة ح.",
             "dessert-spoon-imperial": "#{n} ملعقة ح. إمبراطوري",
-            "dot": "#{n} بكسل",
-            "dot-per-centimeter": "two#{n} بكسل/سم|few#{n} نقاط/سم|#{n} نقطة/سم",
-            "dot-per-inch": "two#{n} بكسل/بوصة|few#{n} نقاط/بوصة|#{n} نقطة/بوصة",
+            "dot-per-centimeter": "two#{n} نقطتان/سم|few#{n} نقاط/سم|#{n} نقطة/سم",
+            "dot-per-inch": "two#نقطة/بوصة|few#{n} نقاط/بوصة|#{n} نقطة/بوصة",
             "dram": "#{n} درهم سائل",
             "drop": "#{n} قطرة",
             "dunam": "#{n} دونم",
diff --git a/js/data/locale/ar/SD/ctrynames.json b/js/data/locale/ar/SD/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/SD/ctrynames.json
+++ b/js/data/locale/ar/SD/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/SD/ctryreverse.json b/js/data/locale/ar/SD/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/SD/ctryreverse.json
+++ b/js/data/locale/ar/SD/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/SO/ctrynames.json b/js/data/locale/ar/SO/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/SO/ctrynames.json
+++ b/js/data/locale/ar/SO/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/SO/ctryreverse.json b/js/data/locale/ar/SO/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/SO/ctryreverse.json
+++ b/js/data/locale/ar/SO/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/SS/ctrynames.json b/js/data/locale/ar/SS/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/SS/ctrynames.json
+++ b/js/data/locale/ar/SS/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/SS/ctryreverse.json b/js/data/locale/ar/SS/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/SS/ctryreverse.json
+++ b/js/data/locale/ar/SS/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/SY/ctrynames.json b/js/data/locale/ar/SY/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/SY/ctrynames.json
+++ b/js/data/locale/ar/SY/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/SY/ctryreverse.json b/js/data/locale/ar/SY/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/SY/ctryreverse.json
+++ b/js/data/locale/ar/SY/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/TD/ctrynames.json b/js/data/locale/ar/TD/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/TD/ctrynames.json
+++ b/js/data/locale/ar/TD/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/TD/ctryreverse.json b/js/data/locale/ar/TD/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/TD/ctryreverse.json
+++ b/js/data/locale/ar/TD/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/TN/ctrynames.json b/js/data/locale/ar/TN/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/TN/ctrynames.json
+++ b/js/data/locale/ar/TN/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/TN/ctryreverse.json b/js/data/locale/ar/TN/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/TN/ctryreverse.json
+++ b/js/data/locale/ar/TN/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/TN/numfmt.jf b/js/data/locale/ar/TN/numfmt.jf
index c1f4e85f7d..8f56a3e755 100644
--- a/js/data/locale/ar/TN/numfmt.jf
+++ b/js/data/locale/ar/TN/numfmt.jf
@@ -7,7 +7,7 @@
         },
         "decimalChar": "٫",
         "digits": "٠١٢٣٤٥٦٧٨٩",
-        "exponential": "اس",
+        "exponential": "أس",
         "groupChar": "٬",
         "negativenumFmt": "؜-{n}",
         "negativepctFmt": "؜-{n}٪؜",
diff --git a/js/data/locale/ar/YE/ctrynames.json b/js/data/locale/ar/YE/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/YE/ctrynames.json
+++ b/js/data/locale/ar/YE/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/YE/ctryreverse.json b/js/data/locale/ar/YE/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/YE/ctryreverse.json
+++ b/js/data/locale/ar/YE/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/ctrynames.json b/js/data/locale/ar/ctrynames.json
index 82d597e076..20de63d7e7 100644
--- a/js/data/locale/ar/ctrynames.json
+++ b/js/data/locale/ar/ctrynames.json
@@ -122,7 +122,7 @@
     "تنزانيا": "TZ",
     "توغو": "TG",
     "توفالو": "TV",
-    "توكيلو": "TK",
+    "توكيلاو": "TK",
     "تونس": "TN",
     "تونغا": "TO",
     "تيمور - ليشتي": "TL",
@@ -140,8 +140,8 @@
     "جزر سليمان": "SB",
     "جزر فارو": "FO",
     "جزر فوكلاند": "FK",
+    "جزر فيرجن الأمريكية": "VI",
     "جزر فيرجن البريطانية": "VG",
-    "جزر فيرجن التابعة للولايات المتحدة": "VI",
     "جزر كايمان": "KY",
     "جزر كوك": "CK",
     "جزر كوكوس (كيلينغ)": "CC",
diff --git a/js/data/locale/ar/ctryreverse.json b/js/data/locale/ar/ctryreverse.json
index 0ffeae0198..22c6dc4f70 100644
--- a/js/data/locale/ar/ctryreverse.json
+++ b/js/data/locale/ar/ctryreverse.json
@@ -259,7 +259,7 @@
     "TG": "توغو",
     "TH": "تايلاند",
     "TJ": "طاجيكستان",
-    "TK": "توكيلو",
+    "TK": "توكيلاو",
     "TL": "تيمور - ليشتي",
     "TM": "تركمانستان",
     "TN": "تونس",
@@ -280,7 +280,7 @@
     "VC": "سانت فنسنت وجزر غرينادين",
     "VE": "فنزويلا",
     "VG": "جزر فيرجن البريطانية",
-    "VI": "جزر فيرجن التابعة للولايات المتحدة",
+    "VI": "جزر فيرجن الأمريكية",
     "VN": "فيتنام",
     "VU": "فانواتو",
     "WF": "جزر والس وفوتونا",
diff --git a/js/data/locale/ar/numfmt.jf b/js/data/locale/ar/numfmt.jf
index 176ce28feb..c50af1351c 100644
--- a/js/data/locale/ar/numfmt.jf
+++ b/js/data/locale/ar/numfmt.jf
@@ -7,7 +7,7 @@
         },
         "decimalChar": "٫",
         "digits": "٠١٢٣٤٥٦٧٨٩",
-        "exponential": "اس",
+        "exponential": "أس",
         "groupChar": "٬",
         "negativenumFmt": "؜-{n}",
         "negativepctFmt": "؜-{n}٪؜",
diff --git a/js/data/locale/ar/unitfmt.json b/js/data/locale/ar/unitfmt.json
index e4d533f0a9..86f04ff908 100644
--- a/js/data/locale/ar/unitfmt.json
+++ b/js/data/locale/ar/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "zero#{n} ض.ج|two#{n} ض.ج|few#{n} ض.ج|many#{n} ض.ج|#{n} ضغط جوي",
             "bar": "#{n} بار",
             "barrel": "one#برميل|two#برميلان|few#{n} براميل|many#{n} برميلًا|#{n} برميل",
+            "beaufort": "#بوفورت {n}",
             "bit": "#{n} بت",
             "bit-per-second": "#{n} بت في الثانية",
             "british-thermal-unit": "two#وحدتان حراريتان بريطانيتان|few#{n} وحدات حرارية بريطانية|#{n} وحدة حرارية بريطانية",
@@ -43,7 +44,6 @@
             "degree": "one#درجة|two#درجتان|few#{n} درجات|#{n} درجة",
             "dessert-spoon": "#{n} ملعقة حلو",
             "dessert-spoon-imperial": "#{n} ملعقة حلو إمبراطوري",
-            "dot": "#{n} بكسل",
             "dot-per-centimeter": "two#نقطتان لكل سنتيمتر|few#{n} نقاط لكل سنتيمتر|#{n} نقطة لكل سنتيمتر",
             "dot-per-inch": "two#نقطتان لكل بوصة|few#{n} نقاط لكل بوصة|#{n} نقطة لكل بوصة",
             "dram": "zero#{n} درهم سائل|two#{n} درهم سائل|few#{n} درهم سائل|many#{n} درهم سائل|#{n} درهم",
@@ -96,7 +96,7 @@
             "kilogram": "#{n} كيلوغرام",
             "kilohertz": "#{n} كيلو هرتز",
             "kilojoule": "#{n} كيلو جول",
-            "kilometer": "#{n} كيلومتر",
+            "kilometer": "few#{n} كيلومترات|many#{n} كيلومترًا|#{n} كيلومتر",
             "kilometer-per-hour": "#{n} كيلومتر في الساعة",
             "kilometer-per-liter": "#{n} كيلومتر لكل لتر",
             "kilometer-per-second": "#{n} كيلومتر في الثانية",
@@ -121,7 +121,7 @@
             "megapascal": "#{n} ميغاباسكال",
             "megapixel": "#{n} ميغابكسل",
             "megawatt": "#{n} ميغا واط",
-            "meter": "one#متر|two#متران|few#{n} أمتار|many#{n} مترًا|#{n} متر",
+            "meter": "one#متر|few#{n} أمتار|many#{n} مترًا|#{n} متر",
             "meter-per-second": "#{n} متر في الثانية",
             "meter-per-square-second": "#{n} متر في الثانية المربعة",
             "microgram": "#{n} ميكروغرام",
@@ -217,6 +217,7 @@
             "atmosphere": "#{n} ض.ج",
             "bar": "#{n} بار",
             "barrel": "one#برميل|two#برميلان|few#{n} براميل|many#{n} برميلًا|#{n} برميل",
+            "beaufort": "#بوفورت {n}",
             "bit": "#{n} بت",
             "bit-per-second": "#{n} بت/ث",
             "british-thermal-unit": "few#{n} وحدات حرارية بريطانية|#{n} وحدة حرارية بريطانية",
@@ -249,9 +250,8 @@
             "degree": "one#درجة|two#درجتان|few#{n} درجات|#{n} درجة",
             "dessert-spoon": "#{n} ملعقة ح.",
             "dessert-spoon-imperial": "#{n} ملعقة ح. إمبراطوري",
-            "dot": "#{n} بكسل",
-            "dot-per-centimeter": "two#{n} بكسل/سم|few#{n} نقاط/سم|#{n} نقطة/سم",
-            "dot-per-inch": "two#{n} بكسل/بوصة|few#{n} نقاط/بوصة|#{n} نقطة/بوصة",
+            "dot-per-centimeter": "two#{n} نقطتان/سم|few#{n} نقاط/سم|#{n} نقطة/سم",
+            "dot-per-inch": "two#نقطة/بوصة|few#{n} نقاط/بوصة|#{n} نقطة/بوصة",
             "dram": "#{n} درهم سائل",
             "drop": "#{n} قطرة",
             "dunam": "#{n} دونم",
diff --git a/js/data/locale/arn/unitfmt.json b/js/data/locale/arn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/arn/unitfmt.json
+++ b/js/data/locale/arn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/as/unitfmt.json b/js/data/locale/as/unitfmt.json
index 1465d12f15..3a9ec09442 100644
--- a/js/data/locale/as/unitfmt.json
+++ b/js/data/locale/as/unitfmt.json
@@ -8,15 +8,16 @@
             "arc-second": "#{n} আৰ্কছেকেণ্ড",
             "astronomical-unit": "#{n} জ্যোতিৰ্বিজ্ঞান একক",
             "atmosphere": "one#{n} বতৰ|#{n} atm",
-            "bar": "#{n} bar",
+            "bar": "#{n} বাৰ",
             "barrel": "#{n} বেৰেল",
+            "beaufort": "#বিউফৰ্ট {n}",
             "bit": "#{n} বিট",
-            "bit-per-second": "#{n} বিট প্ৰতি ছেকেণ্ড",
+            "bit-per-second": "#প্ৰতি {n} বিট ছেকেণ্ড",
             "british-thermal-unit": "#{n} ব্ৰিটিশ্ব থাৰ্মেল ইউনিট",
             "bushel": "one#{n} বুশ্লেল|#{n} বুশ্বেল",
             "byte": "#{n} বাইট",
-            "byte-per-hour": "#{n} বাইট প্ৰতি ঘণ্টা",
-            "byte-per-second": "#{n} বাইট প্ৰতি ছেকেণ্ড",
+            "byte-per-hour": "#প্ৰতি {n} বাইট ঘণ্টা",
+            "byte-per-second": "#প্ৰতি {n} বাইট ছেকেণ্ড",
             "calorie": "#{n} কেলৰি",
             "candela": "#{n} কেণ্ডেলা",
             "carat": "#{n} কেৰেট",
@@ -42,40 +43,40 @@
             "degree": "#{n} ডিগ্ৰী",
             "dessert-spoon": "#{n} ডেজাৰ্ট চামুচ",
             "dessert-spoon-imperial": "#{n} ইম্পেৰিয়েল ডেজাৰ্ট চামুচ",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "#{n} টা বিন্দু",
+            "dot-per-centimeter": "#প্ৰতি চেণ্টিমিটাৰত {n} টা বিন্দু",
+            "dot-per-inch": "#প্ৰতি ইঞ্চিত {n} টা বিন্দু",
             "dram": "#{n} ড্ৰাম",
             "drop": "#{n} ড্ৰপ",
             "dunam": "#{n} ডুনাম",
             "earth-mass": "#{n} আৰ্থ মাছ",
             "earth-radius": "#{n} পৃথিৱীৰ ব্যাসাৰ্ধ",
             "electronvolt": "#{n} ইলেক্ট্ৰ’নভ’ল্ট",
-            "em": "#{n} em",
+            "em": "#{n} ইএম",
             "fahrenheit": "#{n} ডিগ্ৰী ফাৰেনহাইট",
             "fathom": "#{n} ফাথম",
             "fluid-ounce": "#{n} ফ্লুইড আউন্স",
             "fluid-ounce-imperial": "#{n} ইম্পেৰিয়েল ফ্লুইড আউন্স",
             "foodcalorie": "#{n} কেলৰি",
             "foot": "#{n} ফুট",
-            "foot-per-second": "#{n} ফুট প্ৰতি ছেকেণ্ড",
+            "foot-per-second": "#প্ৰতি {n} ফুট ছেকেণ্ড",
             "furlong": "#{n} ফাৰ্লং",
             "g-force": "#{n} জি-বল",
             "gallon": "#{n} গেলন",
             "gallon-imperial": "#{n} ইম্পেৰিয়াল গেলন",
             "generic": "#{n}°",
             "gigabit": "#{n} গিগাবিট",
-            "gigabit-per-second": "#{n} গিগাবিট প্ৰতি ছেকেণ্ড",
+            "gigabit-per-second": "#প্ৰতি {n} গিগাবিট ছেকেণ্ড",
             "gigabyte": "#{n} গিগাবাইট",
-            "gigabyte-per-hour": "#{n} গিগাবাইট প্ৰতি ঘণ্টা",
-            "gigabyte-per-second": "#{n} গিগাবাইট প্ৰতি ছেকেণ্ড",
+            "gigabyte-per-hour": "#প্ৰতি {n} গিগাবাইট ঘণ্টা",
+            "gigabyte-per-second": "#প্ৰতি {n} গিগাবাইট ছেকেণ্ড",
             "gigahertz": "#{n} গিগাহাৰ্টজ",
             "gigawatt": "#{n} গিগাৱাট",
             "grain": "#{n} গ্ৰেইন",
             "gram": "#{n} গ্ৰাম",
             "hectare": "#{n} হেক্টৰ",
             "hectoliter": "#{n} হেক্টোলিটাৰ",
-            "hectopascal": "#{n} হেক্টোপাছকল",
+            "hectopascal": "#{n} হেক্টোপাস্কেল",
             "hertz": "#{n} হাৰ্টজ",
             "horsepower": "#{n} অশ্বক্ষমতা",
             "hour": "#{n} ঘণ্টা",
@@ -87,10 +88,10 @@
             "karat": "#{n} কেৰেট",
             "kelvin": "#{n} কেলভিন",
             "kilobit": "#{n} কিলোবিট",
-            "kilobit-per-second": "#{n} কিলোবিট প্ৰতি ছেকেণ্ড",
+            "kilobit-per-second": "#প্ৰতি {n} কিলোবিট ছেকেণ্ড",
             "kilobyte": "#{n} কিলোবাইট",
-            "kilobyte-per-hour": "#{n} কিলোবাইট প্ৰতি ঘণ্টা",
-            "kilobyte-per-second": "#{n} কিলোবাইট প্ৰতি ছেকেণ্ড",
+            "kilobyte-per-hour": "#প্ৰতি {n} কিলোবাইট ঘণ্টা",
+            "kilobyte-per-second": "#প্ৰতি {n} কিলোবাইট ছেকেণ্ড",
             "kilocalorie": "#{n} কিলোকেলৰি",
             "kilogram": "#{n} কিলোগ্ৰাম",
             "kilohertz": "#{n} কিলোহাৰ্টজ",
@@ -98,7 +99,7 @@
             "kilometer": "#{n} কিলোমিটাৰ",
             "kilometer-per-hour": "#{n} ঘণ্টা প্ৰতি কিলোমিটাৰ",
             "kilometer-per-liter": "#{n} কিলোমিটাৰ প্ৰতি লিটাৰ",
-            "kilometer-per-second": "#{n} কিলোমিটাৰ প্ৰতি ছেকেণ্ড",
+            "kilometer-per-second": "#প্ৰতি {n} কিলোমিটাৰ ছেকেণ্ড",
             "kilopascal": "one#{n} কিল’পাস্কেল|#{n} কি. পা.",
             "kilowatt": "#{n} কিলোৱাট",
             "kilowatt-hour": "#{n} কিলোৱাট ঘণ্টা",
@@ -111,14 +112,14 @@
             "lumen": "#{n} লুমেন",
             "lux": "#{n} লাক্স",
             "megabit": "#{n} মেগাবিট",
-            "megabit-per-second": "#{n} মেগাবিট প্ৰতি ছেকেণ্ড",
+            "megabit-per-second": "#প্ৰতি {n} মেগাবিট ছেকেণ্ড",
             "megabyte": "#{n} মেগাবাইট",
-            "megabyte-per-hour": "#{n} মেগাবাইট প্ৰতি ঘণ্টা",
-            "megabyte-per-second": "#{n} মেগাবাইট প্ৰতি ছেকেণ্ড",
+            "megabyte-per-hour": "#প্ৰতি {n} মেগাবাইট ঘণ্টা",
+            "megabyte-per-second": "#প্ৰতি {n} মেগাবাইট ছেকেণ্ড",
             "megahertz": "#{n} মেগাহাৰ্টজ",
             "megaliter": "#{n} মেগালিটাৰ",
             "megapascal": "#{n} মেগাপাস্কেল",
-            "megapixel": "#{n} MP",
+            "megapixel": "#{n} মেগাপিক্সেল",
             "megawatt": "#{n} মেগাৱাট",
             "meter": "#{n} মিটাৰ",
             "meter-per-second": "#{n} মিটাৰ প্ৰতি ছেকেণ্ড",
@@ -130,7 +131,7 @@
             "mile-per-gallon": "#প্ৰতি গেলনত {n} মাইল",
             "mile-per-gallon-imperial": "#প্ৰতি ইম্পেৰিয়াল গেলনত {n} মাইল",
             "mile-per-hour": "#{n} মাইল প্ৰতি ঘণ্টা",
-            "mile-per-second": "#{n} মাইল প্ৰতি ছেকেণ্ড",
+            "mile-per-second": "#প্ৰতি {n} মাইল ছেকেণ্ড",
             "mile-scandinavian": "#{n} মাইল-স্কেণ্ডিনেভিয়ান",
             "milliampere": "#{n} মিলিএম্পিয়াৰ",
             "millibar": "#{n} মিলিবাৰ",
@@ -154,7 +155,7 @@
             "ounce": "#{n} আউন্স",
             "ounce-troy": "#{n} ট্ৰয় আউন্স",
             "parsec": "#{n} পাৰ্ছেক",
-            "pascal": "#{n} Pa",
+            "pascal": "#{n} পাস্কেল",
             "percent": "#{n} শতাংশ",
             "permille": "#{n} প্ৰতিমাইল",
             "permillion": "#প্ৰতি মিলিয়নত {n} ভাগ",
@@ -164,9 +165,9 @@
             "pinch": "#{n} পিঞ্চ",
             "pint": "#{n} পিণ্ট",
             "pint-metric": "#{n} মেট্ৰিক পিণ্ট",
-            "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel": "#{n} পিক্সেল",
+            "pixel-per-centimeter": "one#{n} পিপিচিএম|#প্ৰতি চেণ্টিমিটাৰত {n} পিক্সেল",
+            "pixel-per-inch": "#প্ৰতি ইঞ্চিত {n} পিক্সেল",
             "point": "#{n} পইণ্ট",
             "pound": "#{n} পাউণ্ড",
             "pound-force": "#{n} পাউণ্ড-বল",
@@ -191,12 +192,12 @@
             "square-yard": "#{n} বৰ্গ গজ",
             "stone": "#{n} ষ্ট'ন",
             "tablespoon": "#{n} টেব’লস্পুন",
-            "teaspoon": "#{n} চাহচামোছ",
+            "teaspoon": "#{n} টিস্পুন",
             "terabit": "#{n} টেৰাবিট",
-            "terabit-per-second": "#{n} টেৰাবিট প্ৰতি ছেকেণ্ড",
+            "terabit-per-second": "#প্ৰতি {n} টেৰাবিট ছেকেণ্ড",
             "terabyte": "#{n} টেৰাবাইট",
-            "terabyte-per-hour": "#{n} টেৰাবাইট প্ৰতি ঘণ্টা",
-            "terabyte-per-second": "#{n} টেৰাবাইট প্ৰতি ছেকেণ্ড",
+            "terabyte-per-hour": "#প্ৰতি {n} টেৰাবাইট ঘণ্টা",
+            "terabyte-per-second": "#প্ৰতি {n} টেৰাবাইট ছেকেণ্ড",
             "therm-us": "#{n} ইউ এচ থাৰ্ণ",
             "ton": "#{n} টন",
             "tonne": "one#{n} মেট্রিক টন|#{n} মেট্ৰিক টন",
@@ -214,8 +215,9 @@
             "arc-second": "#{n} আৰ্কছেকেণ্ড",
             "astronomical-unit": "#{n} জ্যোঃ এঃ",
             "atmosphere": "#{n} atm",
-            "bar": "#{n} bar",
+            "bar": "#{n} বাৰ",
             "barrel": "#{n} bbl",
+            "beaufort": "#বি {n}",
             "bit": "#{n} বিট",
             "bit-per-second": "#{n} বিট/ছেকেণ্ড",
             "british-thermal-unit": "#{n} Btu",
@@ -224,7 +226,7 @@
             "byte-per-hour": "#{n} বাইট/ঘণ্টা",
             "byte-per-second": "#{n} বাইট/ছেকেণ্ড",
             "calorie": "#{n} কেলৰি",
-            "candela": "#{n} cd",
+            "candela": "#{n} কেঃ",
             "carat": "#{n} কেৰেট",
             "celsius": "#{n}°চেঃ",
             "centiliter": "#{n} ছেঃ লিঃ",
@@ -248,17 +250,17 @@
             "degree": "#{n} ডিগ্ৰী",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "#{n} টা বিন্দু",
+            "dot-per-centimeter": "#{n} ডিপিচিএম",
+            "dot-per-inch": "#{n} ডিপিআই",
             "dram": "#{n} ড্ৰাম তৰল পদাৰ্থ",
             "drop": "#{n} ড্ৰপ",
             "dunam": "#{n} ডুনাম",
             "earth-mass": "#{n} M⊕",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "#{n} eV",
-            "em": "#{n} em",
-            "fahrenheit": "#{n}°ফাঃ",
+            "em": "#{n} ইএম",
+            "fahrenheit": "#{n}°ফা.",
             "fathom": "#{n} ফাথম",
             "fluid-ounce": "#{n} ফ্লুঃ আঃ",
             "fluid-ounce-imperial": "#{n} ইম্পে. ফ্লু. আ.",
@@ -324,7 +326,7 @@
             "megahertz": "#{n} মেঃ হাঃ",
             "megaliter": "#{n} মেঃ লিঃ",
             "megapascal": "#{n} মে. পা.",
-            "megapixel": "#{n} MP",
+            "megapixel": "#{n} মে. পি.",
             "megawatt": "#{n} মেঃ ৱাঃ",
             "meter": "#{n} মিঃ",
             "meter-per-second": "#{n} মিঃ/ছেঃ",
@@ -333,7 +335,7 @@
             "micrometer": "#{n} মাঃ মিঃ",
             "microsecond": "#{n} মাঃ ছেঃ",
             "mile": "#{n} মাঃ",
-            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon": "#{n} mpg",
             "mile-per-gallon-imperial": "#{n} mpg Imp.",
             "mile-per-hour": "#{n} মাঃ/ঘঃ",
             "mile-per-second": "#{n} মাঃ/ছেকেণ্ড",
@@ -341,11 +343,11 @@
             "milliampere": "#{n} মিঃ এঃ",
             "millibar": "#{n} mbar",
             "milligram": "#{n} মিঃ গ্ৰাঃ",
-            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milligram-ofglucose-per-deciliter": "#{n} মিঃ গ্ৰাঃ/ডেঃ লিঃ",
             "milliliter": "#{n} মিঃ লিঃ",
             "millimeter": "#{n} মিঃ মিঃ",
             "millimeter-ofhg": "#{n} mmHg",
-            "millimole-per-liter": "#{n} mmol/L",
+            "millimole-per-liter": "#{n} মিলিমোল/লিটাৰ",
             "millisecond": "#{n} মিঃ ছেঃ",
             "milliwatt": "#{n} মিঃ ৱাঃ",
             "minute": "#{n} মিনিট",
@@ -370,9 +372,9 @@
             "pinch": "#{n} পিঞ্চ",
             "pint": "#{n} পিণ্ট",
             "pint-metric": "#{n} মেঃ পিঃ",
-            "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel": "#{n} পি.",
+            "pixel-per-centimeter": "#{n} পিপিচিএম",
+            "pixel-per-inch": "#{n} পিপিআই",
             "point": "#{n} পইণ্ট",
             "pound": "#{n} পাউণ্ড",
             "pound-force": "#{n} lbf",
@@ -380,7 +382,7 @@
             "pound-force-per-square-inch": "#{n} psi",
             "quart": "#{n} কোৱাৰ্ট",
             "quart-imperial": "#{n} qt Imp.",
-            "quarter": "one#{n} qtr|#{n} qtrs",
+            "quarter": "#{n} কোৱাৰ্টাৰ",
             "radian": "#{n} ৰেডিয়েন",
             "revolution": "#{n} ঘূৰ্ণন",
             "second": "#{n} ছেকেণ্ড",
@@ -397,7 +399,7 @@
             "square-yard": "#{n} yd²",
             "stone": "#{n} ষ্ট'ন",
             "tablespoon": "#{n} টেব’লস্পুন",
-            "teaspoon": "#{n} চাহঃ চাঃ",
+            "teaspoon": "#{n} টিস্পুন",
             "terabit": "#{n} টেঃ বিঃ",
             "terabit-per-second": "#{n} টেঃ বিঃ/ছেকেণ্ড",
             "terabyte": "#{n} টেঃ বাঃ",
diff --git a/js/data/locale/asa/ctrynames.json b/js/data/locale/asa/ctrynames.json
index 9cd9c7ca93..9c1e6bc9c6 100644
--- a/js/data/locale/asa/ctrynames.json
+++ b/js/data/locale/asa/ctrynames.json
@@ -35,6 +35,7 @@
     "Botthwana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafatho": "BF",
     "Bukini": "MG",
@@ -94,7 +95,6 @@
     "Hondurathi": "HN",
     "Hong Kong SAR China": "HK",
     "Hungaria": "HU",
-    "Ieneo la Uingeredha katika Bahari Hindi": "IO",
     "India": "IN",
     "Indonethia": "ID",
     "Iraki": "IQ",
diff --git a/js/data/locale/asa/ctryreverse.json b/js/data/locale/asa/ctryreverse.json
index 7effd8b2d6..d4f2931b2c 100644
--- a/js/data/locale/asa/ctryreverse.json
+++ b/js/data/locale/asa/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Ithraeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Ieneo la Uingeredha katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aithlandi",
diff --git a/js/data/locale/asa/unitfmt.json b/js/data/locale/asa/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/asa/unitfmt.json
+++ b/js/data/locale/asa/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ast/ctrynames.json b/js/data/locale/ast/ctrynames.json
index 53a422ef3f..15a464c414 100644
--- a/js/data/locale/ast/ctrynames.json
+++ b/js/data/locale/ast/ctrynames.json
@@ -44,6 +44,7 @@
     "Bosnia y Herzegovina": "BA",
     "Botsuana": "BW",
     "Brasil": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunéi": "BN",
     "Bulgaria": "BG",
     "Burkina Fasu": "BF",
@@ -263,7 +264,6 @@
     "Tanzania": "TZ",
     "Taxiquistán": "TJ",
     "Territorios Palestinos": "PS",
-    "Territoriu Británicu del Océanu Índicu": "IO",
     "Tierres Australes Franceses": "TF",
     "Timor Oriental": "TL",
     "Togu": "TG",
diff --git a/js/data/locale/ast/ctryreverse.json b/js/data/locale/ast/ctryreverse.json
index 80f08cf422..96c3bf6ee7 100644
--- a/js/data/locale/ast/ctryreverse.json
+++ b/js/data/locale/ast/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Islla de Man",
     "IN": "India",
-    "IO": "Territoriu Británicu del Océanu Índicu",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraq",
     "IR": "Irán",
     "IS": "Islandia",
diff --git a/js/data/locale/ast/sysres.json b/js/data/locale/ast/sysres.json
index 5ae3c70512..64db17d848 100644
--- a/js/data/locale/ast/sysres.json
+++ b/js/data/locale/ast/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#en {num} seg.|#en {num} seg.",
     "#in {num}w": "one#en {num} selm.|#en {num} selm.",
     "#in {num}y": "one#en {num} añu|#en {num} años",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}día|#{num}díes",
     "#{num}d ago": "one#hai {num} día|#hai {num} díes",
     "#{num}h": "one#{num}hr|#{num}hrs",
diff --git a/js/data/locale/ast/unitfmt.json b/js/data/locale/ast/unitfmt.json
index daab94fd1f..60846d360a 100644
--- a/js/data/locale/ast/unitfmt.json
+++ b/js/data/locale/ast/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits per segundu",
             "british-thermal-unit": "#{n} Btu",
@@ -53,7 +54,6 @@
             "fathom": "one#{n} fathom|#{n} fathoms",
             "fluid-ounce": "one#{n} onza de fluidos|#{n} onces de fluidos",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "one#{n} Caloría|#{n} Caloríes",
             "foot": "one#{n} pie|#{n} pies",
             "foot-per-second": "#{n} pies per segundu",
             "furlong": "one#{n} furlong|#{n} furlongs",
@@ -213,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/seg",
             "british-thermal-unit": "#{n} Btu",
@@ -256,7 +257,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/seg",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/az/Arab/IQ/unitfmt.json b/js/data/locale/az/Arab/IQ/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/az/Arab/IQ/unitfmt.json
+++ b/js/data/locale/az/Arab/IQ/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/az/Arab/TR/unitfmt.json b/js/data/locale/az/Arab/TR/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/az/Arab/TR/unitfmt.json
+++ b/js/data/locale/az/Arab/TR/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/az/Arab/unitfmt.json b/js/data/locale/az/Arab/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/az/Arab/unitfmt.json
+++ b/js/data/locale/az/Arab/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/az/Cyrl/ctrynames.json b/js/data/locale/az/Cyrl/ctrynames.json
index e25fcf879f..2f4f317763 100644
--- a/js/data/locale/az/Cyrl/ctrynames.json
+++ b/js/data/locale/az/Cyrl/ctrynames.json
@@ -1,6 +1,7 @@
 {
     "Avrozona": "EZ",
     "Birləşmiş Millətlər Təşkilatı": "UN",
+    "Britaniyanın Hind Okeanı Ərazisi": "IO",
     "Fələstin Əraziləri": "PS",
     "Karib Niderlandı": "BQ",
     "Qərbi Saxara": "EH",
@@ -52,7 +53,6 @@
     "Ботсвана": "BW",
     "Бразилија": "BR",
     "Британијанын Вирҝин адалары": "VG",
-    "Британтјанын Һинд Океаны Әразиси": "IO",
     "Брунеј": "BN",
     "Буве адасы": "BV",
     "Буркина Фасо": "BF",
diff --git a/js/data/locale/az/Cyrl/ctryreverse.json b/js/data/locale/az/Cyrl/ctryreverse.json
index ee6729ab30..fdde3124d5 100644
--- a/js/data/locale/az/Cyrl/ctryreverse.json
+++ b/js/data/locale/az/Cyrl/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Исраил",
     "IM": "Мен адасы",
     "IN": "Һиндистан",
-    "IO": "Британтјанын Һинд Океаны Әразиси",
+    "IO": "Britaniyanın Hind Okeanı Ərazisi",
     "IQ": "Ираг",
     "IR": "Иран",
     "IS": "Исландија",
diff --git a/js/data/locale/az/Cyrl/unitfmt.json b/js/data/locale/az/Cyrl/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/az/Cyrl/unitfmt.json
+++ b/js/data/locale/az/Cyrl/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/az/unitfmt.json b/js/data/locale/az/unitfmt.json
index 5d7c70276e..6e6e2616e9 100644
--- a/js/data/locale/az/unitfmt.json
+++ b/js/data/locale/az/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfer",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#Bofor {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/saniyə",
             "british-thermal-unit": "#{n} Britaniya terman vahidi",
@@ -42,7 +43,7 @@
             "degree": "#{n} dərəcə",
             "dessert-spoon": "#{n} dessert qaşığı",
             "dessert-spoon-imperial": "#{n} İmp. dessert qaşığı",
-            "dot": "#{n} px",
+            "dot": "#{n} nöqtə",
             "dot-per-centimeter": "#{n} nöqtə / santimetr",
             "dot-per-inch": "#{n} nöqtə / düym",
             "dram": "#{n} dram",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/san",
             "british-thermal-unit": "#{n} Btv",
@@ -248,9 +250,9 @@
             "degree": "#{n} dər",
             "dessert-spoon": "#{n} des.qaş.",
             "dessert-spoon-imperial": "one#{n} des.qaş. İmp|#{n} des.qaş. İmp.",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} dpcm",
-            "dot-per-inch": "#{n} dpi",
+            "dot": "#{n} nöqtə",
+            "dot-per-centimeter": "#{n} nöq/sm",
+            "dot-per-inch": "#{n} nöq/düym",
             "dram": "#{n} dram",
             "drop": "#{n} damcı",
             "dunam": "#{n} dönüm",
diff --git a/js/data/locale/ba/unitfmt.json b/js/data/locale/ba/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ba/unitfmt.json
+++ b/js/data/locale/ba/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/bal/unitfmt.json b/js/data/locale/bal/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/bal/unitfmt.json
+++ b/js/data/locale/bal/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/bas/ctrynames.json b/js/data/locale/bas/ctrynames.json
index 5f6e72c2a1..2dd9080f93 100644
--- a/js/data/locale/bas/ctrynames.json
+++ b/js/data/locale/bas/ctrynames.json
@@ -41,12 +41,12 @@
     "Bìòn bi Marìanà ŋ̀ɔmbɔk": "MP",
     "Bìòn bi Salōmò": "SB",
     "Bìòn bi Tûrks nì Kalkòs": "TC",
-    "Bìtèk bi Ŋgisì i Tūyɛ Īndìà": "IO",
     "Bòdsùanà": "BW",
     "Bòhnià Ɛrzègòvinà": "BA",
     "Bòlivìà": "BO",
     "Bouvet Island": "BV",
     "Bràsîl": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bùlgarìà": "BG",
     "Bùrkìnà Fasò": "BF",
diff --git a/js/data/locale/bas/ctryreverse.json b/js/data/locale/bas/ctryreverse.json
index 21ab3d7ef0..32890ce8fc 100644
--- a/js/data/locale/bas/ctryreverse.json
+++ b/js/data/locale/bas/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isràɛ̂l",
     "IM": "Isle of Man",
     "IN": "Indìà",
-    "IO": "Bìtèk bi Ŋgisì i Tūyɛ Īndìà",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Ìrâk",
     "IR": "Ìrâŋ",
     "IS": "Ìslandìà",
diff --git a/js/data/locale/bas/unitfmt.json b/js/data/locale/bas/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/bas/unitfmt.json
+++ b/js/data/locale/bas/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/be/ctrynames.json b/js/data/locale/be/ctrynames.json
index ddbdff9fe6..54c2d54050 100644
--- a/js/data/locale/be/ctrynames.json
+++ b/js/data/locale/be/ctrynames.json
@@ -97,7 +97,7 @@
     "Заходняя Еўропа": "155",
     "Заходняя Сахара": "EH",
     "Зімбабвэ": "ZW",
-    "Злучаныя Штаты": "US",
+    "Злучаныя Штаты Амерыкі": "US",
     "Іарданія": "JO",
     "Ізраіль": "IL",
     "Інданезія": "ID",
diff --git a/js/data/locale/be/ctryreverse.json b/js/data/locale/be/ctryreverse.json
index 4def3675fa..4af31f2670 100644
--- a/js/data/locale/be/ctryreverse.json
+++ b/js/data/locale/be/ctryreverse.json
@@ -273,7 +273,7 @@
     "UG": "Уганда",
     "UM": "Малыя Аддаленыя астравы ЗША",
     "UN": "Арганізацыя Аб’яднаных Нацый",
-    "US": "Злучаныя Штаты",
+    "US": "Злучаныя Штаты Амерыкі",
     "UY": "Уругвай",
     "UZ": "Узбекістан",
     "VA": "Ватыкан",
diff --git a/js/data/locale/be/sysres.json b/js/data/locale/be/sysres.json
index 90db5a0b8e..842d1d5e19 100644
--- a/js/data/locale/be/sysres.json
+++ b/js/data/locale/be/sysres.json
@@ -15,7 +15,7 @@
     "#{num}mo ago": "one#{num} мес. таму|few#{num} мес. таму|many#{num} мес. таму|#{num} мес. таму",
     "#{num}s": "one#{num} с|few#{num} с|many#{num} с|#{num} с",
     "#{num}s ago": "one#{num} с таму|few#{num} с таму|many#{num} с таму|#{num} с таму",
-    "#{num}w": "one#{num} тыдз.|few#{num} тыдз.|many#{num} тыдз.|#{num} тыдз.",
+    "#{num}w": "one#{num} тыдз|few#{num} тыдз|many#{num} тыдз|#{num} тыдз",
     "#{num}w ago": "one#{num} тыд таму|few#{num} тыд таму|many#{num} тыд таму|#{num} тыд таму",
     "#{num}y": "one#{num} г.|few#{num} г.|many#{num} г.|#{num} г.",
     "#{num}y ago": "one#{num} г. таму|few#{num} г. таму|many#{num} г. таму|#{num} г. таму",
@@ -46,7 +46,7 @@
     "1#1 week ago|#{num} weeks ago": "one#{num} тыдзень таму|few#{num} тыдні таму|many#{num} тыдняў таму|#{num} тыдня таму",
     "1#1 week|#{num} weeks": "one#{num} тыдзень|few#{num} тыдні|many#{num} тыдняў|#{num} тыдня",
     "1#1 wk ago|#{num} wks ago": "one#{num} тыдзень таму|few#{num} тыдні таму|many#{num} тыдняў таму|#{num} тыдня таму",
-    "1#1 wk|#{num} wks": "one#{num} тыдз.|few#{num} тыдз.|many#{num} тыдз.|#{num} тыдз.",
+    "1#1 wk|#{num} wks": "one#{num} тыдз|few#{num} тыдз|many#{num} тыдз|#{num} тыдз",
     "1#1 year ago|#{num} years ago": "one#{num} год таму|few#{num} гады таму|many#{num} гадоў таму|#{num} года таму",
     "1#1 year|#{num} years": "one#{num} год|few#{num} гады|many#{num} гадоў|#{num} года",
     "1#1 yr ago|#{num} yrs ago": "one#{num} год таму|few#{num} гады таму|many#{num} гадоў таму|#{num} года таму",
@@ -194,7 +194,7 @@
     "durationLongDays": "one#{num} сут|few#{num} сут|many#{num} сут|#{num} сут",
     "durationMediumHours": "one#{num} гадз|few#{num} гадз|many#{num} гадз|#{num} гадз",
     "durationMediumMillis": "one#{num} мс|few#{num} мс|many#{num} мс|#{num} мс",
-    "durationMediumWeeks": "one#{num} тыдз.|few#{num} тыдз.|many#{num} тыдз.|#{num} тыдз.",
+    "durationMediumWeeks": "one#{num} тыдз|few#{num} тыдз|many#{num} тыдз|#{num} тыдз",
     "durationMediumYears": "one#{num} г.|few#{num} г.|many#{num} г.|#{num} г.",
     "durationShortMillis": "one#{num} мс|few#{num} мс|many#{num} мс|#{num} мс",
     "durationShortMinutes": "one#{num} хв|few#{num} хв|many#{num} хв|#{num} хв",
diff --git a/js/data/locale/be/unitfmt.json b/js/data/locale/be/unitfmt.json
index 10c720d30f..b62e08a88c 100644
--- a/js/data/locale/be/unitfmt.json
+++ b/js/data/locale/be/unitfmt.json
@@ -7,9 +7,10 @@
             "arc-minute": "one#{n} вуглавая мінута|few#{n} вуглавыя мінуты|many#{n} вуглавых мінут|#{n} вуглавой мінуты",
             "arc-second": "one#{n} вуглавая секунда|few#{n} вуглавыя секунды|many#{n} вуглавых секунд|#{n} вуглавой секунды",
             "astronomical-unit": "one#{n} астранамічная адзінка|few#{n} астранамічныя адзінкі|many#{n} астранамічных адзінак|#{n} астранамічнай адзінкі",
-            "atmosphere": "one#{n} атмасфера|few#{n} атм|many#{n} атмасфер|#{n} атмасферы",
+            "atmosphere": "one#{n} атмасфера|many#{n} атмасфер|#{n} атмасферы",
             "bar": "one#{n} бар|few#{n} бары|many#{n} бар|#{n} бара",
             "barrel": "one#{n} барэль|few#{n} барэлі|many#{n} барэляў|#{n} барэля",
+            "beaufort": "one#{n} бал Бафорта|many#{n} балаў Бафорта|#{n} бала Бафорта",
             "bit": "one#{n} біт|few#{n} біты|many#{n} біт|#{n} біта",
             "bit-per-second": "#{n} біта у секунду",
             "british-thermal-unit": "one#{n} брытанская цеплавая адзінка|few#{n} брытанскія цеплавыя адзінкі|many#{n} брытанскіх цеплавых адзінак|#{n} брытанскай цеплавой адзінкі",
@@ -41,15 +42,15 @@
             "decimeter": "one#{n} дэцыметр|few#{n} дэцыметры|many#{n} дэцыметраў|#{n} дэцыметра",
             "degree": "one#{n} градус|few#{n} градусы|many#{n} градусаў|#{n} градуса",
             "dessert-spoon": "one#{n} дэсертная лыжка|few#{n} дэсертныя лыжкі|many#{n} дэсертных лыжак|#{n} дэсертнай лыжкі",
-            "dessert-spoon-imperial": "one#{n} брытанская дэсертная лыжка|few#{n} брыт. дэс. л.|many#{n} брыт. дэс. л.|#{n} брытанскай дэсертнай лыжкі",
+            "dessert-spoon-imperial": "one#{n} брытанская дэсертная лыжка|few#{n} брытанскія дэсертныя лыжкі|many#{n} брытанскіх дэсертных лыжак|#{n} брытанскай дэсертнай лыжкі",
             "dot": "one#{n} кропка|many#{n} кропак|#{n} кропкі",
             "dot-per-centimeter": "one#{n} кропка на сантыметр|many#{n} кропак на сантыметр|#{n} кропкі на сантыметр",
             "dot-per-inch": "one#{n} кропка на цалю|many#{n} кропак на цалю|#{n} кропкі на цалю",
             "dram": "one#{n} драхма|many#{n} вад. драхмаў|#{n} вад. драхмы",
-            "drop": "one#{n} кропля|many#{n} кропляў|#{n} кроплі",
+            "drop": "one#{n} кропля|many#{n} кропель|#{n} кроплі",
             "dunam": "one#{n} дунам|few#{n} дунамы|many#{n} дунамаў|#{n} дунама",
             "earth-mass": "one#{n} маса Зямлі|many#{n} мас Зямлі|#{n} масы Зямлі",
-            "earth-radius": "one#{n} радыус Зямлі|few#{n} R⊕|many#{n} R⊕|#{n} радыуса Зямлі",
+            "earth-radius": "one#{n} радыус Зямлі|many#{n} радыусаў Зямлі|#{n} радыуса Зямлі",
             "electronvolt": "one#{n} электрон-вольт|few#{n} электрон-вольты|many#{n} электрон-вольтаў|#{n} электрон-вольта",
             "em": "#{n} эм",
             "fahrenheit": "one#{n} градус Фарэнгейта|few#{n} градусы Фарэнгейта|many#{n} градусаў Фарэнгейта|#{n} градуса Фарэнгейта",
@@ -72,11 +73,11 @@
             "gigahertz": "one#{n} гігагерц|few#{n} гігагерцы|many#{n} гігагерц|#{n} гігагерца",
             "gigawatt": "one#{n} гігават|few#{n} гігаваты|many#{n} гігават|#{n} гігавата",
             "grain": "one#{n} гран|few#{n} граны|many#{n} гранаў|#{n} грана",
-            "gram": "#{n} г",
+            "gram": "one#{n} грам|few#{n} грамы|many#{n} грамаў|#{n} грама",
             "hectare": "one#{n} гектар|few#{n} гектары|many#{n} гектараў|#{n} гектара",
             "hectoliter": "one#{n} гекталітр|few#{n} гекталітры|many#{n} гекталітраў|#{n} гекталітра",
             "hectopascal": "one#{n} гектапаскаль|few#{n} гектапаскалі|many#{n} гектапаскаляў|#{n} гектапаскаля",
-            "hertz": "one#{n} герц|many#{n} герца|#{n} герцы",
+            "hertz": "one#{n} герц|few#{n} герцы|many#{n} герц|#{n} герца",
             "horsepower": "one#{n} конская сіла|few#{n} конскія сілы|many#{n} конскіх сіл|#{n} конскай сілы",
             "hour": "one#{n} гадзіна|many#{n} гадзін|#{n} гадзіны",
             "inch": "one#{n} цаля|many#{n} цаляў|#{n} цалі",
@@ -92,17 +93,17 @@
             "kilobyte-per-hour": "#{n} кілабайта у гадзіну",
             "kilobyte-per-second": "#{n} кілабайта у секунду",
             "kilocalorie": "one#{n} кілакалорыя|many#{n} кілакалорый|#{n} кілакалорыі",
-            "kilogram": "#{n} кг",
+            "kilogram": "one#{n} кілаграм|few#{n} кілаграмы|many#{n} кілаграмаў|#{n} кілаграма",
             "kilohertz": "one#{n} кілагерц|few#{n} кілагерцы|many#{n} кілагерц|#{n} кілагерца",
             "kilojoule": "one#{n} кіладжоўль|few#{n} кіладжоўлі|many#{n} кіладжоўляў|#{n} кіладжоўля",
             "kilometer": "one#{n} кіламетр|few#{n} кіламетры|many#{n} кіламетраў|#{n} кіламетра",
-            "kilometer-per-hour": "#{n} км/гадз",
+            "kilometer-per-hour": "one#{n} кіламетр за гадзіну|few#{n} кіламетры за гадзіну|many#{n} кіламетраў за гадзіну|#{n} кіламетра за гадзіну",
             "kilometer-per-liter": "#{n} кіламетра на літр",
             "kilometer-per-second": "#{n} кіламетра у секунду",
             "kilopascal": "one#{n} кілапаскаль|few#{n} кілапаскалі|many#{n} кілапаскаляў|#{n} кілапаскаля",
-            "kilowatt": "one#{n} кілават|few#{n} кілаваты|many#{n} кілават|#{n} кілаватаў",
+            "kilowatt": "one#{n} кілават|few#{n} кілаваты|many#{n} кілават|#{n} кілавата",
             "kilowatt-hour": "one#{n} кілават-гадзіна|many#{n} кілават-гадзін|#{n} кілават-гадзіны",
-            "kilowatt-hour-per-100-kilometer": "one#{n} кілават-гадзіна на 100 кіламетраў|few#{n} кВт·г/100 км|many#{n} кВт·г/100 км|#{n} кілават-гадзіны на 100 кіламетраў",
+            "kilowatt-hour-per-100-kilometer": "one#{n} кілават-гадзіна на 100 кіламетраў|many#{n} кілават-гадзін на 100 кіламетраў|#{n} кілават-гадзіны на 100 кіламетраў",
             "knot": "one#{n} вузел|few#{n} вузлы|many#{n} вузлоў|#{n} вузла",
             "light-year": "one#{n} светлавы год|few#{n} светлавыя гады|many#{n} светлавых гадоў|#{n} светлавога года",
             "liter": "one#{n} літр|few#{n} літры|many#{n} літраў|#{n} літра",
@@ -118,23 +119,23 @@
             "megahertz": "one#{n} мегагерц|few#{n} мегагерцы|many#{n} мегагерц|#{n} мегагерца",
             "megaliter": "one#{n} мегалітр|few#{n} мегалітры|many#{n} мегалітраў|#{n} мегалітра",
             "megapascal": "one#{n} мегапаскаль|few#{n} мегапаскалі|many#{n} мегапаскаляў|#{n} мегапаскаля",
-            "megapixel": "one#{n} мегапіксель|few#{n} мегапіксель|many#{n} мегапіксель|#{n} мегапікселя",
+            "megapixel": "one#{n} мегапіксель|few#{n} мегапікселІ|many#{n} мегапікселяў|#{n} мегапікселя",
             "megawatt": "one#{n} мегават|few#{n} мегаваты|many#{n} мегават|#{n} мегавата",
             "meter": "one#{n} метр|few#{n} метры|many#{n} метраў|#{n} метра",
-            "meter-per-second": "#{n} м/с",
-            "meter-per-square-second": "#{n} м/с²",
-            "microgram": "#{n} мкг",
+            "meter-per-second": "one#{n} метр за секунду|many#{n} метраў за секунду|#{n} метры за секунду",
+            "meter-per-square-second": "one#{n} метр у секунду ў квадраце|few#{n} метры ў секунду ў квадраце|many#{n} метраў у секунду ў квадраце|#{n} метра ў секунду ў квадраце",
+            "microgram": "one#{n} мікраграм|few#{n} мікраграмы|many#{n} мікраграмаў|#{n} мікраграма",
             "micrometer": "one#{n} мікраметр|few#{n} мікраметры|many#{n} мікраметраў|#{n} мікраметра",
             "microsecond": "one#{n} мікрасекунда|many#{n} мікрасекунд|#{n} мікрасекунды",
             "mile": "one#{n} міля|many#{n} міль|#{n} мілі",
             "mile-per-gallon": "one#{n} міля на галон|many#{n} міль на галон|#{n} мілі на галон",
             "mile-per-gallon-imperial": "one#{n} міля на імп. галон|many#{n} міль на імп. галон|#{n} мілі на імп. галон",
-            "mile-per-hour": "one#{n} міля/гадз|many#{n} міль/гадз|#{n} мілі/гадз",
+            "mile-per-hour": "one#{n} міля за гадзіну|many#{n} міль за гадзіну|#{n} мілі за гадзіну",
             "mile-per-second": "#{n} мілі у секунду",
             "mile-scandinavian": "one#{n} скандынаўская міля|few#{n} скандынаўскія мілі|many#{n} скандынаўскіх міль|#{n} скандынаўскай мілі",
             "milliampere": "one#{n} міліампер|few#{n} міліамперы|many#{n} міліампер|#{n} міліампера",
             "millibar": "one#{n} мілібар|few#{n} мілібары|many#{n} мілібар|#{n} мілібара",
-            "milligram": "#{n} мг",
+            "milligram": "one#{n} міліграм|few#{n} міліграмы|many#{n} міліграм|#{n} міліграма",
             "milligram-ofglucose-per-deciliter": "one#{n} міліграм на дэцылітр|few#{n} міліграмы на дэцылітр|many#{n} міліграм на дэцылітр|#{n} міліграма на дэцылітр",
             "milliliter": "one#{n} мілілітр|few#{n} мілілітры|many#{n} мілілітраў|#{n} мілілітра",
             "millimeter": "one#{n} міліметр|few#{n} міліметры|many#{n} міліметраў|#{n} міліметра",
@@ -143,7 +144,7 @@
             "millisecond": "one#{n} мілісекунда|many#{n} мілісекунд|#{n} мілісекунды",
             "milliwatt": "one#{n} міліват|few#{n} міліваты|many#{n} міліват|#{n} мілівата",
             "minute": "one#{n} хвіліна|many#{n} хвілін|#{n} хвіліны",
-            "mole": "one#{n} моль|few#{n} молі|many#{n} моляў|#{n} моля",
+            "mole": "one#{n} моль|many#{n} моль|#{n} молі",
             "month": "one#{n} месяц|many#{n} месяцаў|#{n} месяца",
             "nanometer": "one#{n} нанаметр|few#{n} нанаметры|many#{n} нанаметраў|#{n} нанаметра",
             "nanosecond": "one#{n} нанасекунда|many#{n} нанасекунд|#{n} нанасекунды",
@@ -167,7 +168,7 @@
             "pixel": "one#{n} піксель|few#{n} пікселі|many#{n} пікселяў|#{n} пікселя",
             "pixel-per-centimeter": "one#{n} піксель на сантыметр|few#{n} пікселі на сантыметр|many#{n} пікселяў на сантыметр|#{n} пікселя на сантыметр",
             "pixel-per-inch": "one#{n} піксель на цалю|few#{n} пікселі на цалю|many#{n} пікселяў на цалю|#{n} пікселя на цалю",
-            "point": "one#{n} пункт|few#{n} пункты|many#{n} пунктаў|#{n} пункту",
+            "point": "one#{n} пункт|few#{n} пункты|many#{n} пунктаў|#{n} пункта",
             "pound": "one#{n} фунт|few#{n} фунты|many#{n} фунтаў|#{n} фунта",
             "pound-force": "one#{n} фунт-сіла|many#{n} фунт-сіл|#{n} фунт-сілы",
             "pound-force-foot": "one#{n} фунт-фут|few#{n} фунт-футы|many#{n} фунт-футаў|#{n} фунт-фута",
@@ -189,7 +190,7 @@
             "square-meter": "one#{n} квадратны метр|few#{n} квадратныя метры|many#{n} квадратных метраў|#{n} квадратнага метра",
             "square-mile": "one#{n} квадратная міля|few#{n} квадратныя мілі|many#{n} квадратных міль|#{n} квадратнай мілі",
             "square-yard": "one#{n} квадратны ярд|few#{n} квадратныя ярды|many#{n} квадратных ярдаў|#{n} квадратнага ярда",
-            "stone": "one#{n} стоўн|few#{n} стоны|many#{n} стонаў|#{n} стона",
+            "stone": "one#{n} стон|few#{n} стоны|many#{n} стонаў|#{n} стона",
             "tablespoon": "one#{n} сталовая лыжка|few#{n} сталовыя лыжкі|many#{n} сталовых лыжак|#{n} сталовай лыжкі",
             "teaspoon": "one#{n} чайная лыжка|few#{n} чайныя лыжкі|many#{n} чайных лыжак|#{n} чайнай лыжкі",
             "terabit": "one#{n} тэрабіт|few#{n} тэрабіты|many#{n} тэрабіт|#{n} тэрабіта",
@@ -216,10 +217,11 @@
             "atmosphere": "#{n} атм",
             "bar": "one#{n} бар|few#{n} бары|many#{n} бар|#{n} бара",
             "barrel": "one#{n} барэль|few#{n} барэлі|many#{n} барэляў|#{n} барэля",
+            "beaufort": "#{n} Бфт",
             "bit": "one#{n} біт|few#{n} біты|many#{n} біт|#{n} біта",
             "bit-per-second": "#{n} біта/с",
             "british-thermal-unit": "#{n} BTU",
-            "bushel": "#{n} буш.",
+            "bushel": "#{n} буш",
             "byte": "one#{n} байт|few#{n} байты|many#{n} байт|#{n} байта",
             "byte-per-hour": "#{n} байта/гадз",
             "byte-per-second": "#{n} байта/с",
@@ -247,10 +249,10 @@
             "decimeter": "#{n} дм",
             "degree": "#{n}°",
             "dessert-spoon": "#{n} дэс. л.",
-            "dessert-spoon-imperial": "#{n} брыт. дэс. л.",
+            "dessert-spoon-imperial": "one#{n} брыт. дэс. лыжка|many#{n} брыт. дэс. лыжак|#{n} брыт. дэс. лыжкі",
             "dot": "#{n} кр",
             "dot-per-centimeter": "#{n} кр/см",
-            "dot-per-inch": "#{n} dpi",
+            "dot-per-inch": "#{n} кр/цал",
             "dram": "one#{n} вад. драхма|many#{n} вад. драхмаў|#{n} вад. драхмы",
             "drop": "one#{n} кропля|many#{n} кропель|#{n} кроплі",
             "dunam": "one#{n} дунам|few#{n} дунамы|many#{n} дунамаў|#{n} дунама",
@@ -259,16 +261,16 @@
             "electronvolt": "#{n} эВ",
             "em": "#{n} эм",
             "fahrenheit": "#{n} °F",
-            "fathom": "#{n} фат.",
+            "fathom": "#{n} фат",
             "fluid-ounce": "#{n} вадк. унц.",
             "fluid-ounce-imperial": "one#{n} імп. вадкая унцыя|few#{n} імп. вадкія унцыі|many#{n} імп. вадкіх унцый|#{n} імп. вадкай унцыі",
             "foodcalorie": "#{n} кал",
-            "foot": "one#{n} фут|few#{n} футы|many#{n} футаў|#{n} фута",
-            "foot-per-second": "#{n} фута/с",
-            "furlong": "#{n} фур.",
+            "foot": "#{n} фт",
+            "foot-per-second": "#{n} фт/с",
+            "furlong": "#{n} фур",
             "g-force": "#{n} g",
             "gallon": "#{n} гал",
-            "gallon-imperial": "#{n} імп. гал.",
+            "gallon-imperial": "#{n} імп. гал",
             "generic": "#{n} °",
             "gigabit": "#{n} Гбіт",
             "gigabit-per-second": "#{n} Гбіт/с",
@@ -285,7 +287,7 @@
             "hertz": "#{n} Гц",
             "horsepower": "#{n} к. с.",
             "hour": "#{n} гадз",
-            "inch": "one#{n} цаля|many#{n} цаляў|#{n} цалі",
+            "inch": "#{n} цал",
             "inch-ofhg": "one#{n} цаля рт. сл.|many#{n} цаляў рт. сл.|#{n} цалі рт. сл.",
             "item": "#{n} элем.",
             "jigger": "one#{n} джыгер|few#{n} джыгеры|many#{n} джыгераў|#{n} джыгера",
@@ -310,7 +312,7 @@
             "kilowatt-hour": "#{n} кВт·г",
             "kilowatt-hour-per-100-kilometer": "#{n} кВт·г/100 км",
             "knot": "#{n} вуз.",
-            "light-year": "#{n} св. г.",
+            "light-year": "one#{n} св. год|few#{n} св. гады|many#{n} св. гадоў|#{n} св. года",
             "liter": "#{n} л",
             "liter-per-100-kilometer": "#{n} л/100 км",
             "liter-per-kilometer": "#{n} л/км",
@@ -334,7 +336,7 @@
             "microsecond": "#{n} мкс",
             "mile": "one#{n} міля|many#{n} міль|#{n} мілі",
             "mile-per-gallon": "one#{n} міля/гал.|many#{n} міль/гал.|#{n} мілі/гал.",
-            "mile-per-gallon-imperial": "one#{n} міля/імп. гал.|few#{n} мілі/імп. гал.|many#{n} міль/імп. галон|#{n} мілі/імп. галон",
+            "mile-per-gallon-imperial": "one#{n} міля/імп. гал.|many#{n} міль/імп. гал.|#{n} мілі/імп. гал.",
             "mile-per-hour": "one#{n} міля/гадз|many#{n} міль/гадз|#{n} мілі/гадз",
             "mile-per-second": "#{n} мілі/с",
             "mile-scandinavian": "many#{n} скан. міль|#{n} скан. мілі",
@@ -349,7 +351,7 @@
             "millisecond": "#{n} мс",
             "milliwatt": "#{n} мВт",
             "minute": "#{n} хв",
-            "mole": "one#{n} моль|few#{n} молі|many#{n} моляў|#{n} моля",
+            "mole": "one#{n} моль|many#{n} моль|#{n} молі",
             "month": "#{n} мес.",
             "nanometer": "#{n} нм",
             "nanosecond": "#{n} нс",
@@ -359,7 +361,7 @@
             "ohm": "#{n} Ом",
             "ounce": "#{n} унц.",
             "ounce-troy": "#{n} тр. унц.",
-            "parsec": "#{n} пс",
+            "parsec": "#{n} пк",
             "pascal": "#{n} Па",
             "percent": "#{n} %",
             "permille": "#{n} ‰",
@@ -370,12 +372,12 @@
             "pinch": "one#{n} дробка|many#{n} дробак|#{n} дробкі",
             "pint": "one#{n} пінта|many#{n} пінтаў|#{n} пінты",
             "pint-metric": "one#{n} мет. пінта|many#{n} мет. пінтаў|#{n} мет. пінты",
-            "pixel": "one#{n} піксель|few#{n} пікселі|many#{n} пікселяў|#{n} пікселя",
-            "pixel-per-centimeter": "one#{n} піксель/см|few#{n} пікселі/см|many#{n} пікселяў/см|#{n} пікселя/см",
-            "pixel-per-inch": "one#{n} піксель/цалю|few#{n} пікселі/цалю|many#{n} пікселяў/цалю|#{n} пікселя/цалю",
+            "pixel": "#{n} пікс",
+            "pixel-per-centimeter": "#{n} пікс/см",
+            "pixel-per-inch": "#{n} пікс/цал",
             "point": "#{n} пт",
             "pound": "one#{n} фунт|few#{n} фунты|many#{n} фунтаў|#{n} фунта",
-            "pound-force": "one#{n} фунт-сіла|few#{n} фунт-сілы|#{n} lbf",
+            "pound-force": "one#{n} фунт-сіла|few#{n} фунт-сілы|#{n} фунт-сіл",
             "pound-force-foot": "one#{n} фунт-фут|few#{n} фунт-футы|many#{n} фунт-футаў|#{n} фунт-фута",
             "pound-force-per-square-inch": "one#{n} фунт на кв. цалю|few#{n} фунты на кв. цалю|many#{n} фунтаў на кв. цалю|#{n} фунта на кв. цалю",
             "quart": "one#{n} кварта|many#{n} кварт|#{n} кварты",
@@ -403,12 +405,12 @@
             "terabyte": "#{n} ТБ",
             "terabyte-per-hour": "#{n} ТБ/гадз",
             "terabyte-per-second": "#{n} ТБ/с",
-            "therm-us": "one#{n} амер. тэрм|few#{n} амер. тэрмы|many#{n} амер. тэрмаў|#{n} амер. тэрма",
+            "therm-us": "one#{n} амер. тэрм|many#{n} амер. тэрмаў|#{n} амер. тэрмы",
             "ton": "#{n} амер. т",
             "tonne": "#{n} т",
             "volt": "#{n} В",
             "watt": "#{n} Вт",
-            "week": "#{n} тыдз.",
+            "week": "#{n} тыдз",
             "yard": "one#{n} ярд|few#{n} ярды|many#{n} ярдаў|#{n} ярда",
             "year": "#{n} г."
         }
diff --git a/js/data/locale/bem/unitfmt.json b/js/data/locale/bem/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/bem/unitfmt.json
+++ b/js/data/locale/bem/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/bew/dateformats.json b/js/data/locale/bew/dateformats.json
new file mode 100644
index 0000000000..97a8977cbb
--- /dev/null
+++ b/js/data/locale/bew/dateformats.json
@@ -0,0 +1,133 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/bew/sysres.json b/js/data/locale/bew/sysres.json
new file mode 100644
index 0000000000..03ebba6582
--- /dev/null
+++ b/js/data/locale/bew/sysres.json
@@ -0,0 +1,142 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "EE0": "Sun",
+    "EE1": "Mon",
+    "EE2": "Tue",
+    "EE3": "Wed",
+    "EE4": "Thu",
+    "EE5": "Fri",
+    "EE6": "Sat",
+    "EEEE0": "Sun",
+    "EEEE1": "Mon",
+    "EEEE2": "Tue",
+    "EEEE3": "Wed",
+    "EEEE4": "Thu",
+    "EEEE5": "Fri",
+    "EEEE6": "Sat",
+    "MMM1": "M01",
+    "MMM10": "M10",
+    "MMM11": "M11",
+    "MMM12": "M12",
+    "MMM2": "M02",
+    "MMM3": "M03",
+    "MMM4": "M04",
+    "MMM5": "M05",
+    "MMM6": "M06",
+    "MMM7": "M07",
+    "MMM8": "M08",
+    "MMM9": "M09",
+    "MMMM1": "M01",
+    "MMMM10": "M10",
+    "MMMM11": "M11",
+    "MMMM12": "M12",
+    "MMMM2": "M02",
+    "MMMM3": "M03",
+    "MMMM4": "M04",
+    "MMMM5": "M05",
+    "MMMM6": "M06",
+    "MMMM7": "M07",
+    "MMMM8": "M08",
+    "MMMM9": "M09",
+    "N1": "M",
+    "N10": "M",
+    "N11": "M",
+    "N12": "M",
+    "N2": "M",
+    "N4": "M",
+    "N6": "M",
+    "N7": "M",
+    "N8": "M",
+    "N9": "M",
+    "NN1": "M0",
+    "NN10": "M1",
+    "NN11": "M1",
+    "NN12": "M1",
+    "NN2": "M0",
+    "NN3": "M0",
+    "NN4": "M0",
+    "NN5": "M0",
+    "NN6": "M0",
+    "NN7": "M0",
+    "NN8": "M0",
+    "NN9": "M0",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": ", ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/bew/unitfmt.json b/js/data/locale/bew/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/bew/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/bez/ctrynames.json b/js/data/locale/bez/ctrynames.json
index 008dfbd05f..4225ac1b28 100644
--- a/js/data/locale/bez/ctrynames.json
+++ b/js/data/locale/bez/ctrynames.json
@@ -7,6 +7,7 @@
     "Asia": "142",
     "Australasia": "053",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Canary Islands": "IC",
     "Caribbean": "029",
     "Caribbean Netherlands": "BQ",
@@ -285,7 +286,6 @@
     "Svalbard & Jan Mayen": "SJ",
     "Tristan da Cunha": "TA",
     "U.S. Outlying Islands": "UM",
-    "Ulubali lwa Hubahari ya Hindi lwa Huingereza": "IO",
     "Ulubali lwa Magharibi nu Gaza wa Hupalestina": "PS",
     "United Nations": "UN",
     "Unknown Region": "ZZ",
diff --git a/js/data/locale/bez/ctryreverse.json b/js/data/locale/bez/ctryreverse.json
index b62d293254..1f9f76b700 100644
--- a/js/data/locale/bez/ctryreverse.json
+++ b/js/data/locale/bez/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Huislaheli",
     "IM": "Isle of Man",
     "IN": "Huindia",
-    "IO": "Ulubali lwa Hubahari ya Hindi lwa Huingereza",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Huilaki",
     "IR": "Huuajemi",
     "IS": "Huaislandi",
diff --git a/js/data/locale/bez/unitfmt.json b/js/data/locale/bez/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/bez/unitfmt.json
+++ b/js/data/locale/bez/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/bg/dateformats.json b/js/data/locale/bg/dateformats.json
index bcab691636..b70880748d 100644
--- a/js/data/locale/bg/dateformats.json
+++ b/js/data/locale/bg/dateformats.json
@@ -145,24 +145,10 @@
         "time": {
             "12": {
                 "ah": "h 'ч'. a",
-                "ahm": "h:mm 'ч'. a",
-                "ahms": "h:mm:ss 'ч'. a",
-                "ahmsz": "h:mm:ss 'ч'. a z",
-                "ahmz": "h:mm 'ч'. a z",
-                "hm": "h:mm 'ч'.",
-                "hms": "h:mm:ss 'ч'.",
-                "hmsz": "h:mm:ss 'ч'. z",
-                "hmz": "h:mm 'ч'. z"
-            },
-            "24": {
-                "ahm": "H:mm 'ч'.",
-                "ahms": "H:mm:ss 'ч'.",
-                "ahmsz": "H:mm:ss 'ч'. z",
-                "ahmz": "H:mm 'ч'. z",
-                "hm": "H:mm 'ч'.",
-                "hms": "H:mm:ss 'ч'.",
-                "hmsz": "H:mm:ss 'ч'. z",
-                "hmz": "H:mm 'ч'. z"
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
             }
         }
     }
diff --git a/js/data/locale/bg/unitfmt.json b/js/data/locale/bg/unitfmt.json
index 2e0e201626..acd79dcf03 100644
--- a/js/data/locale/bg/unitfmt.json
+++ b/js/data/locale/bg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} атмосфера|#{n} атмосфери",
             "bar": "one#{n} бар|#{n} бара",
             "barrel": "one#{n} барел|#{n} барела",
+            "beaufort": "#{n} по Бофорт",
             "bit": "one#{n} бит|#{n} бита",
             "bit-per-second": "#{n} бита за секунда",
             "british-thermal-unit": "one#{n} британска термална единица|#{n} британски термални единици",
@@ -51,7 +52,7 @@
             "earth-mass": "one#{n} маса на Земята|#{n} маси на Земята",
             "earth-radius": "one#{n} земен радиус|#{n} земни радиуса",
             "electronvolt": "one#{n} електронволт|#{n} електронволта",
-            "em": "#{n} em",
+            "em": "#{n} ем",
             "fahrenheit": "one#{n} градус по Фаренхайт|#{n} градуса по Фаренхайт",
             "fathom": "one#{n} фатом|#{n} фатома",
             "fluid-ounce": "one#{n} течна унция|#{n} течни унции",
@@ -170,7 +171,7 @@
             "point": "one#{n} пункт|#{n} пункта",
             "pound": "one#{n} фунт|#{n} фунта",
             "pound-force": "one#{n} фунт сила|#{n} фунта сила",
-            "pound-force-foot": "one#{n} паунд-фут сила|#{n} паунд-фута",
+            "pound-force-foot": "one#{n} паунд-фут сила|#{n} паунд-фута сила",
             "pound-force-per-square-inch": "one#{n} фунт на квадратен инч|#{n} фунта на квадратен инч",
             "quart": "one#{n} кварта|#{n} кварти",
             "quart-imperial": "one#{n} имперска кварта|#{n} имперски кварти",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} по Bft",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/сек",
             "british-thermal-unit": "#{n} BTU",
@@ -249,15 +251,15 @@
             "dessert-spoon": "one#{n} дес. лъжица|#{n} дес. лъжици",
             "dessert-spoon-imperial": "one#{n} брит. дес. лъжица|#{n} брит. дес. лъжици",
             "dot": "one#{n} точка|#{n} точки",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "one#{n} теч. драм|#{n} теч. драма",
             "drop": "one#{n} капка|#{n} капки",
             "dunam": "one#{n} дюнюм|#{n} дюнюма",
             "earth-mass": "#{n} M⊕",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "#{n} eV",
-            "em": "#{n} em",
+            "em": "#{n} ем",
             "fahrenheit": "#{n}°F",
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz US",
diff --git a/js/data/locale/bgc/unitfmt.json b/js/data/locale/bgc/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/bgc/unitfmt.json
+++ b/js/data/locale/bgc/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/bgn/unitfmt.json b/js/data/locale/bgn/unitfmt.json
index 5e41a3883e..2993540508 100644
--- a/js/data/locale/bgn/unitfmt.json
+++ b/js/data/locale/bgn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit ثانیه‌ای تا",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/ث",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/bho/unitfmt.json b/js/data/locale/bho/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/bho/unitfmt.json
+++ b/js/data/locale/bho/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/blo/ctrynames.json b/js/data/locale/blo/ctrynames.json
new file mode 100644
index 0000000000..79f2482a96
--- /dev/null
+++ b/js/data/locale/blo/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "Afganistan": "AF",
+    "Albanii": "AL",
+    "Aljerii": "DZ",
+    "Anɖɔraa": "AD",
+    "Antiguwaa na Barbuɖaa": "AG",
+    "Aŋgolaa": "AO",
+    "Aŋguwilaa": "AI",
+    "Arjantin": "AR",
+    "Armenii": "AM",
+    "Arubaa": "AW",
+    "Asɛnsiyɔɔn kaAtukǝltǝna": "AC",
+    "Asɛrbaɩjaŋ": "AZ",
+    "Bahamaasɩ": "BS",
+    "Baŋglaɖɛɛshɩ": "BD",
+    "Barbaɖɔɔsɩ": "BB",
+    "Barɛɛn": "BH",
+    "Belaruus": "BY",
+    "Beliis": "BZ",
+    "Benɛɛ": "BJ",
+    "Bɛljiiki": "BE",
+    "Bɛrmuɖaa": "BM",
+    "Bolifiya": "BO",
+    "Bɔsniya na Hɛrsegɔfina": "BA",
+    "Bɔsʊwanaa": "BW",
+    "Bresil": "BR",
+    "Brunɛɩ": "BN",
+    "Bufee kaAtukǝltǝna": "BV",
+    "Bulgarii": "BG",
+    "Burkinaa": "BF",
+    "Burunɖii": "BI",
+    "Butan": "BT",
+    "Caɖ": "TD",
+    "Caɩna": "CN",
+    "Cɛk": "CZ",
+    "Ciprɔs": "CY",
+    "Ɖanǝmark": "DK",
+    "Ɖiyego Garsiya": "DG",
+    "Ɖominikaa": "DM",
+    "Ɖominikaa kaRepibliiki": "DO",
+    "Ejipti": "EG",
+    "Ekuwaɖɔɔr": "EC",
+    "Emiir baGanɔ gaɖɔŋkɔnɔ kaAlaaributǝna": "AE",
+    "Eritree": "ER",
+    "Eroo kaBʊtǝna": "EZ",
+    "Etiyopii": "ET",
+    "Ɛl Salfaɖɔɔr": "SV",
+    "Ɛnɖonosii": "ID",
+    "Ɛspanyǝ": "ES",
+    "Ɛstoniya": "EE",
+    "Ɛsʊwatinii": "SZ",
+    "Fanuwatu": "VU",
+    "Faroi kaBʊtukǝltǝna": "FO",
+    "Fatikaŋ kaMpá": "VA",
+    "Fenesuwelaa": "VE",
+    "Fɛnlanɖ": "FI",
+    "Fɛtnam": "VN",
+    "Fiji": "FJ",
+    "Filipiin": "PH",
+    "Fɩrjɩɩn kaBʊtukǝltǝna Amalɩka kabʊja": "VI",
+    "Fɩrjɩɩn kǝBʊtukǝltǝna Gɛɛshɩ kabʊja": "VG",
+    "Fɔklanɖ kaBʊtukǝltǝna": "FK",
+    "Gabɔŋ": "GA",
+    "Gacǝlǝŋtǝna": "142",
+    "Gacǝlǝŋtǝna gajakalaŋ": "030",
+    "Gacǝlǝŋtǝna gɩcɩɩca": "143",
+    "Gacǝlǝŋtǝna gɩteŋshilelaŋ": "145",
+    "Gacǝlǝŋtǝna gʊnyɩsonolaŋ": "034",
+    "Gacǝlǝŋtǝna gʊsono na gajakayɛlaŋ kʊfɔɔ nɩ": "035",
+    "Gafɔntǝna": "FR",
+    "Gafɔntǝna kaBʊtǝna gʊnyɩsonolaŋ kabʊja": "TF",
+    "Gagɛɛshɩtǝna": "GB",
+    "Gajaamatǝna": "DE",
+    "Gamalɩkatǝna": "019",
+    "Gamalɩkatǝna gɩcɩɩca": "013",
+    "Gamalɩkatǝna gʊnyɩpɛnɛlaŋ": "003",
+    "Gamalɩkatǝna gʊnyɩsonolaŋ": "005",
+    "Gamalɩkatǝna kagʊnyɩpɛnɛlaŋ": "021",
+    "Gambii": "GM",
+    "Gana": "GH",
+    "Ganɔ gaɖɔŋkɔnɔ kaBʊtǝna Amalɩka nɩ": "US",
+    "Ganɔ gaɖɔŋkɔnɔ kaBʊtǝna Amalɩka nɩ kaBʊtukǝltǝna bʊlǝŋka": "UM",
+    "Ganɔ gaɖɔŋkɔnɔ kaBʊtǝna Garɩfɔntǝna nɩ": "EU",
+    "Ganɔ gaɖɔŋkɔnɔ kaBʊtǝna nɖulinya nɩ": "UN",
+    "Garɩɖontǝna": "002",
+    "Garɩɖontǝna gajakalaŋ": "014",
+    "Garɩɖontǝna gɩcɩɩca": "017",
+    "Garɩɖontǝna gɩteŋshilelaŋ": "011",
+    "Garɩɖontǝna gʊnyɩpɛnɛlaŋ": "015",
+    "Garɩɖontǝna gʊnyɩsonolaŋ": "018",
+    "Garɩɖontǝna Sahara katǝntǝn": "202",
+    "Garɩfɔntǝna": "150",
+    "Garɩfɔntǝna gajakalaŋ": "151",
+    "Garɩfɔntǝna gɩteŋshilelaŋ": "155",
+    "Garɩfɔntǝna gʊnyɩpɛnɛlaŋ": "154",
+    "Garɩfɔntǝna gʊnyɩsonolaŋ": "039",
+    "Gatutaltǝna": "AQ",
+    "Gǝrǝnsɛɩ": "GG",
+    "Gɛɛshɩ kaAtǝna Inɖiya kaTeŋku nɩ": "IO",
+    "Gibraltaa": "GI",
+    "Ginee": "GN",
+    "Ginee Bisoo": "GW",
+    "Ginee Malabo": "GQ",
+    "Grenaɖaa": "GD",
+    "Grɛs": "GR",
+    "Grinlanɖ": "GL",
+    "Guwaɖeluupu": "GP",
+    "Guwam": "GU",
+    "Guwatemalaa": "GT",
+    "Guyanaa": "GY",
+    "Guyanaa Gafɔntǝna kaja": "GF",
+    "gʊsaʊɩ kʊyɔʊ ʊ mana ma": "ZZ",
+    "Hayitii": "HT",
+    "Hɛɛrɖ na Mɛkɖɔnalɖ kaBʊtukǝltǝna": "HM",
+    "Holanɖ": "NL",
+    "Holanɖ kaKarayiib": "BQ",
+    "Hɔnɖuraasɩ": "HN",
+    "Hɔŋ Kɔŋ Caɩna kaja": "HK",
+    "Ikrɛɛn": "UA",
+    "Imoris": "MU",
+    "Inɖiya": "IN",
+    "Iraŋ": "IR",
+    "Irlanɖ": "IE",
+    "Islanɖ": "IS",
+    "Italii": "IT",
+    "Ɩraakɩ": "IQ",
+    "Jamaɩka": "JM",
+    "Japaŋ": "JP",
+    "Jersei": "JE",
+    "Jibutii": "DJ",
+    "Jɔrɖanii": "JO",
+    "Jɔrjiya": "GE",
+    "Jɔrjiya gʊnyɩsonolaŋ kaja na Sanɖuush gʊnyɩsonolaŋ kaBʊtukǝltǝna": "GS",
+    "Kaleɖonii afɔlɩ": "NC",
+    "Kamboɖiya": "KH",
+    "Kamerun": "CM",
+    "Kanaɖaa": "CA",
+    "Kanarii kaBʊtukǝltǝna": "IC",
+    "Kapfɛɛr": "CV",
+    "Karayiib": "029",
+    "Kasastan": "KZ",
+    "Kataa": "QA",
+    "Kayimaan kaBʊtukǝltǝna": "KY",
+    "Keniya": "KE",
+    "Kirgistan": "KG",
+    "Kiribatii": "KI",
+    "Klipɛɛtɔn kaAtukǝltǝna": "CP",
+    "Koɖifʊaa": "CI",
+    "Kokoos (Kiiliŋ) kaBʊtukǝltǝna": "CC",
+    "Kolɔmbii": "CO",
+    "Komɔɔr": "KM",
+    "Koŋgoo Brasafil": "CG",
+    "Koŋgoo Kinshasaa": "CD",
+    "Koree gʊnyɩpɛnɛlaŋ": "KP",
+    "Koree gʊnyɩsonolaŋ": "KR",
+    "Koweeti": "KW",
+    "Kɔsofoo": "XK",
+    "Kɔsta Rikaa": "CR",
+    "Krowasii": "HR",
+    "Kubaa": "CU",
+    "Kurasawuu": "CW",
+    "Kʊkʊ kaBʊtukǝltǝna": "CK",
+    "Latɛŋ kaAmalɩkatǝna": "419",
+    "Lawɔs": "LA",
+    "Lesotoo": "LS",
+    "Lɛtfiya": "LV",
+    "Liberiya": "LR",
+    "Libii": "LY",
+    "Liibaaŋ": "LB",
+    "Liishtɛntaɩn": "LI",
+    "Lituwaniya": "LT",
+    "Lusɛmbuur": "LU",
+    "Maɖagaskaa": "MG",
+    "Makawoo Caɩna kaja": "MO",
+    "Malawii": "MW",
+    "Malɖiifu": "MV",
+    "Malɛsii": "MY",
+    "Malii": "ML",
+    "Malta": "MT",
+    "Man kaAtukǝltǝna": "IM",
+    "Mariyan kaBʊtukǝltǝna gʊnyɩpɛnɛlaŋ": "MP",
+    "Marshal kaBʊtukǝltǝna": "MH",
+    "Martiniiki": "MQ",
+    "Maseɖoniya gʊnyɩpɛnɛlaŋ kaja": "MK",
+    "Mayɔɔtɩ": "YT",
+    "Melanesiya": "054",
+    "Mɛsik": "MX",
+    "Mikronesiya": "FM",
+    "Mikronesiya kagʊsaʊ": "057",
+    "Miyanmaa (Birmanii)": "MM",
+    "Monakoo": "MC",
+    "Moritanii": "MR",
+    "Morooko": "MA",
+    "Mosambii": "MZ",
+    "Mɔlɖafiya": "MD",
+    "Mɔnsɛraatɩ": "MS",
+    "Mɔntenegroo": "ME",
+    "Mɔŋgolii": "MN",
+    "Namibii": "NA",
+    "Nanjiiriya": "NG",
+    "Nawuru": "NR",
+    "nɖulinya": "001",
+    "Neepal": "NP",
+    "Nijɛr": "NE",
+    "Nikaraguwaa": "NI",
+    "Niwuye": "NU",
+    "Nowɛl kaAtukǝltǝna": "CX",
+    "Nɔrfɛsh": "NO",
+    "Nɔrfook kaAtukǝltǝna": "NF",
+    "Oman": "OM",
+    "Oseyanii": "009",
+    "Oseyanii kasaʊlǝŋka": "QO",
+    "Otrish": "AT",
+    "Ɔŋgrii": "HU",
+    "Ɔɔlanɖ kaBʊtǝlǝltǝna": "AX",
+    "Ɔstracǝlǝŋtǝna": "053",
+    "Ɔstraliya": "AU",
+    "Pakistan": "PK",
+    "Palawoo": "PW",
+    "Palɛstiin kAsàʊ": "PS",
+    "Panamaa": "PA",
+    "Papuasii Ginee afɔlɩ": "PG",
+    "Paraguwee": "PY",
+    "Peruu": "PE",
+    "Pɩtkɛɛn kaBʊtukǝltǝna": "PN",
+    "Polanɖ": "PL",
+    "Polinesiya": "061",
+    "Polinesiya Gafɔntǝna kaja": "PF",
+    "Pɔrtigal": "PT",
+    "Pɔrto Rikoo": "PR",
+    "Reeniyɔŋ": "RE",
+    "Romanii": "RO",
+    "Rɔɔshɩya": "RU",
+    "Rʊwanɖaa": "RW",
+    "Salomɔɔn kaBʊtukǝltǝna": "SB",
+    "Sambii": "ZM",
+    "Samowa": "WS",
+    "Samowa Amalɩka kaja": "AS",
+    "Santrafrika": "CF",
+    "Saotomee": "ST",
+    "Sarawii": "EH",
+    "Sark": "CQ",
+    "Sauɖiya": "SA",
+    "Sautafrika": "ZA",
+    "Selanɖ afɔlɩ": "NZ",
+    "Senegal": "SN",
+    "Seraleyɔn": "SL",
+    "Seshɛl": "SC",
+    "Seyuta na Meliliya": "EA",
+    "sǝɖoo-aksaŋ": "XA",
+    "sǝɖoo-biɖi": "XB",
+    "Sǝfalbaaɖ na Yan Mayɛn": "SJ",
+    "Sɛŋ Elenaa (kaAtukǝltǝna)": "SH",
+    "Sɛŋ Fɩnsaŋ na Grenaɖiniisi": "VC",
+    "Sɛŋ Kits na Nefis": "KN",
+    "Sɛŋ Lusiya": "LC",
+    "Sɛŋ Marinoo": "SM",
+    "Sɛŋ Martɛɛŋ": "MF",
+    "Sɛŋ Martɛɛŋ (Holanɖ kaja)": "SX",
+    "Sɛŋ-Batolomayɔ": "BL",
+    "Sɛŋ-Petrɔs na Mikelɔŋ": "PM",
+    "Sɛrbii": "RS",
+    "Shilii": "CL",
+    "Simbabʊwee": "ZW",
+    "Siŋgapuur": "SG",
+    "Siri Laŋkaa": "LK",
+    "Sirii": "SY",
+    "Slofakii": "SK",
+    "Slofeniya": "SI",
+    "Somalii": "SO",
+    "Suɖaŋ": "SD",
+    "Suɖaŋ gʊnyɩsonolaŋ": "SS",
+    "Surinam": "SR",
+    "Suwis": "CH",
+    "Sʊwɛɖ": "SE",
+    "Taɩlanɖ": "TH",
+    "Taɩwan": "TW",
+    "Tajikistan": "TJ",
+    "Taŋsanii": "TZ",
+    "Timɔɔ gajakalaŋ": "TL",
+    "Togoo": "TG",
+    "Tokelaʊ": "TK",
+    "Tɔŋga": "TO",
+    "Triniɖaaɖ na Tobagoo": "TT",
+    "Tristan ɖa Kuna": "TA",
+    "Tufalu": "TV",
+    "Tunisii": "TN",
+    "Turkii": "TR",
+    "Turkisii na Kayɩkɔɔsɩ kaBʊtukǝltǝna": "TC",
+    "Turkmenistan": "TM",
+    "Uganɖaa": "UG",
+    "Uruguwee": "UY",
+    "Usbeekistan": "UZ",
+    "Walis na Futuna": "WF",
+    "Yemɛn": "YE",
+    "Yishraɛl": "IL"
+}
\ No newline at end of file
diff --git a/js/data/locale/blo/ctryreverse.json b/js/data/locale/blo/ctryreverse.json
new file mode 100644
index 0000000000..cbf01ebf1d
--- /dev/null
+++ b/js/data/locale/blo/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "nɖulinya",
+    "002": "Garɩɖontǝna",
+    "003": "Gamalɩkatǝna gʊnyɩpɛnɛlaŋ",
+    "005": "Gamalɩkatǝna gʊnyɩsonolaŋ",
+    "009": "Oseyanii",
+    "011": "Garɩɖontǝna gɩteŋshilelaŋ",
+    "013": "Gamalɩkatǝna gɩcɩɩca",
+    "014": "Garɩɖontǝna gajakalaŋ",
+    "015": "Garɩɖontǝna gʊnyɩpɛnɛlaŋ",
+    "017": "Garɩɖontǝna gɩcɩɩca",
+    "018": "Garɩɖontǝna gʊnyɩsonolaŋ",
+    "019": "Gamalɩkatǝna",
+    "021": "Gamalɩkatǝna kagʊnyɩpɛnɛlaŋ",
+    "029": "Karayiib",
+    "030": "Gacǝlǝŋtǝna gajakalaŋ",
+    "034": "Gacǝlǝŋtǝna gʊnyɩsonolaŋ",
+    "035": "Gacǝlǝŋtǝna gʊsono na gajakayɛlaŋ kʊfɔɔ nɩ",
+    "039": "Garɩfɔntǝna gʊnyɩsonolaŋ",
+    "053": "Ɔstracǝlǝŋtǝna",
+    "054": "Melanesiya",
+    "057": "Mikronesiya kagʊsaʊ",
+    "061": "Polinesiya",
+    "142": "Gacǝlǝŋtǝna",
+    "143": "Gacǝlǝŋtǝna gɩcɩɩca",
+    "145": "Gacǝlǝŋtǝna gɩteŋshilelaŋ",
+    "150": "Garɩfɔntǝna",
+    "151": "Garɩfɔntǝna gajakalaŋ",
+    "154": "Garɩfɔntǝna gʊnyɩpɛnɛlaŋ",
+    "155": "Garɩfɔntǝna gɩteŋshilelaŋ",
+    "202": "Garɩɖontǝna Sahara katǝntǝn",
+    "419": "Latɛŋ kaAmalɩkatǝna",
+    "AC": "Asɛnsiyɔɔn kaAtukǝltǝna",
+    "AD": "Anɖɔraa",
+    "AE": "Emiir baGanɔ gaɖɔŋkɔnɔ kaAlaaributǝna",
+    "AF": "Afganistan",
+    "AG": "Antiguwaa na Barbuɖaa",
+    "AI": "Aŋguwilaa",
+    "AL": "Albanii",
+    "AM": "Armenii",
+    "AO": "Aŋgolaa",
+    "AQ": "Gatutaltǝna",
+    "AR": "Arjantin",
+    "AS": "Samowa Amalɩka kaja",
+    "AT": "Otrish",
+    "AU": "Ɔstraliya",
+    "AW": "Arubaa",
+    "AX": "Ɔɔlanɖ kaBʊtǝlǝltǝna",
+    "AZ": "Asɛrbaɩjaŋ",
+    "BA": "Bɔsniya na Hɛrsegɔfina",
+    "BB": "Barbaɖɔɔsɩ",
+    "BD": "Baŋglaɖɛɛshɩ",
+    "BE": "Bɛljiiki",
+    "BF": "Burkinaa",
+    "BG": "Bulgarii",
+    "BH": "Barɛɛn",
+    "BI": "Burunɖii",
+    "BJ": "Benɛɛ",
+    "BL": "Sɛŋ-Batolomayɔ",
+    "BM": "Bɛrmuɖaa",
+    "BN": "Brunɛɩ",
+    "BO": "Bolifiya",
+    "BQ": "Holanɖ kaKarayiib",
+    "BR": "Bresil",
+    "BS": "Bahamaasɩ",
+    "BT": "Butan",
+    "BV": "Bufee kaAtukǝltǝna",
+    "BW": "Bɔsʊwanaa",
+    "BY": "Belaruus",
+    "BZ": "Beliis",
+    "CA": "Kanaɖaa",
+    "CC": "Kokoos (Kiiliŋ) kaBʊtukǝltǝna",
+    "CD": "Koŋgoo Kinshasaa",
+    "CF": "Santrafrika",
+    "CG": "Koŋgoo Brasafil",
+    "CH": "Suwis",
+    "CI": "Koɖifʊaa",
+    "CK": "Kʊkʊ kaBʊtukǝltǝna",
+    "CL": "Shilii",
+    "CM": "Kamerun",
+    "CN": "Caɩna",
+    "CO": "Kolɔmbii",
+    "CP": "Klipɛɛtɔn kaAtukǝltǝna",
+    "CQ": "Sark",
+    "CR": "Kɔsta Rikaa",
+    "CU": "Kubaa",
+    "CV": "Kapfɛɛr",
+    "CW": "Kurasawuu",
+    "CX": "Nowɛl kaAtukǝltǝna",
+    "CY": "Ciprɔs",
+    "CZ": "Cɛk",
+    "DE": "Gajaamatǝna",
+    "DG": "Ɖiyego Garsiya",
+    "DJ": "Jibutii",
+    "DK": "Ɖanǝmark",
+    "DM": "Ɖominikaa",
+    "DO": "Ɖominikaa kaRepibliiki",
+    "DZ": "Aljerii",
+    "EA": "Seyuta na Meliliya",
+    "EC": "Ekuwaɖɔɔr",
+    "EE": "Ɛstoniya",
+    "EG": "Ejipti",
+    "EH": "Sarawii",
+    "ER": "Eritree",
+    "ES": "Ɛspanyǝ",
+    "ET": "Etiyopii",
+    "EU": "Ganɔ gaɖɔŋkɔnɔ kaBʊtǝna Garɩfɔntǝna nɩ",
+    "EZ": "Eroo kaBʊtǝna",
+    "FI": "Fɛnlanɖ",
+    "FJ": "Fiji",
+    "FK": "Fɔklanɖ kaBʊtukǝltǝna",
+    "FM": "Mikronesiya",
+    "FO": "Faroi kaBʊtukǝltǝna",
+    "FR": "Gafɔntǝna",
+    "GA": "Gabɔŋ",
+    "GB": "Gagɛɛshɩtǝna",
+    "GD": "Grenaɖaa",
+    "GE": "Jɔrjiya",
+    "GF": "Guyanaa Gafɔntǝna kaja",
+    "GG": "Gǝrǝnsɛɩ",
+    "GH": "Gana",
+    "GI": "Gibraltaa",
+    "GL": "Grinlanɖ",
+    "GM": "Gambii",
+    "GN": "Ginee",
+    "GP": "Guwaɖeluupu",
+    "GQ": "Ginee Malabo",
+    "GR": "Grɛs",
+    "GS": "Jɔrjiya gʊnyɩsonolaŋ kaja na Sanɖuush gʊnyɩsonolaŋ kaBʊtukǝltǝna",
+    "GT": "Guwatemalaa",
+    "GU": "Guwam",
+    "GW": "Ginee Bisoo",
+    "GY": "Guyanaa",
+    "HK": "Hɔŋ Kɔŋ Caɩna kaja",
+    "HM": "Hɛɛrɖ na Mɛkɖɔnalɖ kaBʊtukǝltǝna",
+    "HN": "Hɔnɖuraasɩ",
+    "HR": "Krowasii",
+    "HT": "Hayitii",
+    "HU": "Ɔŋgrii",
+    "IC": "Kanarii kaBʊtukǝltǝna",
+    "ID": "Ɛnɖonosii",
+    "IE": "Irlanɖ",
+    "IL": "Yishraɛl",
+    "IM": "Man kaAtukǝltǝna",
+    "IN": "Inɖiya",
+    "IO": "Gɛɛshɩ kaAtǝna Inɖiya kaTeŋku nɩ",
+    "IQ": "Ɩraakɩ",
+    "IR": "Iraŋ",
+    "IS": "Islanɖ",
+    "IT": "Italii",
+    "JE": "Jersei",
+    "JM": "Jamaɩka",
+    "JO": "Jɔrɖanii",
+    "JP": "Japaŋ",
+    "KE": "Keniya",
+    "KG": "Kirgistan",
+    "KH": "Kamboɖiya",
+    "KI": "Kiribatii",
+    "KM": "Komɔɔr",
+    "KN": "Sɛŋ Kits na Nefis",
+    "KP": "Koree gʊnyɩpɛnɛlaŋ",
+    "KR": "Koree gʊnyɩsonolaŋ",
+    "KW": "Koweeti",
+    "KY": "Kayimaan kaBʊtukǝltǝna",
+    "KZ": "Kasastan",
+    "LA": "Lawɔs",
+    "LB": "Liibaaŋ",
+    "LC": "Sɛŋ Lusiya",
+    "LI": "Liishtɛntaɩn",
+    "LK": "Siri Laŋkaa",
+    "LR": "Liberiya",
+    "LS": "Lesotoo",
+    "LT": "Lituwaniya",
+    "LU": "Lusɛmbuur",
+    "LV": "Lɛtfiya",
+    "LY": "Libii",
+    "MA": "Morooko",
+    "MC": "Monakoo",
+    "MD": "Mɔlɖafiya",
+    "ME": "Mɔntenegroo",
+    "MF": "Sɛŋ Martɛɛŋ",
+    "MG": "Maɖagaskaa",
+    "MH": "Marshal kaBʊtukǝltǝna",
+    "MK": "Maseɖoniya gʊnyɩpɛnɛlaŋ kaja",
+    "ML": "Malii",
+    "MM": "Miyanmaa (Birmanii)",
+    "MN": "Mɔŋgolii",
+    "MO": "Makawoo Caɩna kaja",
+    "MP": "Mariyan kaBʊtukǝltǝna gʊnyɩpɛnɛlaŋ",
+    "MQ": "Martiniiki",
+    "MR": "Moritanii",
+    "MS": "Mɔnsɛraatɩ",
+    "MT": "Malta",
+    "MU": "Imoris",
+    "MV": "Malɖiifu",
+    "MW": "Malawii",
+    "MX": "Mɛsik",
+    "MY": "Malɛsii",
+    "MZ": "Mosambii",
+    "NA": "Namibii",
+    "NC": "Kaleɖonii afɔlɩ",
+    "NE": "Nijɛr",
+    "NF": "Nɔrfook kaAtukǝltǝna",
+    "NG": "Nanjiiriya",
+    "NI": "Nikaraguwaa",
+    "NL": "Holanɖ",
+    "NO": "Nɔrfɛsh",
+    "NP": "Neepal",
+    "NR": "Nawuru",
+    "NU": "Niwuye",
+    "NZ": "Selanɖ afɔlɩ",
+    "OM": "Oman",
+    "PA": "Panamaa",
+    "PE": "Peruu",
+    "PF": "Polinesiya Gafɔntǝna kaja",
+    "PG": "Papuasii Ginee afɔlɩ",
+    "PH": "Filipiin",
+    "PK": "Pakistan",
+    "PL": "Polanɖ",
+    "PM": "Sɛŋ-Petrɔs na Mikelɔŋ",
+    "PN": "Pɩtkɛɛn kaBʊtukǝltǝna",
+    "PR": "Pɔrto Rikoo",
+    "PS": "Palɛstiin kAsàʊ",
+    "PT": "Pɔrtigal",
+    "PW": "Palawoo",
+    "PY": "Paraguwee",
+    "QA": "Kataa",
+    "QO": "Oseyanii kasaʊlǝŋka",
+    "RE": "Reeniyɔŋ",
+    "RO": "Romanii",
+    "RS": "Sɛrbii",
+    "RU": "Rɔɔshɩya",
+    "RW": "Rʊwanɖaa",
+    "SA": "Sauɖiya",
+    "SB": "Salomɔɔn kaBʊtukǝltǝna",
+    "SC": "Seshɛl",
+    "SD": "Suɖaŋ",
+    "SE": "Sʊwɛɖ",
+    "SG": "Siŋgapuur",
+    "SH": "Sɛŋ Elenaa (kaAtukǝltǝna)",
+    "SI": "Slofeniya",
+    "SJ": "Sǝfalbaaɖ na Yan Mayɛn",
+    "SK": "Slofakii",
+    "SL": "Seraleyɔn",
+    "SM": "Sɛŋ Marinoo",
+    "SN": "Senegal",
+    "SO": "Somalii",
+    "SR": "Surinam",
+    "SS": "Suɖaŋ gʊnyɩsonolaŋ",
+    "ST": "Saotomee",
+    "SV": "Ɛl Salfaɖɔɔr",
+    "SX": "Sɛŋ Martɛɛŋ (Holanɖ kaja)",
+    "SY": "Sirii",
+    "SZ": "Ɛsʊwatinii",
+    "TA": "Tristan ɖa Kuna",
+    "TC": "Turkisii na Kayɩkɔɔsɩ kaBʊtukǝltǝna",
+    "TD": "Caɖ",
+    "TF": "Gafɔntǝna kaBʊtǝna gʊnyɩsonolaŋ kabʊja",
+    "TG": "Togoo",
+    "TH": "Taɩlanɖ",
+    "TJ": "Tajikistan",
+    "TK": "Tokelaʊ",
+    "TL": "Timɔɔ gajakalaŋ",
+    "TM": "Turkmenistan",
+    "TN": "Tunisii",
+    "TO": "Tɔŋga",
+    "TR": "Turkii",
+    "TT": "Triniɖaaɖ na Tobagoo",
+    "TV": "Tufalu",
+    "TW": "Taɩwan",
+    "TZ": "Taŋsanii",
+    "UA": "Ikrɛɛn",
+    "UG": "Uganɖaa",
+    "UM": "Ganɔ gaɖɔŋkɔnɔ kaBʊtǝna Amalɩka nɩ kaBʊtukǝltǝna bʊlǝŋka",
+    "UN": "Ganɔ gaɖɔŋkɔnɔ kaBʊtǝna nɖulinya nɩ",
+    "US": "Ganɔ gaɖɔŋkɔnɔ kaBʊtǝna Amalɩka nɩ",
+    "UY": "Uruguwee",
+    "UZ": "Usbeekistan",
+    "VA": "Fatikaŋ kaMpá",
+    "VC": "Sɛŋ Fɩnsaŋ na Grenaɖiniisi",
+    "VE": "Fenesuwelaa",
+    "VG": "Fɩrjɩɩn kǝBʊtukǝltǝna Gɛɛshɩ kabʊja",
+    "VI": "Fɩrjɩɩn kaBʊtukǝltǝna Amalɩka kabʊja",
+    "VN": "Fɛtnam",
+    "VU": "Fanuwatu",
+    "WF": "Walis na Futuna",
+    "WS": "Samowa",
+    "XA": "sǝɖoo-aksaŋ",
+    "XB": "sǝɖoo-biɖi",
+    "XK": "Kɔsofoo",
+    "YE": "Yemɛn",
+    "YT": "Mayɔɔtɩ",
+    "ZA": "Sautafrika",
+    "ZM": "Sambii",
+    "ZW": "Simbabʊwee",
+    "ZZ": "gʊsaʊɩ kʊyɔʊ ʊ mana ma"
+}
\ No newline at end of file
diff --git a/js/data/locale/blo/dateformats.json b/js/data/locale/blo/dateformats.json
new file mode 100644
index 0000000000..06bce2b8d5
--- /dev/null
+++ b/js/data/locale/blo/dateformats.json
@@ -0,0 +1,163 @@
+{
+    "dayPeriods": [
+        {
+            "from": 0,
+            "to": 240
+        },
+        {
+            "from": 0,
+            "to": 720
+        },
+        {
+            "from": 240,
+            "to": 420
+        },
+        {
+            "from": 420,
+            "to": 720
+        },
+        {
+            "from": 720,
+            "to": 960
+        },
+        {
+            "from": 720,
+            "to": 1440
+        },
+        {
+            "from": 960,
+            "to": 1200
+        },
+        {
+            "from": 1200,
+            "to": 1440
+        }
+    ],
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "d"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "M/d"
+            },
+            "dmw": {
+                "f": "EEEE, MMMM d",
+                "l": "EEE, MMMM d",
+                "m": "EE, MMM d",
+                "s": "E, M/d"
+            },
+            "dmwy": {
+                "f": "EEEE, MMMM d yyyy",
+                "l": "EEE, MMMM d yyyy",
+                "m": "EE, MMM d yyyy",
+                "s": "E, M/d/yyyy"
+            },
+            "dmy": {
+                "f": "MMMM d yyyy",
+                "l": "MMMM d yyyy",
+                "m": "MMM d yyyy",
+                "s": "M/d/yyyy"
+            },
+            "dw": {
+                "f": "EEEE, d",
+                "l": "EEE, d",
+                "m": "EE, d",
+                "s": "E, d"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM"
+            },
+            "my": {
+                "l": "MMMM yyyy",
+                "m": "MMM yyyy",
+                "s": "M/yyyy"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "order": "{date}, {time}",
+        "range": {
+            "c00": {
+                "f": "{sm} {sd} {sy}, {st} – {et}",
+                "l": "{sm} {sd} {sy}, {st} – {et}",
+                "m": "{sm} {sd} {sy}, {st} – {et}",
+                "s": "{sm}/{sd}/{sy}, {st} – {et}"
+            },
+            "c01": {
+                "f": "{sm} {sd} {sy}, {st} – {em} {ed} {ey}, {et}",
+                "l": "{sm} {sd} {sy}, {st} – {em} {ed} {ey}, {et}",
+                "m": "{sm} {sd} {sy}, {st} – {em} {ed} {ey}, {et}",
+                "s": "{sm}/{sd}/{sy}, {st} – {em}/{ed}/{ey}, {et}"
+            },
+            "c02": {
+                "f": "{sm} {sd} {sy}, {st} – {em} {ed} {ey}, {et}",
+                "l": "{sm} {sd} {sy}, {st} – {em} {ed} {ey}, {et}",
+                "m": "{sm} {sd} {sy}, {st} – {em} {ed} {ey}, {et}",
+                "s": "{sm}/{sd}/{sy}, {st} – {em}/{ed}/{ey}, {et}"
+            },
+            "c03": {
+                "f": "{sm} {sd} {sy}, {st} – {em} {ed} {ey}, {et}",
+                "l": "{sm} {sd} {sy}, {st} – {em} {ed} {ey}, {et}",
+                "m": "{sm} {sd} {sy}, {st} – {em} {ed} {ey}, {et}",
+                "s": "{sm}/{sd}/{sy}, {st} – {em}/{ed}/{ey}, {et}"
+            },
+            "c10": {
+                "f": "{sm} {sd} – {ed} {ey}",
+                "l": "{sm} {sd} – {ed} {ey}",
+                "m": "{sm} {sd} – {ed} {ey}",
+                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+            },
+            "c11": {
+                "f": "{sm} {sd} {sy} – {em} {ed} {ey}",
+                "l": "{sm} {sd} {sy} – {em} {ed} {ey}",
+                "m": "{sm} {sd} {sy} – {em} {ed} {ey}",
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
+            },
+            "c12": {
+                "f": "{sm} {sd} {sy} – {em} {ed} {ey}",
+                "l": "{sm} {sd} {sy} – {em} {ed} {ey}",
+                "m": "{sm} {sd} {sy} – {em} {ed} {ey}",
+                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+            },
+            "c20": {
+                "m": "{sm} {sy} – {em} {ey}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/es/delimiters.jf b/js/data/locale/blo/delimiters.jf
similarity index 100%
rename from js/data/locale/es/delimiters.jf
rename to js/data/locale/blo/delimiters.jf
diff --git a/js/data/locale/blo/langname.jf b/js/data/locale/blo/langname.jf
new file mode 100644
index 0000000000..9c29fe1d91
--- /dev/null
+++ b/js/data/locale/blo/langname.jf
@@ -0,0 +1,4 @@
+{
+    "generated": true,
+    "language.name": "Anii"
+}
\ No newline at end of file
diff --git a/js/data/locale/blo/list.json b/js/data/locale/blo/list.json
new file mode 100644
index 0000000000..726e2b1e87
--- /dev/null
+++ b/js/data/locale/blo/list.json
@@ -0,0 +1,52 @@
+{
+    "or": {
+        "full": {
+            "2": "{0} koo {1}",
+            "end": "{0} koo {1}"
+        },
+        "long": {
+            "2": "{0} koo {1}",
+            "end": "{0} koo {1}"
+        },
+        "medium": {
+            "2": "{0} koo {1}",
+            "end": "{0} koo {1}"
+        },
+        "short": {
+            "2": "{0} koo {1}",
+            "end": "{0} koo {1}"
+        }
+    },
+    "standard": {
+        "full": {
+            "2": "{0} na {1}",
+            "end": "{0} na {1}"
+        },
+        "long": {
+            "2": "{0} na {1}",
+            "end": "{0} na {1}"
+        },
+        "medium": {
+            "2": "{0} & {1}",
+            "end": "{0} & {1}"
+        },
+        "short": {
+            "2": "{0} & {1}",
+            "end": "{0} & {1}"
+        }
+    },
+    "unit": {
+        "full": {
+            "2": "{0} na {1}",
+            "end": "{0} na {1}"
+        },
+        "long": {
+            "2": "{0} na {1}",
+            "end": "{0} na {1}"
+        },
+        "medium": {
+            "2": "{0} na {1}",
+            "end": "{0} na {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/blo/numfmt.jf b/js/data/locale/blo/numfmt.jf
new file mode 100644
index 0000000000..d9699cea9d
--- /dev/null
+++ b/js/data/locale/blo/numfmt.jf
@@ -0,0 +1,12 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "commonNegative": "{s} -{n}"
+        },
+        "decimalChar": ",",
+        "groupChar": " ",
+        "negativepctFmt": "% -{n}",
+        "pctFmt": "% {n}"
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/blo/plurals.json b/js/data/locale/blo/plurals.json
new file mode 100644
index 0000000000..f3fae5f2cb
--- /dev/null
+++ b/js/data/locale/blo/plurals.json
@@ -0,0 +1,14 @@
+{
+    "one": {
+        "eq": [
+            "n",
+            1
+        ]
+    },
+    "zero": {
+        "eq": [
+            "n",
+            0
+        ]
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/blo/scripts.jf b/js/data/locale/blo/scripts.jf
new file mode 100644
index 0000000000..429ff24f2b
--- /dev/null
+++ b/js/data/locale/blo/scripts.jf
@@ -0,0 +1,6 @@
+{
+    "generated": true,
+    "scripts": [
+        "Latn"
+    ]
+}
\ No newline at end of file
diff --git a/js/data/locale/blo/sysres.json b/js/data/locale/blo/sysres.json
new file mode 100644
index 0000000000..e9832f993e
--- /dev/null
+++ b/js/data/locale/blo/sysres.json
@@ -0,0 +1,170 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "B0": "gajanɩ",
+    "B1": "ʊshilè kʊboɖu",
+    "B2": "asʊbaa",
+    "B3": "gajaka",
+    "B4": "gɩshilikɔnɔ",
+    "B5": "ʊshilè kʊsasʊ",
+    "B6": "gɩteŋshile",
+    "B7": "gɩjibɔŋɔ",
+    "E0": "lh",
+    "E1": "ɖt",
+    "E2": "tl",
+    "E3": "lr",
+    "E4": "lm",
+    "E5": "rs",
+    "E6": "sb",
+    "EE0": "alh",
+    "EE1": "aɖt",
+    "EE2": "atl",
+    "EE3": "alr",
+    "EE4": "alm",
+    "EE5": "ars",
+    "EE6": "asb",
+    "EEE0": "alah",
+    "EEE1": "aɖɩt",
+    "EEE2": "atal",
+    "EEE3": "alar",
+    "EEE4": "alam",
+    "EEE5": "arɩs",
+    "EEE6": "asib",
+    "EEEE0": "alahaɖɩ",
+    "EEEE1": "aɖɩtɛnɛɛ",
+    "EEEE2": "atalaata",
+    "EEEE3": "alaarba",
+    "EEEE4": "alaamɩshɩ",
+    "EEEE5": "arɩsǝma",
+    "EEEE6": "asiibi",
+    "G-1": "naaNSYP",
+    "G1": "NKS",
+    "MMM1": "kaw",
+    "MMM10": "cim",
+    "MMM11": "pom",
+    "MMM12": "bʊn",
+    "MMM2": "kpa",
+    "MMM3": "ci",
+    "MMM4": "ɖʊ",
+    "MMM5": "ɖu5",
+    "MMM6": "ɖu6",
+    "MMM7": "la",
+    "MMM8": "kǝu",
+    "MMM9": "fʊm",
+    "MMMM1": "ɩjikawǝrka kaŋɔrɔ",
+    "MMMM10": "ɩjicimka kaŋɔrɔ",
+    "MMMM11": "acapomka kaŋɔrɔ",
+    "MMMM12": "anɔɔbʊnka kaŋɔrɔ",
+    "MMMM2": "ɩjikpaka kaŋɔrɔ",
+    "MMMM3": "arɛ́cika kaŋɔrɔ",
+    "MMMM4": "njɩbɔ nɖʊka kaŋɔrɔ",
+    "MMMM5": "acafʊnɖuka kaŋɔrɔ",
+    "MMMM6": "anɔɔɖuka kaŋɔrɔ",
+    "MMMM7": "alàlaka kaŋɔrɔ",
+    "MMMM8": "ɩjikǝuka kaŋɔrɔ",
+    "MMMM9": "abofʊmka kaŋɔrɔ",
+    "N1": "k",
+    "N10": "c",
+    "N11": "p",
+    "N12": "b",
+    "N2": "k",
+    "N3": "c",
+    "N4": "ɖ",
+    "N5": "ɖ",
+    "N6": "ɖ",
+    "N7": "l",
+    "N8": "k",
+    "N9": "f",
+    "NN1": "ka",
+    "NN10": "ci",
+    "NN11": "po",
+    "NN12": "bʊ",
+    "NN2": "kp",
+    "NN3": "ci",
+    "NN4": "ɖʊ",
+    "NN5": "ɖu",
+    "NN6": "ɖu",
+    "NN7": "la",
+    "NN8": "kǝ",
+    "NN9": "fʊ",
+    "a0": "ʊshilè kʊboɖu",
+    "a1": "ʊshilè kʊsasʊ",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": " na ",
+    "finalSeparatorLong": " na ",
+    "finalSeparatorMedium": " na ",
+    "finalSeparatorShort": ", ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/blo/unitfmt.json b/js/data/locale/blo/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/blo/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/blt/unitfmt.json b/js/data/locale/blt/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/blt/unitfmt.json
+++ b/js/data/locale/blt/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/bm/ctrynames.json b/js/data/locale/bm/ctrynames.json
index bcfaa52597..d26b1d5aac 100644
--- a/js/data/locale/bm/ctrynames.json
+++ b/js/data/locale/bm/ctrynames.json
@@ -9,7 +9,6 @@
     "Ameriki": "US",
     "Ameriki ka Sungurunnin Gun": "VI",
     "Andɔr": "AD",
-    "Angilɛ ka ɛndu dugukolo": "IO",
     "Angilɛ ka Sungurunnin Gun": "VG",
     "Angilɛtɛri": "GB",
     "Angiya": "AI",
@@ -41,6 +40,7 @@
     "Bouvet Island": "BV",
     "Bozni-Ɛrizigovini": "BA",
     "Bɔtisiwana": "BW",
+    "British Indian Ocean Territory": "IO",
     "Buligari": "BG",
     "Burinɛyi": "BN",
     "Burukina Faso": "BF",
diff --git a/js/data/locale/bm/ctryreverse.json b/js/data/locale/bm/ctryreverse.json
index a18d52d974..c511a02032 100644
--- a/js/data/locale/bm/ctryreverse.json
+++ b/js/data/locale/bm/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirayeli",
     "IM": "Isle of Man",
     "IN": "Ɛndujamana",
-    "IO": "Angilɛ ka ɛndu dugukolo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Iraŋ",
     "IS": "Isilandi",
diff --git a/js/data/locale/bm/unitfmt.json b/js/data/locale/bm/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/bm/unitfmt.json
+++ b/js/data/locale/bm/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/bn/sysres.json b/js/data/locale/bn/sysres.json
index 5b679ce6e9..122e07f137 100644
--- a/js/data/locale/bn/sysres.json
+++ b/js/data/locale/bn/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#{num} সেকেন্ডে|#{num} সেকেন্ডে",
     "#in {num}w": "one#{num} সপ্তাহে|#{num} সপ্তাহে",
     "#in {num}y": "one#{num} বছরে|#{num} বছরে",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} দিন|#{num} দিন",
     "#{num}d ago": "one#{num} দিন আগে|#{num} দিন আগে",
     "#{num}h": "one#{num} ঘঃ|#{num} ঘঃ",
@@ -201,10 +201,10 @@
     "NN9": "সে",
     "durationLongDays": "one#{num} দিন|#{num} দিন",
     "durationMediumHours": "one#{num} ঘঃ|#{num} ঘঃ",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} সপ্তাহ|#{num} সপ্তাহ",
     "durationMediumYears": "one#{num} বছর|#{num} বছর",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} মিঃ|#{num} মিঃ",
     "durationShortMonths": "one#{num} মাস|#{num} মাস",
     "finalSeparatorFull": ", ",
diff --git a/js/data/locale/bn/unitfmt.json b/js/data/locale/bn/unitfmt.json
index b54d79af9d..dee280f73a 100644
--- a/js/data/locale/bn/unitfmt.json
+++ b/js/data/locale/bn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} বার",
             "barrel": "one#{n} ব্য়ারেল|#{n} ব্যারেল",
+            "beaufort": "#বিউফোর্ট {n}",
             "bit": "#{n} বিট",
             "bit-per-second": "#{n} বিট প্রতি সেকেন্ড",
             "british-thermal-unit": "#{n} ব্রিটিশ থার্মাল ইউনিট",
@@ -36,7 +37,6 @@
             "cup-metric": "#{n} মেট্রিক কাপ",
             "dalton": "#{n} ড্যালটন্স",
             "day": "#{n} দিন",
-            "day-person": "#{n} দিন",
             "decade": "#{n} দশক",
             "deciliter": "#{n} ডেসিলিটার",
             "decimeter": "#{n} ডেসিমিটার",
@@ -181,7 +181,7 @@
             "second": "#{n} সেকেন্ড",
             "short-ton": "#{n} টন",
             "solar-luminosity": "one#{n} সৌর ঔজ্জ্বল্য|#{n} সৌর ঔজ্জ্বল্যতাগুলি",
-            "solar-mass": "one#{n} M☉|#{n} সৌর ভর",
+            "solar-mass": "#{n} সৌর ভর",
             "solar-radius": "one#{n} সৌর রেডিয়াস|#{n} সৌর রেডি",
             "square-centimeter": "#{n} বর্গ সেন্টিমিটার",
             "square-foot": "#{n} বর্গ ফুট",
@@ -217,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} বার",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} বিট",
             "bit-per-second": "#{n} বিট প্রতি সেকেন্ড",
             "british-thermal-unit": "#{n} Btu",
@@ -249,7 +250,7 @@
             "degree": "#{n}ডিগ্রী",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
+            "dot": "#{n} ডট",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
diff --git a/js/data/locale/bo/unitfmt.json b/js/data/locale/bo/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/bo/unitfmt.json
+++ b/js/data/locale/bo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/br/ctrynames.json b/js/data/locale/br/ctrynames.json
index c4c03e4453..a6cfe2e0d4 100644
--- a/js/data/locale/br/ctrynames.json
+++ b/js/data/locale/br/ctrynames.json
@@ -50,6 +50,7 @@
     "Bosnia ha Herzegovina": "BA",
     "Botswana": "BW",
     "Brazil": "BR",
+    "British Indian Ocean Territory": "IO",
     "Broadoù unanet": "UN",
     "Brunei": "BN",
     "Bulgaria": "BG",
@@ -271,7 +272,6 @@
     "Tchekia": "CZ",
     "Thailand": "TH",
     "Timor-Leste": "TL",
-    "Tiriad breizhveurat Meurvor Indez": "IO",
     "Tiriadoù Palestina": "PS",
     "Togo": "TG",
     "Tokelau": "TK",
diff --git a/js/data/locale/br/ctryreverse.json b/js/data/locale/br/ctryreverse.json
index c290a34bdb..8978b8e561 100644
--- a/js/data/locale/br/ctryreverse.json
+++ b/js/data/locale/br/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Enez Vanav",
     "IN": "India",
-    "IO": "Tiriad breizhveurat Meurvor Indez",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraq",
     "IR": "Iran",
     "IS": "Island",
diff --git a/js/data/locale/br/sysres.json b/js/data/locale/br/sysres.json
index 35a2db3d78..fa3b324ffb 100644
--- a/js/data/locale/br/sysres.json
+++ b/js/data/locale/br/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#a-benn {num} s|two#a-benn {num} s|few#a-benn {num} s|many#a-benn {num} s|#a-benn {num} s",
     "#in {num}w": "one#a-benn {num} sizh.|two#a-benn {num} sizh.|few#a-benn {num} sizh.|many#a-benn {num} sizh.|#a-benn {num} sizh.",
     "#in {num}y": "one#a-benn {num} bl.|two#a-benn {num} bl.|few#a-benn {num} bl.|many#a-benn {num} bl.|#a-benn {num} bl.",
-    "#{num} ms": "one#{num} ms|two#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}d|two#{num}d|few#{num}d|many#{num}d|#{num}d",
     "#{num}d ago": "one#{num} d zo|two#{num} d zo|few#{num} d zo|many#{num} d zo|#{num} d zo",
     "#{num}h": "one#{num}h|two#{num}h|few#{num}h|many#{num}h|#{num}h",
@@ -26,12 +26,12 @@
     "1#1 hour ago|#{num} hours ago": "one#{num} eur zo|two#{num} eur zo|few#{num} eur zo|many#{num} a eurioù zo|#{num} eur zo",
     "1#1 hour|#{num} hours": "one#{num} eur|two#{num} eur|few#{num} eur|many#{num} a eurioù|#{num} eur",
     "1#1 hr ago|#{num} hrs ago": "one#{num} eur zo|two#{num} eur zo|few#{num} eur zo|many#{num} a eurioù zo|#{num} eur zo",
-    "1#1 hr|#{num} hrs": "one#{num} h|two#{num} h|few#{num} h|many#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milieilenn|two#{num} vilieilenn|few#{num} milieilenn|many#{num} a vilieilennoù|#{num} milieilenn",
     "1#1 min ago|#{num} min ago": "one#{num} munut zo|two#{num} vunut zo|few#{num} munut zo|many#{num} a vunutoù zo|#{num} munut zo",
     "1#1 minute ago|#{num} minutes ago": "one#{num} munut zo|two#{num} vunut zo|few#{num} munut zo|many#{num} a vunutoù zo|#{num} munut zo",
     "1#1 minute|#{num} minutes": "one#{num} munut|two#{num} vunut|few#{num} munut|many#{num} a vunutoù|#{num} munut",
-    "1#1 min|#{num} min": "one#{num} min|two#{num} min|few#{num} min|many#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}min|two#{num}min|few#{num}min|many#{num}min|#{num}min",
     "1#1 mon ago|#{num} mons ago": "one#{num} miz zo|two#{num} viz zo|few#{num} miz zo|many#{num} a vizioù zo|#{num} miz zo",
     "1#1 month ago|#{num} months ago": "one#{num} miz zo|two#{num} viz zo|few#{num} miz zo|many#{num} a vizioù zo|#{num} miz zo",
@@ -41,7 +41,7 @@
     "1#1 sec ago|#{num} sec ago": "one#{num} eilenn zo|two#{num} eilenn zo|few#{num} eilenn zo|many#{num} eilenn zo|#{num} eilenn zo",
     "1#1 second ago|#{num} seconds ago": "one#{num} eilenn zo|two#{num} eilenn zo|few#{num} eilenn zo|many#{num} eilenn zo|#{num} eilenn zo",
     "1#1 second|#{num} seconds": "one#{num} eilenn|two#{num} eilenn|few#{num} eilenn|many#{num} a eilennoù|#{num} eilenn",
-    "1#1 sec|#{num} sec": "one#{num} s|two#{num} s|few#{num} s|many#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
     "1#1 se|#{num} sec": "one#{num}s|two#{num}s|few#{num}s|many#{num}s|#{num}s",
     "1#1 week ago|#{num} weeks ago": "one#{num} sizhun zo|two#{num} sizhun zo|few#{num} sizhun zo|many#{num} a sizhunioù zo|#{num} sizhun zo",
     "1#1 week|#{num} weeks": "one#{num} sizhun|two#{num} sizhun|few#{num} sizhun|many#{num} a sizhunioù|#{num} sizhun",
@@ -142,7 +142,7 @@
     "NN9": "Gw",
     "a0": "A.M.",
     "a1": "G.M.",
-    "durationLongDays": "one#{num} d|two#{num} d|few#{num} d|many#{num} d|#{num} d",
+    "durationLongDays": "#{num} d",
     "durationMediumHours": "one#{num}h|two#{num}h|few#{num}h|many#{num}h|#{num}h",
     "durationMediumMillis": "one#{num}ms|two#{num}ms|few#{num}ms|many#{num}ms|#{num}ms",
     "durationMediumWeeks": "one#{num}sizh.|two#{num}sizh.|few#{num}sizh.|many#{num}sizh.|#{num}sizh.",
diff --git a/js/data/locale/br/unitfmt.json b/js/data/locale/br/unitfmt.json
index 1e14f6efa4..a57c77f2c1 100644
--- a/js/data/locale/br/unitfmt.json
+++ b/js/data/locale/br/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "many#{n} a atmosferoù|#{n} atmosfer",
             "bar": "two#{n} var|many#{n} a varoù|#{n} bar",
             "barrel": "two#{n} varilh|many#{n} a varilhoù|#{n} barilh",
+            "beaufort": "#B {n}",
             "bit": "two#{n} vit|many#{n} a vitoù|#{n} bit",
             "bit-per-second": "#{n} bit dre eilenn",
             "british-thermal-unit": "two#{n} vBritish thermal unit|#{n} British thermal unit",
@@ -42,9 +43,6 @@
             "degree": "two#{n} zerez|many#{n} a zerezioù|#{n} derez",
             "dessert-spoon": "many#{n} a loaiadoù dibenn-pred|#{n} loaiad dibenn-pred",
             "dessert-spoon-imperial": "many#{n} a loaiadoù dibenn-pred impalaerel|#{n} loaiad dibenn-pred impalaerel",
-            "dot": "two#{n} bik|few#{n} fik|many#{n} a bikoù|#{n} pik",
-            "dot-per-centimeter": "two#{n} bik dre santimetr|few#{n} fik dre santimetr|many#{n} a bikoù dre santimetr|#{n} pik dre santimetr",
-            "dot-per-inch": "two#{n} bik dre veutad|few#{n} fik dre veutad|many#{n} a bikoù dre veutad|#{n} pik dre veutad",
             "dram": "two#{n} zrakm liñvel|many#{n} a zrakmoù liñvel|#{n} drakm liñvel",
             "drop": "one#{n} dakenn|two#{n} dakenn|few#{n} zakenn|many#{n} a dakennoù|#{n} takenn",
             "dunam": "two#{n} zounam|many#{n} a zounamoù|#{n} dounam",
@@ -56,7 +54,6 @@
             "fathom": "two#{n} c'hourhedad|many#{n} a c'hourhedadoù|#{n} gourhedad",
             "fluid-ounce": "many#{n} a oñsoù liñvel|#{n} oñs liñvel",
             "fluid-ounce-imperial": "many#{n} a oñsoù liñvel impalaerel|#{n} oñs liñvel impalaerel",
-            "foodcalorie": "one#{n} galorienn vras|two#{n} galorienn vras|few#{n} c'halorienn vras|many#{n} a galoriennoù bras|#{n} kalorienn vras",
             "foot": "two#{n} droatad|few#{n} zroatad|many#{n} a droatadoù|#{n} troatad",
             "foot-per-second": "#{n} troatad dre eilenn",
             "furlong": "many#{n} a furlongoù|#{n} furlong",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +246,6 @@
             "degree": "#{n} deg",
             "dessert-spoon": "#{n} l.d.-b.",
             "dessert-spoon-imperial": "#{n} l.d.-b. imp.",
-            "dot": "#{n} pik",
-            "dot-per-centimeter": "#{n} pdcm",
-            "dot-per-inch": "#{n} pdm",
             "dram": "#{n} fl dr",
             "drop": "#{n} gt",
             "dunam": "#{n} dounam",
@@ -262,7 +257,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} Cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/brx/ctrynames.json b/js/data/locale/brx/ctrynames.json
index b39d73a94d..27dae303cf 100644
--- a/js/data/locale/brx/ctrynames.json
+++ b/js/data/locale/brx/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "अस्ट्रिया": "AT",
     "अस्ट्रेलएसिया": "053",
@@ -188,7 +189,6 @@
     "बेलिज": "BZ",
     "ब्राजील": "BR",
     "ब्रिटिश भार्जिन द्वीपफोर": "VG",
-    "ब्रिटिशनि भारतारि लैथो बाहागो": "IO",
     "ब्रूने": "BN",
     "भानुआटु": "VU",
     "भारत": "IN",
diff --git a/js/data/locale/brx/ctryreverse.json b/js/data/locale/brx/ctryreverse.json
index 7a3776fece..95fda6ecf4 100644
--- a/js/data/locale/brx/ctryreverse.json
+++ b/js/data/locale/brx/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "इज्राईल",
     "IM": "आयोल अफ मेन",
     "IN": "भारत",
-    "IO": "ब्रिटिशनि भारतारि लैथो बाहागो",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ईराक",
     "IR": "ईरान",
     "IS": "आइसलेण्ड",
diff --git a/js/data/locale/brx/unitfmt.json b/js/data/locale/brx/unitfmt.json
index 8a57a39171..31d6eb03ad 100644
--- a/js/data/locale/brx/unitfmt.json
+++ b/js/data/locale/brx/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/bs/Cyrl/ctrynames.json b/js/data/locale/bs/Cyrl/ctrynames.json
index ab104b1586..ac0db00b40 100644
--- a/js/data/locale/bs/Cyrl/ctrynames.json
+++ b/js/data/locale/bs/Cyrl/ctrynames.json
@@ -33,7 +33,6 @@
     "Боцвана": "BW",
     "Бразил": "BR",
     "Британска Дјевичанска острва": "VG",
-    "Британска територија у Индијском океану": "IO",
     "Брунеј": "BN",
     "Бугарска": "BG",
     "Буркина Фасо": "BF",
@@ -293,5 +292,6 @@
     "Швицарска": "CH",
     "Шпанија": "ES",
     "Шри Ланка": "LK",
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ"
 }
\ No newline at end of file
diff --git a/js/data/locale/bs/Cyrl/ctryreverse.json b/js/data/locale/bs/Cyrl/ctryreverse.json
index 0739ecc65f..09c2b79a80 100644
--- a/js/data/locale/bs/Cyrl/ctryreverse.json
+++ b/js/data/locale/bs/Cyrl/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Израел",
     "IM": "Острво Мен",
     "IN": "Индија",
-    "IO": "Британска територија у Индијском океану",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Ирак",
     "IR": "Иран",
     "IS": "Исланд",
diff --git a/js/data/locale/bs/Cyrl/unitfmt.json b/js/data/locale/bs/Cyrl/unitfmt.json
index e812ecd412..44c7c32f07 100644
--- a/js/data/locale/bs/Cyrl/unitfmt.json
+++ b/js/data/locale/bs/Cyrl/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit у секунди",
             "british-thermal-unit": "#{n} Btu",
@@ -42,8 +43,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
@@ -214,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit у сек.",
             "british-thermal-unit": "#{n} Btu",
@@ -246,8 +246,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
diff --git a/js/data/locale/bs/Latn/ctrynames.json b/js/data/locale/bs/Latn/ctrynames.json
index 0d5388c248..6560b9532f 100644
--- a/js/data/locale/bs/Latn/ctrynames.json
+++ b/js/data/locale/bs/Latn/ctrynames.json
@@ -35,7 +35,7 @@
     "Božićno ostrvo": "CX",
     "Brazil": "BR",
     "Britanska Djevičanska ostrva": "VG",
-    "Britanska Teritorija u Indijskom Okeanu": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brunej": "BN",
     "Bugarska": "BG",
     "Burkina Faso": "BF",
@@ -87,7 +87,6 @@
     "Gvineja": "GN",
     "Gvineja-Bisao": "GW",
     "Haiti": "HT",
-    "Holandija": "NL",
     "Honduras": "HN",
     "Hong Kong (SAR Kina)": "HK",
     "Hrvatska": "HR",
@@ -167,9 +166,9 @@
     "Mauritanija": "MR",
     "Meksiko": "MX",
     "Melanezija": "054",
+    "Mijanmar": "MM",
     "Mikronezija": "FM",
     "Mikronezijska regija": "057",
-    "Mjanmar": "MM",
     "Moldavija": "MD",
     "Monako": "MC",
     "Mongolija": "MN",
@@ -183,6 +182,7 @@
     "Nigerija": "NG",
     "Nikaragva": "NI",
     "Niue": "NU",
+    "Nizozemska": "NL",
     "Norveška": "NO",
     "Nova Kaledonija": "NC",
     "Novi Zeland": "NZ",
@@ -249,7 +249,7 @@
     "Subsaharska Afrika": "202",
     "Sudan": "SD",
     "Surinam": "SR",
-    "Svalbard i Jan Majen": "SJ",
+    "Svalbard i Jan Mayen": "SJ",
     "Sveta Helena": "SH",
     "Sveta Lucija": "LC",
     "Sveti Bartolomej": "BL",
diff --git a/js/data/locale/bs/Latn/ctryreverse.json b/js/data/locale/bs/Latn/ctryreverse.json
index ee8055adc3..75abc24f92 100644
--- a/js/data/locale/bs/Latn/ctryreverse.json
+++ b/js/data/locale/bs/Latn/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Izrael",
     "IM": "Ostrvo Man",
     "IN": "Indija",
-    "IO": "Britanska Teritorija u Indijskom Okeanu",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Island",
@@ -183,7 +183,7 @@
     "MH": "Maršalova ostrva",
     "MK": "Sjeverna Makedonija",
     "ML": "Mali",
-    "MM": "Mjanmar",
+    "MM": "Mijanmar",
     "MN": "Mongolija",
     "MO": "Makao (SAR Kina)",
     "MP": "Sjeverna Marijanska ostrva",
@@ -203,7 +203,7 @@
     "NF": "Ostrvo Norfolk",
     "NG": "Nigerija",
     "NI": "Nikaragva",
-    "NL": "Holandija",
+    "NL": "Nizozemska",
     "NO": "Norveška",
     "NP": "Nepal",
     "NR": "Nauru",
@@ -239,7 +239,7 @@
     "SG": "Singapur",
     "SH": "Sveta Helena",
     "SI": "Slovenija",
-    "SJ": "Svalbard i Jan Majen",
+    "SJ": "Svalbard i Jan Mayen",
     "SK": "Slovačka",
     "SL": "Sijera Leone",
     "SM": "San Marino",
diff --git a/js/data/locale/bs/ctrynames.json b/js/data/locale/bs/ctrynames.json
index 0d5388c248..6560b9532f 100644
--- a/js/data/locale/bs/ctrynames.json
+++ b/js/data/locale/bs/ctrynames.json
@@ -35,7 +35,7 @@
     "Božićno ostrvo": "CX",
     "Brazil": "BR",
     "Britanska Djevičanska ostrva": "VG",
-    "Britanska Teritorija u Indijskom Okeanu": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brunej": "BN",
     "Bugarska": "BG",
     "Burkina Faso": "BF",
@@ -87,7 +87,6 @@
     "Gvineja": "GN",
     "Gvineja-Bisao": "GW",
     "Haiti": "HT",
-    "Holandija": "NL",
     "Honduras": "HN",
     "Hong Kong (SAR Kina)": "HK",
     "Hrvatska": "HR",
@@ -167,9 +166,9 @@
     "Mauritanija": "MR",
     "Meksiko": "MX",
     "Melanezija": "054",
+    "Mijanmar": "MM",
     "Mikronezija": "FM",
     "Mikronezijska regija": "057",
-    "Mjanmar": "MM",
     "Moldavija": "MD",
     "Monako": "MC",
     "Mongolija": "MN",
@@ -183,6 +182,7 @@
     "Nigerija": "NG",
     "Nikaragva": "NI",
     "Niue": "NU",
+    "Nizozemska": "NL",
     "Norveška": "NO",
     "Nova Kaledonija": "NC",
     "Novi Zeland": "NZ",
@@ -249,7 +249,7 @@
     "Subsaharska Afrika": "202",
     "Sudan": "SD",
     "Surinam": "SR",
-    "Svalbard i Jan Majen": "SJ",
+    "Svalbard i Jan Mayen": "SJ",
     "Sveta Helena": "SH",
     "Sveta Lucija": "LC",
     "Sveti Bartolomej": "BL",
diff --git a/js/data/locale/bs/ctryreverse.json b/js/data/locale/bs/ctryreverse.json
index ee8055adc3..75abc24f92 100644
--- a/js/data/locale/bs/ctryreverse.json
+++ b/js/data/locale/bs/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Izrael",
     "IM": "Ostrvo Man",
     "IN": "Indija",
-    "IO": "Britanska Teritorija u Indijskom Okeanu",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Island",
@@ -183,7 +183,7 @@
     "MH": "Maršalova ostrva",
     "MK": "Sjeverna Makedonija",
     "ML": "Mali",
-    "MM": "Mjanmar",
+    "MM": "Mijanmar",
     "MN": "Mongolija",
     "MO": "Makao (SAR Kina)",
     "MP": "Sjeverna Marijanska ostrva",
@@ -203,7 +203,7 @@
     "NF": "Ostrvo Norfolk",
     "NG": "Nigerija",
     "NI": "Nikaragva",
-    "NL": "Holandija",
+    "NL": "Nizozemska",
     "NO": "Norveška",
     "NP": "Nepal",
     "NR": "Nauru",
@@ -239,7 +239,7 @@
     "SG": "Singapur",
     "SH": "Sveta Helena",
     "SI": "Slovenija",
-    "SJ": "Svalbard i Jan Majen",
+    "SJ": "Svalbard i Jan Mayen",
     "SK": "Slovačka",
     "SL": "Sijera Leone",
     "SM": "San Marino",
diff --git a/js/data/locale/bs/dateformats.json b/js/data/locale/bs/dateformats.json
index 7851ccbb96..993de9a4c5 100644
--- a/js/data/locale/bs/dateformats.json
+++ b/js/data/locale/bs/dateformats.json
@@ -89,36 +89,31 @@
                 "s": "yyyy"
             }
         },
-        "order": {
-            "f": "{date} 'u' {time}",
-            "l": "{date} 'u' {time}",
-            "m": "{date} {time}",
-            "s": "{date} {time}"
-        },
+        "order": "{date} 'u' {time}",
         "range": {
             "c00": {
                 "f": "{sd}. {sm} {sy}. u {st} – {et}",
                 "l": "{sd}. {sm} {sy}. u {st} – {et}",
-                "m": "{sd}. {sm} {sy}. {st} – {et}",
-                "s": "{sd}. {sm}. {sy}. {st} – {et}"
+                "m": "{sd}. {sm} {sy}. u {st} – {et}",
+                "s": "{sd}. {sm}. {sy}. u {st} – {et}"
             },
             "c01": {
                 "f": "{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}",
                 "l": "{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}",
-                "m": "{sd}. {sm} {sy}. {st} – {ed}. {em} {ey}. {et}",
-                "s": "{sd}. {sm}. {sy}. {st} – {ed}. {em}. {ey}. {et}"
+                "m": "{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}",
+                "s": "{sd}. {sm}. {sy}. u {st} – {ed}. {em}. {ey}. u {et}"
             },
             "c02": {
                 "f": "{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}",
                 "l": "{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}",
-                "m": "{sd}. {sm} {sy}. {st} – {ed}. {em} {ey}. {et}",
-                "s": "{sd}. {sm}. {sy}. {st} – {ed}. {em}. {ey}. {et}"
+                "m": "{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}",
+                "s": "{sd}. {sm}. {sy}. u {st} – {ed}. {em}. {ey}. u {et}"
             },
             "c03": {
                 "f": "{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}",
                 "l": "{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}",
-                "m": "{sd}. {sm} {sy}. {st} – {ed}. {em} {ey}. {et}",
-                "s": "{sd}. {sm}. {sy}. {st} – {ed}. {em}. {ey}. {et}"
+                "m": "{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}",
+                "s": "{sd}. {sm}. {sy}. u {st} – {ed}. {em}. {ey}. u {et}"
             },
             "c10": {
                 "f": "{sd} – {ed}. {em} {ey}.",
diff --git a/js/data/locale/bs/numfmt.jf b/js/data/locale/bs/numfmt.jf
index e0612f33a8..d4b6f1bbeb 100644
--- a/js/data/locale/bs/numfmt.jf
+++ b/js/data/locale/bs/numfmt.jf
@@ -6,8 +6,6 @@
             "commonNegative": "-{n} {s}"
         },
         "decimalChar": ",",
-        "groupChar": ".",
-        "negativepctFmt": "-{n} %",
-        "pctFmt": "{n} %"
+        "groupChar": "."
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/bs/sysres.json b/js/data/locale/bs/sysres.json
index d0101816ee..e9f6a4daa3 100644
--- a/js/data/locale/bs/sysres.json
+++ b/js/data/locale/bs/sysres.json
@@ -6,10 +6,10 @@
     "#in {num}s": "one#za {num} sek.|few#za {num} sek.|#za {num} sek.",
     "#in {num}w": "one#za {num} sed.|few#za {num} sed.|#za {num} sed.",
     "#in {num}y": "one#za {num} god.|few#za {num} god.|#za {num} god.",
-    "#{num} ms": "one#{num} ms|few#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d.|few#{num} d.|#{num} d.",
     "#{num}d ago": "one#prije {num} d.|few#prije {num} d.|#prije {num} d.",
-    "#{num}h": "one#{num} h|few#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#prije {num} sat|few#prije {num} sata|#prije {num} sati",
     "#{num}mi ago": "one#prije {num} min.|few#prije {num} min.|#prije {num} min.",
     "#{num}mo ago": "one#prije {num} mj.|few#prije {num} mj.|#prije {num} mj.",
@@ -26,7 +26,7 @@
     "1#1 hour ago|#{num} hours ago": "one#prije {num} sat|few#prije {num} sata|#prije {num} sati",
     "1#1 hour|#{num} hours": "one#{num} sat|few#{num} sata|#{num} sati",
     "1#1 hr ago|#{num} hrs ago": "one#prije {num} sat|few#prije {num} sata|#prije {num} sati",
-    "1#1 hr|#{num} hrs": "one#{num} h|few#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisekunda|few#{num} milisekunde|#{num} milisekundi",
     "1#1 min ago|#{num} min ago": "one#prije {num} minutu|few#prije {num} minute|#prije {num} minuta",
     "1#1 minute ago|#{num} minutes ago": "one#prije {num} minutu|few#prije {num} minute|#prije {num} minuta",
@@ -181,11 +181,11 @@
     "cccc5": "petak",
     "cccc6": "subota",
     "durationLongDays": "one#{num} dan|few#{num} dana|#{num} dana",
-    "durationMediumHours": "one#{num} h|few#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|few#{num} ms|#{num} ms",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} sedm.|few#{num} sedm.|#{num} sedm.",
     "durationMediumYears": "one#{num} god.|few#{num} god.|#{num} god.",
-    "durationShortMillis": "one#{num} ms|few#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} m|few#{num} m|#{num} m",
     "durationShortMonths": "one#{num} mj.|few#{num} mj.|#{num} mj.",
     "finalSeparatorFull": " i ",
diff --git a/js/data/locale/bs/unitfmt.json b/js/data/locale/bs/unitfmt.json
index 59d12669f3..889aa1b854 100644
--- a/js/data/locale/bs/unitfmt.json
+++ b/js/data/locale/bs/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "few#{n} atmosfere|#{n} atmosfera",
             "bar": "one#{n} bar|#{n} bara",
             "barrel": "one#{n} barel|#{n} barela",
+            "beaufort": "few#B {n}|#Beafort {n}",
             "bit": "one#{n} bit|#{n} bita",
             "bit-per-second": "#{n} bita po sekundi",
             "british-thermal-unit": "one#{n} britanska termalna jedinica|few#{n} britanske termalne jedinice|#{n} britanskih termalnih jedinica",
@@ -42,9 +43,9 @@
             "degree": "one#{n} stepen|few#{n} stepena|#{n} stepeni",
             "dessert-spoon": "few#{n} kašike za desert|#{n} kašika za desert",
             "dessert-spoon-imperial": "one#{n} imperijalna kašika za desert|few#{n} imperijalne kašike za desert|#{n} imperijalnih kašika za desert",
-            "dot": "one#{n} tačka|few#{n} tačke|#{n} tačaka",
-            "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
+            "dot": "one#{n} tačka|few#{n} px|#{n} tačaka",
+            "dot-per-centimeter": "one#{n} tačka po centimetru|few#{n} ppcm|#{n} tačaka po centimetru",
+            "dot-per-inch": "one#{n} tačka po inču|few#{n} ppi|#{n} tačaka po inču",
             "dram": "one#{n} tečni dram|few#{n} tečna drama|#{n} tečnih drama",
             "drop": "one#{n} kap|#{n} kapi",
             "dunam": "one#{n} dunum|#{n} dunuma",
@@ -56,7 +57,7 @@
             "fathom": "one#{n} hvat|#{n} hvata",
             "fluid-ounce": "one#{n} tečna unca|few#{n} tečne unce|#{n} tečnih unci",
             "fluid-ounce-imperial": "one#{n} imp. tekuća unca|few#{n} imp. tekuće unce|#{n} imp. tekućih unci",
-            "foodcalorie": "few#{n} kalorije|#{n} kalorija",
+            "foodcalorie": "few#{n} kcal|#{n} kalorija",
             "foot": "few#{n} stope|#{n} stopa",
             "foot-per-second": "#{n} stopa po sekundi",
             "furlong": "few#{n} osmine milje|#{n} osmina milje",
@@ -164,9 +165,9 @@
             "pinch": "one#{n} prstohvat|#{n} prstohvata",
             "pint": "one#{n} pinta|few#{n} pinte|#{n} pinti",
             "pint-metric": "one#{n} metrička pinta|few#{n} metričke pinte|#{n} metričkih pinti",
-            "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel": "one#{n} piksel|#{n} px",
+            "pixel-per-centimeter": "one#{n} piksel po centimetru|few#{n} ppcm|#{n} piksela po centimetru",
+            "pixel-per-inch": "one#{n} piksel po inču|few#{n} ppi|#{n} piksela po inču",
             "point": "one#{n} DTP tačka|few#{n} DTP tačke|#{n} DTP tačaka",
             "pound": "one#{n} funta|few#{n} funte|#{n} funti",
             "pound-force": "one#{n} funta sile|few#{n} funte sile|#{n} funti sile",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -225,8 +227,8 @@
             "byte-per-second": "#{n} bajt/s",
             "calorie": "#{n} kal.",
             "candela": "#{n} cd",
-            "carat": "#{n} CD",
-            "celsius": "#{n}°C",
+            "carat": "one#{n} ct|few#{n} ct|#{n} CD",
+            "celsius": "#{n} °C",
             "centiliter": "#{n} cL",
             "centimeter": "#{n} cm",
             "century": "#{n} st.",
@@ -248,9 +250,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} kš. des.",
             "dessert-spoon-imperial": "#{n} imp. kš. des.",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
+            "dot": "one#{n} tačka|few#{n} px|#{n} tačaka",
+            "dot-per-centimeter": "few#{n} ppcm|#{n} dpcm",
+            "dot-per-inch": "few#{n} ppi|#{n} dpi",
             "dram": "one#{n} teč. dram|#{n} teč. drama",
             "drop": "one#{n} kap|#{n} kapi",
             "dunam": "one#{n} dunum|#{n} dunuma",
@@ -258,11 +260,10 @@
             "earth-radius": "#{n} R⊕",
             "electronvolt": "#{n} eV",
             "em": "#{n} em",
-            "fahrenheit": "#{n}°F",
+            "fahrenheit": "#{n} °F",
             "fathom": "one#{n} hvat|#{n} hvata",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} imp. fl oz",
-            "foodcalorie": "#{n} kal.",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "few#{n} osmine milje|#{n} osmina milje",
@@ -396,8 +397,8 @@
             "square-mile": "#{n} mi²",
             "square-yard": "#{n} yd²",
             "stone": "#{n} st",
-            "tablespoon": "#{n} tbsp",
-            "teaspoon": "#{n} tsp",
+            "tablespoon": "one#{n} kšk.|few#{n} kšk.|#{n} tbsp",
+            "teaspoon": "one#{n} kšč.|few#{n} kšč.|#{n} tsp",
             "terabit": "#{n} Tb",
             "terabit-per-second": "#{n} Tb/s",
             "terabyte": "#{n} TB",
diff --git a/js/data/locale/bss/unitfmt.json b/js/data/locale/bss/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/bss/unitfmt.json
+++ b/js/data/locale/bss/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/byn/unitfmt.json b/js/data/locale/byn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/byn/unitfmt.json
+++ b/js/data/locale/byn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ca/AD/ctrynames.json b/js/data/locale/ca/AD/ctrynames.json
index 3a9cee94e6..a7d7984dbf 100644
--- a/js/data/locale/ca/AD/ctrynames.json
+++ b/js/data/locale/ca/AD/ctrynames.json
@@ -21,7 +21,7 @@
     "Anguilla": "AI",
     "Antàrtida": "AQ",
     "Antigua i Barbuda": "AG",
-    "Aràbia Saudita": "SA",
+    "Aràbia Saudí": "SA",
     "Argentina": "AR",
     "Armènia": "AM",
     "Aruba": "AW",
@@ -48,7 +48,6 @@
     "Bolívia": "BO",
     "Bòsnia i Hercegovina": "BA",
     "Botswana": "BW",
-    "Bouvet": "BV",
     "Brasil": "BR",
     "Brunei": "BN",
     "Bulgària": "BG",
@@ -120,21 +119,22 @@
     "Hong Kong (RAE Xina)": "HK",
     "Hongria": "HU",
     "Iemen": "YE",
+    "Illa Bouvet": "BV",
     "Illa Christmas": "CX",
     "Illa Clipperton": "CP",
     "Illa de l’Ascensió": "AC",
     "Illa de la Reunió": "RE",
     "Illa de Man": "IM",
-    "Illa Heard i Illes McDonald": "HM",
     "Illes Åland": "AX",
     "Illes Caiman": "KY",
     "Illes Canàries": "IC",
-    "Illes Cocos": "CC",
+    "Illes Cocos (Keeling)": "CC",
     "Illes Cook": "CK",
     "Illes Fèroe": "FO",
     "Illes Geòrgia del Sud i Sandwich del Sud": "GS",
+    "Illes Heard i McDonald": "HM",
     "Illes Malvines": "FK",
-    "Illes Mariannes Septentrionals": "MP",
+    "Illes Marianes del Nord": "MP",
     "Illes Marshall": "MH",
     "Illes Perifèriques Menors dels EUA": "UM",
     "Illes Pitcairn": "PN",
@@ -239,7 +239,7 @@
     "Saint-Barthélemy": "BL",
     "Saint-Pierre-et-Miquelon": "PM",
     "Samoa": "WS",
-    "Samoa Nord-americana": "AS",
+    "Samoa Americana": "AS",
     "San Marino": "SM",
     "Santa Helena": "SH",
     "São Tomé i Príncipe": "ST",
diff --git a/js/data/locale/ca/AD/ctryreverse.json b/js/data/locale/ca/AD/ctryreverse.json
index cd4ae877d8..36b2d8a975 100644
--- a/js/data/locale/ca/AD/ctryreverse.json
+++ b/js/data/locale/ca/AD/ctryreverse.json
@@ -41,7 +41,7 @@
     "AO": "Angola",
     "AQ": "Antàrtida",
     "AR": "Argentina",
-    "AS": "Samoa Nord-americana",
+    "AS": "Samoa Americana",
     "AT": "Àustria",
     "AU": "Austràlia",
     "AW": "Aruba",
@@ -64,12 +64,12 @@
     "BR": "Brasil",
     "BS": "Bahames",
     "BT": "Bhutan",
-    "BV": "Bouvet",
+    "BV": "Illa Bouvet",
     "BW": "Botswana",
     "BY": "Belarús",
     "BZ": "Belize",
     "CA": "Canadà",
-    "CC": "Illes Cocos",
+    "CC": "Illes Cocos (Keeling)",
     "CD": "Congo - Kinshasa",
     "CF": "República Centreafricana",
     "CG": "Congo - Brazzaville",
@@ -132,7 +132,7 @@
     "GW": "Guinea Bissau",
     "GY": "Guyana",
     "HK": "Hong Kong (RAE Xina)",
-    "HM": "Illa Heard i Illes McDonald",
+    "HM": "Illes Heard i McDonald",
     "HN": "Hondures",
     "HR": "Croàcia",
     "HT": "Haití",
@@ -186,7 +186,7 @@
     "MM": "Myanmar (Birmània)",
     "MN": "Mongòlia",
     "MO": "Macau (RAE Xina)",
-    "MP": "Illes Mariannes Septentrionals",
+    "MP": "Illes Marianes del Nord",
     "MQ": "Martinica",
     "MR": "Mauritània",
     "MS": "Montserrat",
@@ -231,7 +231,7 @@
     "RS": "Sèrbia",
     "RU": "Rússia",
     "RW": "Ruanda",
-    "SA": "Aràbia Saudita",
+    "SA": "Aràbia Saudí",
     "SB": "Illes Salomó",
     "SC": "Seychelles",
     "SD": "Sudan",
diff --git a/js/data/locale/ca/ES/ctrynames.json b/js/data/locale/ca/ES/ctrynames.json
index 3a9cee94e6..a7d7984dbf 100644
--- a/js/data/locale/ca/ES/ctrynames.json
+++ b/js/data/locale/ca/ES/ctrynames.json
@@ -21,7 +21,7 @@
     "Anguilla": "AI",
     "Antàrtida": "AQ",
     "Antigua i Barbuda": "AG",
-    "Aràbia Saudita": "SA",
+    "Aràbia Saudí": "SA",
     "Argentina": "AR",
     "Armènia": "AM",
     "Aruba": "AW",
@@ -48,7 +48,6 @@
     "Bolívia": "BO",
     "Bòsnia i Hercegovina": "BA",
     "Botswana": "BW",
-    "Bouvet": "BV",
     "Brasil": "BR",
     "Brunei": "BN",
     "Bulgària": "BG",
@@ -120,21 +119,22 @@
     "Hong Kong (RAE Xina)": "HK",
     "Hongria": "HU",
     "Iemen": "YE",
+    "Illa Bouvet": "BV",
     "Illa Christmas": "CX",
     "Illa Clipperton": "CP",
     "Illa de l’Ascensió": "AC",
     "Illa de la Reunió": "RE",
     "Illa de Man": "IM",
-    "Illa Heard i Illes McDonald": "HM",
     "Illes Åland": "AX",
     "Illes Caiman": "KY",
     "Illes Canàries": "IC",
-    "Illes Cocos": "CC",
+    "Illes Cocos (Keeling)": "CC",
     "Illes Cook": "CK",
     "Illes Fèroe": "FO",
     "Illes Geòrgia del Sud i Sandwich del Sud": "GS",
+    "Illes Heard i McDonald": "HM",
     "Illes Malvines": "FK",
-    "Illes Mariannes Septentrionals": "MP",
+    "Illes Marianes del Nord": "MP",
     "Illes Marshall": "MH",
     "Illes Perifèriques Menors dels EUA": "UM",
     "Illes Pitcairn": "PN",
@@ -239,7 +239,7 @@
     "Saint-Barthélemy": "BL",
     "Saint-Pierre-et-Miquelon": "PM",
     "Samoa": "WS",
-    "Samoa Nord-americana": "AS",
+    "Samoa Americana": "AS",
     "San Marino": "SM",
     "Santa Helena": "SH",
     "São Tomé i Príncipe": "ST",
diff --git a/js/data/locale/ca/ES/ctryreverse.json b/js/data/locale/ca/ES/ctryreverse.json
index cd4ae877d8..36b2d8a975 100644
--- a/js/data/locale/ca/ES/ctryreverse.json
+++ b/js/data/locale/ca/ES/ctryreverse.json
@@ -41,7 +41,7 @@
     "AO": "Angola",
     "AQ": "Antàrtida",
     "AR": "Argentina",
-    "AS": "Samoa Nord-americana",
+    "AS": "Samoa Americana",
     "AT": "Àustria",
     "AU": "Austràlia",
     "AW": "Aruba",
@@ -64,12 +64,12 @@
     "BR": "Brasil",
     "BS": "Bahames",
     "BT": "Bhutan",
-    "BV": "Bouvet",
+    "BV": "Illa Bouvet",
     "BW": "Botswana",
     "BY": "Belarús",
     "BZ": "Belize",
     "CA": "Canadà",
-    "CC": "Illes Cocos",
+    "CC": "Illes Cocos (Keeling)",
     "CD": "Congo - Kinshasa",
     "CF": "República Centreafricana",
     "CG": "Congo - Brazzaville",
@@ -132,7 +132,7 @@
     "GW": "Guinea Bissau",
     "GY": "Guyana",
     "HK": "Hong Kong (RAE Xina)",
-    "HM": "Illa Heard i Illes McDonald",
+    "HM": "Illes Heard i McDonald",
     "HN": "Hondures",
     "HR": "Croàcia",
     "HT": "Haití",
@@ -186,7 +186,7 @@
     "MM": "Myanmar (Birmània)",
     "MN": "Mongòlia",
     "MO": "Macau (RAE Xina)",
-    "MP": "Illes Mariannes Septentrionals",
+    "MP": "Illes Marianes del Nord",
     "MQ": "Martinica",
     "MR": "Mauritània",
     "MS": "Montserrat",
@@ -231,7 +231,7 @@
     "RS": "Sèrbia",
     "RU": "Rússia",
     "RW": "Ruanda",
-    "SA": "Aràbia Saudita",
+    "SA": "Aràbia Saudí",
     "SB": "Illes Salomó",
     "SC": "Seychelles",
     "SD": "Sudan",
diff --git a/js/data/locale/ca/FR/ctrynames.json b/js/data/locale/ca/FR/ctrynames.json
index 3a9cee94e6..a7d7984dbf 100644
--- a/js/data/locale/ca/FR/ctrynames.json
+++ b/js/data/locale/ca/FR/ctrynames.json
@@ -21,7 +21,7 @@
     "Anguilla": "AI",
     "Antàrtida": "AQ",
     "Antigua i Barbuda": "AG",
-    "Aràbia Saudita": "SA",
+    "Aràbia Saudí": "SA",
     "Argentina": "AR",
     "Armènia": "AM",
     "Aruba": "AW",
@@ -48,7 +48,6 @@
     "Bolívia": "BO",
     "Bòsnia i Hercegovina": "BA",
     "Botswana": "BW",
-    "Bouvet": "BV",
     "Brasil": "BR",
     "Brunei": "BN",
     "Bulgària": "BG",
@@ -120,21 +119,22 @@
     "Hong Kong (RAE Xina)": "HK",
     "Hongria": "HU",
     "Iemen": "YE",
+    "Illa Bouvet": "BV",
     "Illa Christmas": "CX",
     "Illa Clipperton": "CP",
     "Illa de l’Ascensió": "AC",
     "Illa de la Reunió": "RE",
     "Illa de Man": "IM",
-    "Illa Heard i Illes McDonald": "HM",
     "Illes Åland": "AX",
     "Illes Caiman": "KY",
     "Illes Canàries": "IC",
-    "Illes Cocos": "CC",
+    "Illes Cocos (Keeling)": "CC",
     "Illes Cook": "CK",
     "Illes Fèroe": "FO",
     "Illes Geòrgia del Sud i Sandwich del Sud": "GS",
+    "Illes Heard i McDonald": "HM",
     "Illes Malvines": "FK",
-    "Illes Mariannes Septentrionals": "MP",
+    "Illes Marianes del Nord": "MP",
     "Illes Marshall": "MH",
     "Illes Perifèriques Menors dels EUA": "UM",
     "Illes Pitcairn": "PN",
@@ -239,7 +239,7 @@
     "Saint-Barthélemy": "BL",
     "Saint-Pierre-et-Miquelon": "PM",
     "Samoa": "WS",
-    "Samoa Nord-americana": "AS",
+    "Samoa Americana": "AS",
     "San Marino": "SM",
     "Santa Helena": "SH",
     "São Tomé i Príncipe": "ST",
diff --git a/js/data/locale/ca/FR/ctryreverse.json b/js/data/locale/ca/FR/ctryreverse.json
index cd4ae877d8..36b2d8a975 100644
--- a/js/data/locale/ca/FR/ctryreverse.json
+++ b/js/data/locale/ca/FR/ctryreverse.json
@@ -41,7 +41,7 @@
     "AO": "Angola",
     "AQ": "Antàrtida",
     "AR": "Argentina",
-    "AS": "Samoa Nord-americana",
+    "AS": "Samoa Americana",
     "AT": "Àustria",
     "AU": "Austràlia",
     "AW": "Aruba",
@@ -64,12 +64,12 @@
     "BR": "Brasil",
     "BS": "Bahames",
     "BT": "Bhutan",
-    "BV": "Bouvet",
+    "BV": "Illa Bouvet",
     "BW": "Botswana",
     "BY": "Belarús",
     "BZ": "Belize",
     "CA": "Canadà",
-    "CC": "Illes Cocos",
+    "CC": "Illes Cocos (Keeling)",
     "CD": "Congo - Kinshasa",
     "CF": "República Centreafricana",
     "CG": "Congo - Brazzaville",
@@ -132,7 +132,7 @@
     "GW": "Guinea Bissau",
     "GY": "Guyana",
     "HK": "Hong Kong (RAE Xina)",
-    "HM": "Illa Heard i Illes McDonald",
+    "HM": "Illes Heard i McDonald",
     "HN": "Hondures",
     "HR": "Croàcia",
     "HT": "Haití",
@@ -186,7 +186,7 @@
     "MM": "Myanmar (Birmània)",
     "MN": "Mongòlia",
     "MO": "Macau (RAE Xina)",
-    "MP": "Illes Mariannes Septentrionals",
+    "MP": "Illes Marianes del Nord",
     "MQ": "Martinica",
     "MR": "Mauritània",
     "MS": "Montserrat",
@@ -231,7 +231,7 @@
     "RS": "Sèrbia",
     "RU": "Rússia",
     "RW": "Ruanda",
-    "SA": "Aràbia Saudita",
+    "SA": "Aràbia Saudí",
     "SB": "Illes Salomó",
     "SC": "Seychelles",
     "SD": "Sudan",
diff --git a/js/data/locale/ca/IT/ctrynames.json b/js/data/locale/ca/IT/ctrynames.json
index 3a9cee94e6..a7d7984dbf 100644
--- a/js/data/locale/ca/IT/ctrynames.json
+++ b/js/data/locale/ca/IT/ctrynames.json
@@ -21,7 +21,7 @@
     "Anguilla": "AI",
     "Antàrtida": "AQ",
     "Antigua i Barbuda": "AG",
-    "Aràbia Saudita": "SA",
+    "Aràbia Saudí": "SA",
     "Argentina": "AR",
     "Armènia": "AM",
     "Aruba": "AW",
@@ -48,7 +48,6 @@
     "Bolívia": "BO",
     "Bòsnia i Hercegovina": "BA",
     "Botswana": "BW",
-    "Bouvet": "BV",
     "Brasil": "BR",
     "Brunei": "BN",
     "Bulgària": "BG",
@@ -120,21 +119,22 @@
     "Hong Kong (RAE Xina)": "HK",
     "Hongria": "HU",
     "Iemen": "YE",
+    "Illa Bouvet": "BV",
     "Illa Christmas": "CX",
     "Illa Clipperton": "CP",
     "Illa de l’Ascensió": "AC",
     "Illa de la Reunió": "RE",
     "Illa de Man": "IM",
-    "Illa Heard i Illes McDonald": "HM",
     "Illes Åland": "AX",
     "Illes Caiman": "KY",
     "Illes Canàries": "IC",
-    "Illes Cocos": "CC",
+    "Illes Cocos (Keeling)": "CC",
     "Illes Cook": "CK",
     "Illes Fèroe": "FO",
     "Illes Geòrgia del Sud i Sandwich del Sud": "GS",
+    "Illes Heard i McDonald": "HM",
     "Illes Malvines": "FK",
-    "Illes Mariannes Septentrionals": "MP",
+    "Illes Marianes del Nord": "MP",
     "Illes Marshall": "MH",
     "Illes Perifèriques Menors dels EUA": "UM",
     "Illes Pitcairn": "PN",
@@ -239,7 +239,7 @@
     "Saint-Barthélemy": "BL",
     "Saint-Pierre-et-Miquelon": "PM",
     "Samoa": "WS",
-    "Samoa Nord-americana": "AS",
+    "Samoa Americana": "AS",
     "San Marino": "SM",
     "Santa Helena": "SH",
     "São Tomé i Príncipe": "ST",
diff --git a/js/data/locale/ca/IT/ctryreverse.json b/js/data/locale/ca/IT/ctryreverse.json
index cd4ae877d8..36b2d8a975 100644
--- a/js/data/locale/ca/IT/ctryreverse.json
+++ b/js/data/locale/ca/IT/ctryreverse.json
@@ -41,7 +41,7 @@
     "AO": "Angola",
     "AQ": "Antàrtida",
     "AR": "Argentina",
-    "AS": "Samoa Nord-americana",
+    "AS": "Samoa Americana",
     "AT": "Àustria",
     "AU": "Austràlia",
     "AW": "Aruba",
@@ -64,12 +64,12 @@
     "BR": "Brasil",
     "BS": "Bahames",
     "BT": "Bhutan",
-    "BV": "Bouvet",
+    "BV": "Illa Bouvet",
     "BW": "Botswana",
     "BY": "Belarús",
     "BZ": "Belize",
     "CA": "Canadà",
-    "CC": "Illes Cocos",
+    "CC": "Illes Cocos (Keeling)",
     "CD": "Congo - Kinshasa",
     "CF": "República Centreafricana",
     "CG": "Congo - Brazzaville",
@@ -132,7 +132,7 @@
     "GW": "Guinea Bissau",
     "GY": "Guyana",
     "HK": "Hong Kong (RAE Xina)",
-    "HM": "Illa Heard i Illes McDonald",
+    "HM": "Illes Heard i McDonald",
     "HN": "Hondures",
     "HR": "Croàcia",
     "HT": "Haití",
@@ -186,7 +186,7 @@
     "MM": "Myanmar (Birmània)",
     "MN": "Mongòlia",
     "MO": "Macau (RAE Xina)",
-    "MP": "Illes Mariannes Septentrionals",
+    "MP": "Illes Marianes del Nord",
     "MQ": "Martinica",
     "MR": "Mauritània",
     "MS": "Montserrat",
@@ -231,7 +231,7 @@
     "RS": "Sèrbia",
     "RU": "Rússia",
     "RW": "Ruanda",
-    "SA": "Aràbia Saudita",
+    "SA": "Aràbia Saudí",
     "SB": "Illes Salomó",
     "SC": "Seychelles",
     "SD": "Sudan",
diff --git a/js/data/locale/ca/ctrynames.json b/js/data/locale/ca/ctrynames.json
index 3a9cee94e6..a7d7984dbf 100644
--- a/js/data/locale/ca/ctrynames.json
+++ b/js/data/locale/ca/ctrynames.json
@@ -21,7 +21,7 @@
     "Anguilla": "AI",
     "Antàrtida": "AQ",
     "Antigua i Barbuda": "AG",
-    "Aràbia Saudita": "SA",
+    "Aràbia Saudí": "SA",
     "Argentina": "AR",
     "Armènia": "AM",
     "Aruba": "AW",
@@ -48,7 +48,6 @@
     "Bolívia": "BO",
     "Bòsnia i Hercegovina": "BA",
     "Botswana": "BW",
-    "Bouvet": "BV",
     "Brasil": "BR",
     "Brunei": "BN",
     "Bulgària": "BG",
@@ -120,21 +119,22 @@
     "Hong Kong (RAE Xina)": "HK",
     "Hongria": "HU",
     "Iemen": "YE",
+    "Illa Bouvet": "BV",
     "Illa Christmas": "CX",
     "Illa Clipperton": "CP",
     "Illa de l’Ascensió": "AC",
     "Illa de la Reunió": "RE",
     "Illa de Man": "IM",
-    "Illa Heard i Illes McDonald": "HM",
     "Illes Åland": "AX",
     "Illes Caiman": "KY",
     "Illes Canàries": "IC",
-    "Illes Cocos": "CC",
+    "Illes Cocos (Keeling)": "CC",
     "Illes Cook": "CK",
     "Illes Fèroe": "FO",
     "Illes Geòrgia del Sud i Sandwich del Sud": "GS",
+    "Illes Heard i McDonald": "HM",
     "Illes Malvines": "FK",
-    "Illes Mariannes Septentrionals": "MP",
+    "Illes Marianes del Nord": "MP",
     "Illes Marshall": "MH",
     "Illes Perifèriques Menors dels EUA": "UM",
     "Illes Pitcairn": "PN",
@@ -239,7 +239,7 @@
     "Saint-Barthélemy": "BL",
     "Saint-Pierre-et-Miquelon": "PM",
     "Samoa": "WS",
-    "Samoa Nord-americana": "AS",
+    "Samoa Americana": "AS",
     "San Marino": "SM",
     "Santa Helena": "SH",
     "São Tomé i Príncipe": "ST",
diff --git a/js/data/locale/ca/ctryreverse.json b/js/data/locale/ca/ctryreverse.json
index cd4ae877d8..36b2d8a975 100644
--- a/js/data/locale/ca/ctryreverse.json
+++ b/js/data/locale/ca/ctryreverse.json
@@ -41,7 +41,7 @@
     "AO": "Angola",
     "AQ": "Antàrtida",
     "AR": "Argentina",
-    "AS": "Samoa Nord-americana",
+    "AS": "Samoa Americana",
     "AT": "Àustria",
     "AU": "Austràlia",
     "AW": "Aruba",
@@ -64,12 +64,12 @@
     "BR": "Brasil",
     "BS": "Bahames",
     "BT": "Bhutan",
-    "BV": "Bouvet",
+    "BV": "Illa Bouvet",
     "BW": "Botswana",
     "BY": "Belarús",
     "BZ": "Belize",
     "CA": "Canadà",
-    "CC": "Illes Cocos",
+    "CC": "Illes Cocos (Keeling)",
     "CD": "Congo - Kinshasa",
     "CF": "República Centreafricana",
     "CG": "Congo - Brazzaville",
@@ -132,7 +132,7 @@
     "GW": "Guinea Bissau",
     "GY": "Guyana",
     "HK": "Hong Kong (RAE Xina)",
-    "HM": "Illa Heard i Illes McDonald",
+    "HM": "Illes Heard i McDonald",
     "HN": "Hondures",
     "HR": "Croàcia",
     "HT": "Haití",
@@ -186,7 +186,7 @@
     "MM": "Myanmar (Birmània)",
     "MN": "Mongòlia",
     "MO": "Macau (RAE Xina)",
-    "MP": "Illes Mariannes Septentrionals",
+    "MP": "Illes Marianes del Nord",
     "MQ": "Martinica",
     "MR": "Mauritània",
     "MS": "Montserrat",
@@ -231,7 +231,7 @@
     "RS": "Sèrbia",
     "RU": "Rússia",
     "RW": "Ruanda",
-    "SA": "Aràbia Saudita",
+    "SA": "Aràbia Saudí",
     "SB": "Illes Salomó",
     "SC": "Seychelles",
     "SD": "Sudan",
diff --git a/js/data/locale/ca/dateformats.json b/js/data/locale/ca/dateformats.json
index 73c1b3bf96..99537fde05 100644
--- a/js/data/locale/ca/dateformats.json
+++ b/js/data/locale/ca/dateformats.json
@@ -55,14 +55,14 @@
                 "s": "E, d/M"
             },
             "dmwy": {
-                "f": "EEEE, d MMMM 'de' yyyy",
-                "l": "EEE, d MMMM 'de' yyyy",
+                "f": "EEEE, d MMMM 'del' yyyy",
+                "l": "EEE, d MMMM 'del' yyyy",
                 "m": "EE, d MMM yyyy",
                 "s": "E, d/M/yy"
             },
             "dmy": {
-                "f": "d MMMM 'de' yyyy",
-                "l": "d MMMM 'de' yyyy",
+                "f": "d MMMM 'del' yyyy",
+                "l": "d MMMM 'del' yyyy",
                 "m": "d MMM yyyy"
             },
             "dw": {
@@ -82,13 +82,13 @@
                 "m": "MMM"
             },
             "my": {
-                "f": "MMMM 'de' yyyy",
-                "l": "MMMM 'de' yyyy",
+                "f": "MMMM 'del' yyyy",
+                "l": "MMMM 'del' yyyy",
                 "m": "MMM yyyy"
             },
             "mys": {
-                "f": "LLLL 'de' yyyy",
-                "l": "LLLL 'de' yyyy",
+                "f": "LLLL 'del' yyyy",
+                "l": "LLLL 'del' yyyy",
                 "m": "LLL yyyy",
                 "s": "M/yy"
             }
@@ -101,45 +101,45 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} {sm} de {sy}, a les {st} – {et}",
-                "l": "{sd} {sm} de {sy}, a les {st} – {et}",
+                "f": "{sd} {sm} del {sy}, a les {st} – {et}",
+                "l": "{sd} {sm} del {sy}, a les {st} – {et}",
                 "m": "{sd} {sm} {sy}, {st} – {et}"
             },
             "c01": {
-                "f": "{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}",
-                "l": "{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}",
+                "f": "{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}",
+                "l": "{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}",
                 "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}"
             },
             "c02": {
-                "f": "{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}",
-                "l": "{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}",
+                "f": "{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}",
+                "l": "{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}",
                 "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}"
             },
             "c03": {
-                "f": "{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}",
-                "l": "{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}",
+                "f": "{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}",
+                "l": "{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}",
                 "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}"
             },
             "c10": {
-                "f": "{sd} – {ed} {em} de {ey}",
-                "l": "{sd} – {ed} {em} de {ey}",
+                "f": "{sd} – {ed} {em} del {ey}",
+                "l": "{sd} – {ed} {em} del {ey}",
                 "m": "{sd} – {ed} {em} {ey}",
                 "s": "{sd} – {ed}/{em}/{ey}"
             },
             "c11": {
-                "f": "{sd} {sm} – {ed} {em} de {ey}",
-                "l": "{sd} {sm} – {ed} {em} de {ey}",
+                "f": "{sd} {sm} – {ed} {em} del {ey}",
+                "l": "{sd} {sm} – {ed} {em} del {ey}",
                 "m": "{sd} {sm} – {ed} {em} {ey}",
                 "s": "{sd}/{sm} – {ed}/{em}/{ey}"
             },
             "c12": {
-                "f": "{sd} {sm} de {sy} – {ed} {em} de {ey}",
-                "l": "{sd} {sm} de {sy} – {ed} {em} de {ey}",
+                "f": "{sd} {sm} del {sy} – {ed} {em} del {ey}",
+                "l": "{sd} {sm} del {sy} – {ed} {em} del {ey}",
                 "m": "{sd} {sm} {sy} – {ed} {em} {ey}"
             },
             "c20": {
-                "f": "{sm} de {sy} – {em} de {ey}",
-                "l": "{sm} de {sy} – {em} de {ey}",
+                "f": "{sm} del {sy} – {em} del {ey}",
+                "l": "{sm} del {sy} – {em} del {ey}",
                 "m": "{sm} {sy} – {em} {ey}"
             },
             "c30": {
diff --git a/js/data/locale/ca/sysres.json b/js/data/locale/ca/sysres.json
index c3fb7edc5b..4c6ca40e83 100644
--- a/js/data/locale/ca/sysres.json
+++ b/js/data/locale/ca/sysres.json
@@ -6,14 +6,14 @@
     "#in {num}s": "one#d’aquí a {num} s|#d’aquí a {num} s",
     "#in {num}w": "one#d’aquí a {num} setm.|#d’aquí a {num} setm.",
     "#in {num}y": "one#d’aquí a {num} any|#d’aquí a {num} anys",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d|#{num} d",
     "#{num}d ago": "one#fa {num} dia|#fa {num} dies",
-    "#{num}h": "one#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#fa {num} h|#fa {num} h",
     "#{num}mi ago": "one#fa {num} min|#fa {num} min",
     "#{num}mo ago": "one#fa {num} mes|#fa {num} mesos",
-    "#{num}s": "one#{num} s|#{num} s",
+    "#{num}s": "#{num} s",
     "#{num}s ago": "one#fa {num} s|#fa {num} s",
     "#{num}w": "one#{num} setm.|#{num} setm.",
     "#{num}w ago": "one#fa {num} setm.|#fa {num} setm.",
@@ -26,13 +26,13 @@
     "1#1 hour ago|#{num} hours ago": "one#fa {num} hora|#fa {num} hores",
     "1#1 hour|#{num} hours": "one#{num} hora|#{num} hores",
     "1#1 hr ago|#{num} hrs ago": "one#fa {num} hora|#fa {num} hores",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} mil·lisegon|#{num} mil·lisegons",
     "1#1 min ago|#{num} min ago": "one#fa {num} minut|#fa {num} minuts",
     "1#1 minute ago|#{num} minutes ago": "one#fa {num} minut|#fa {num} minuts",
     "1#1 minute|#{num} minutes": "one#{num} minut|#{num} minuts",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "one#fa {num} mes|#fa {num} mesos",
     "1#1 month ago|#{num} months ago": "one#fa {num} mes|#fa {num} mesos",
     "1#1 month|#{num} months": "one#{num} mes|#{num} mesos",
@@ -41,8 +41,8 @@
     "1#1 sec ago|#{num} sec ago": "one#fa {num} segon|#fa {num} segons",
     "1#1 second ago|#{num} seconds ago": "one#fa {num} segon|#fa {num} segons",
     "1#1 second|#{num} seconds": "one#{num} segon|#{num} segons",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 se|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#fa {num} setmana|#fa {num} setmanes",
     "1#1 week|#{num} weeks": "one#{num} setmana|#{num} setmanes",
     "1#1 wk ago|#{num} wks ago": "one#fa {num} setmana|#fa {num} setmanes",
@@ -74,13 +74,13 @@
     "B6": "tarda",
     "B7": "vespre",
     "B8": "nit",
-    "E0": "dg",
-    "E1": "dl",
-    "E2": "dt",
-    "E3": "dc",
-    "E4": "dj",
-    "E5": "dv",
-    "E6": "ds",
+    "E0": "dg.",
+    "E1": "dl.",
+    "E2": "dt.",
+    "E3": "dc.",
+    "E4": "dj.",
+    "E5": "dv.",
+    "E6": "ds.",
     "EE0": "dg.",
     "EE1": "dl.",
     "EE2": "dt.",
@@ -203,12 +203,12 @@
     "a0": "a. m.",
     "a1": "p. m.",
     "durationLongDays": "one#{num} dia|#{num} dies",
-    "durationMediumHours": "one#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} setm.|#{num} setm.",
     "durationMediumYears": "one#{num} any|#{num} anys",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|#{num} min",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
     "durationShortMonths": "one#{num} m|#{num} m",
     "finalSeparatorFull": " i ",
     "finalSeparatorLong": " i ",
diff --git a/js/data/locale/ca/unitfmt.json b/js/data/locale/ca/unitfmt.json
index e6eaae6894..6a59fa658c 100644
--- a/js/data/locale/ca/unitfmt.json
+++ b/js/data/locale/ca/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferes",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barrils",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits per segon",
             "british-thermal-unit": "one#{n} unitat tèrmica britànica|#{n} unitats tèrmiques britàniques",
@@ -43,9 +44,9 @@
             "degree": "one#{n} grau|#{n} graus",
             "dessert-spoon": "one#{n} culleradeta de postres|#{n} culleradetes de postres",
             "dessert-spoon-imperial": "one#{n} culleradeta de postres imperial|#{n} culleradetes de postres imperials",
-            "dot": "one#{n} punt|#{n} punts",
-            "dot-per-centimeter": "one#{n} punt per centímetre|#{n} punts per centímetre",
-            "dot-per-inch": "one#{n} punt per polzada|#{n} punts per polzada",
+            "dot": "one#{n} píxel|#{n} píxels",
+            "dot-per-centimeter": "one#{n} píxel per centímetre|#{n} píxels per centímetre",
+            "dot-per-inch": "one#{n} píxel per polzada|#{n} píxels per polzada",
             "dram": "one#{n} dracma|#{n} dracmes",
             "drop": "one#{n} gota|#{n} gotes",
             "dunam": "one#{n} dunam|#{n} dunams",
@@ -57,7 +58,7 @@
             "fathom": "one#{n} braça|#{n} braces",
             "fluid-ounce": "one#{n} unça líquida|#{n} unces líquides",
             "fluid-ounce-imperial": "one#{n} unça líquida imperial|#{n} unces líquides imperials",
-            "foodcalorie": "one#{n} quilocaloria|#{n} quilocalories",
+            "foodcalorie": "one#{n} caloria|#{n} calories",
             "foot": "one#{n} peu|#{n} peus",
             "foot-per-second": "#{n} peus per segon",
             "furlong": "one#{n} estadi|#{n} estadis",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,7 +251,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "one#{n} culleradeta postres|#{n} culleradetes postres",
             "dessert-spoon-imperial": "#{n} cull. postres imp.",
-            "dot": "one#{n} punt|#{n} punts",
             "dot-per-centimeter": "#{n} ppcm",
             "dot-per-inch": "#{n} ppp",
             "dram": "one#{n} dracma fluid|#{n} dracmes fluids",
@@ -263,7 +264,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
+            "foodcalorie": "#{n} cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
@@ -406,7 +407,7 @@
             "terabyte-per-second": "#{n} TB/s",
             "therm-us": "#{n} thm",
             "ton": "#{n} t",
-            "tonne": "#{n} t mètr.",
+            "tonne": "one#{n} t m|#{n} t mètr.",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} setm.",
diff --git a/js/data/locale/cad/unitfmt.json b/js/data/locale/cad/unitfmt.json
index 2f2b42ac03..0219045a1f 100644
--- a/js/data/locale/cad/unitfmt.json
+++ b/js/data/locale/cad/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/cch/unitfmt.json b/js/data/locale/cch/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/cch/unitfmt.json
+++ b/js/data/locale/cch/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ccp/IN/ctrynames.json b/js/data/locale/ccp/IN/ctrynames.json
index 04f991cb2b..925ca03cdb 100644
--- a/js/data/locale/ccp/IN/ctrynames.json
+++ b/js/data/locale/ccp/IN/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Eurozone": "EZ",
     "Pseudo-Accents": "XA",
     "Pseudo-Bidi": "XB",
@@ -203,7 +204,6 @@
     "𑄝𑄬𑄣𑄴𑄎𑄨𑄠𑄟𑄴": "BE",
     "𑄝𑄮𑄞𑄬𑄑𑄴 𑄞𑄨𑄘𑄳𑄠": "BV",
     "𑄝𑄳𑄢𑄎𑄨𑄣𑄴": "BR",
-    "𑄝𑄳𑄢𑄨𑄑𑄨𑄌𑄴 𑄞𑄢𑄧𑄖𑄴 𑄟𑄧𑄦𑄥𑄉𑄧𑄢𑄨𑄠𑄧 𑄞𑄨𑄘𑄳𑄠": "IO",
     "𑄝𑄳𑄢𑄨𑄑𑄨𑄌𑄴 𑄞𑄢𑄴𑄎𑄨𑄚𑄴 𑄉𑄭 𑄉𑄭 𑄞𑄨𑄘𑄳𑄠": "VG",
     "𑄝𑄳𑄢𑄪𑄚𑄬𑄭": "BN",
     "𑄞𑄚𑄪𑄠𑄑𑄪": "VU",
diff --git a/js/data/locale/ccp/IN/ctryreverse.json b/js/data/locale/ccp/IN/ctryreverse.json
index 03f4869ffb..219d9c8b93 100644
--- a/js/data/locale/ccp/IN/ctryreverse.json
+++ b/js/data/locale/ccp/IN/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𑄄𑄎𑄴𑄢𑄠𑄬𑄣𑄴",
     "IM": "𑄃𑄭𑄣𑄴 𑄃𑄧𑄜𑄴 𑄟𑄳𑄠𑄚𑄴",
     "IN": "𑄞𑄢𑄧𑄖𑄴",
-    "IO": "𑄝𑄳𑄢𑄨𑄑𑄨𑄌𑄴 𑄞𑄢𑄧𑄖𑄴 𑄟𑄧𑄦𑄥𑄉𑄧𑄢𑄨𑄠𑄧 𑄞𑄨𑄘𑄳𑄠",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𑄄𑄢𑄇𑄴",
     "IR": "𑄄𑄢𑄚𑄴",
     "IS": "𑄃𑄭𑄥𑄴𑄣𑄳𑄠𑄚𑄴𑄓𑄴",
diff --git a/js/data/locale/ccp/ctrynames.json b/js/data/locale/ccp/ctrynames.json
index 04f991cb2b..925ca03cdb 100644
--- a/js/data/locale/ccp/ctrynames.json
+++ b/js/data/locale/ccp/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Eurozone": "EZ",
     "Pseudo-Accents": "XA",
     "Pseudo-Bidi": "XB",
@@ -203,7 +204,6 @@
     "𑄝𑄬𑄣𑄴𑄎𑄨𑄠𑄟𑄴": "BE",
     "𑄝𑄮𑄞𑄬𑄑𑄴 𑄞𑄨𑄘𑄳𑄠": "BV",
     "𑄝𑄳𑄢𑄎𑄨𑄣𑄴": "BR",
-    "𑄝𑄳𑄢𑄨𑄑𑄨𑄌𑄴 𑄞𑄢𑄧𑄖𑄴 𑄟𑄧𑄦𑄥𑄉𑄧𑄢𑄨𑄠𑄧 𑄞𑄨𑄘𑄳𑄠": "IO",
     "𑄝𑄳𑄢𑄨𑄑𑄨𑄌𑄴 𑄞𑄢𑄴𑄎𑄨𑄚𑄴 𑄉𑄭 𑄉𑄭 𑄞𑄨𑄘𑄳𑄠": "VG",
     "𑄝𑄳𑄢𑄪𑄚𑄬𑄭": "BN",
     "𑄞𑄚𑄪𑄠𑄑𑄪": "VU",
diff --git a/js/data/locale/ccp/ctryreverse.json b/js/data/locale/ccp/ctryreverse.json
index 03f4869ffb..219d9c8b93 100644
--- a/js/data/locale/ccp/ctryreverse.json
+++ b/js/data/locale/ccp/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𑄄𑄎𑄴𑄢𑄠𑄬𑄣𑄴",
     "IM": "𑄃𑄭𑄣𑄴 𑄃𑄧𑄜𑄴 𑄟𑄳𑄠𑄚𑄴",
     "IN": "𑄞𑄢𑄧𑄖𑄴",
-    "IO": "𑄝𑄳𑄢𑄨𑄑𑄨𑄌𑄴 𑄞𑄢𑄧𑄖𑄴 𑄟𑄧𑄦𑄥𑄉𑄧𑄢𑄨𑄠𑄧 𑄞𑄨𑄘𑄳𑄠",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𑄄𑄢𑄇𑄴",
     "IR": "𑄄𑄢𑄚𑄴",
     "IS": "𑄃𑄭𑄥𑄴𑄣𑄳𑄠𑄚𑄴𑄓𑄴",
diff --git a/js/data/locale/ccp/sysres.json b/js/data/locale/ccp/sysres.json
index 2e4a005499..32604e815b 100644
--- a/js/data/locale/ccp/sysres.json
+++ b/js/data/locale/ccp/sysres.json
@@ -1,70 +1,70 @@
 {
-    "#in {num}d": "one#{num} 𑄘𑄨𑄚𑄮 𑄟𑄧𑄖𑄴𑄙𑄳𑄠|#{num} 𑄘𑄨𑄚𑄮 𑄟𑄧𑄖𑄴𑄙𑄳𑄠",
-    "#in {num}h": "one#{num} 𑄊𑄮𑄚𑄴𑄓𑄠𑄴|#{num} 𑄊𑄮𑄚𑄴𑄓𑄠𑄴",
-    "#in {num}mi": "one#{num} 𑄟𑄨𑄚𑄨𑄘𑄬|#{num} 𑄟𑄨𑄚𑄨𑄘𑄬",
-    "#in {num}mo": "one#{num} 𑄟𑄏𑄬|#{num} 𑄟𑄏𑄬",
-    "#in {num}s": "one#{num} 𑄥𑄬𑄉𑄬𑄚𑄴𑄘𑄬|#{num} 𑄥𑄬𑄉𑄬𑄚𑄴𑄘𑄬",
-    "#in {num}w": "one#{num} 𑄥𑄛𑄴𑄖𑄠𑄴|#{num} 𑄥𑄛𑄴𑄖𑄠𑄴",
-    "#in {num}y": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄬|#{num} 𑄝𑄧𑄏𑄧𑄢𑄬",
-    "#{num} ms": "one#{num} ms|#{num} ms",
-    "#{num}d": "one#{num} 𑄘𑄨𑄚𑄴|#{num} 𑄘𑄨𑄚𑄴",
-    "#{num}d ago": "one#{num} 𑄘𑄨𑄚𑄴 𑄃𑄉𑄬|#{num} 𑄘𑄨𑄚𑄴 𑄃𑄉𑄬",
+    "#in {num}d": "#{num} 𑄘𑄨𑄚𑄮 𑄟𑄧𑄖𑄴𑄙𑄳𑄠",
+    "#in {num}h": "#{num} 𑄊𑄮𑄚𑄴𑄓𑄠𑄴",
+    "#in {num}mi": "#{num} 𑄟𑄨𑄚𑄨𑄘𑄬",
+    "#in {num}mo": "#{num} 𑄟𑄏𑄬",
+    "#in {num}s": "#{num} 𑄥𑄬𑄉𑄬𑄚𑄴𑄘𑄬",
+    "#in {num}w": "#{num} 𑄥𑄛𑄴𑄖𑄠𑄴",
+    "#in {num}y": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄬",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} 𑄘𑄨𑄚𑄴",
+    "#{num}d ago": "#{num} 𑄘𑄨𑄚𑄴 𑄃𑄉𑄬",
     "#{num}h": "one#{num} 𑄊𑄂|#{num} 𑄊𑄂",
-    "#{num}h ago": "one#{num} 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬|#{num} 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬",
-    "#{num}mi ago": "one#{num} 𑄟𑄨𑄚𑄨𑄖𑄴 𑄃𑄉𑄬|#{num} 𑄟𑄨𑄚𑄨𑄖𑄴 𑄃𑄉𑄬",
+    "#{num}h ago": "#{num} 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬",
+    "#{num}mi ago": "#{num} 𑄟𑄨𑄚𑄨𑄖𑄴 𑄃𑄉𑄬",
     "#{num}mo ago": "one#{num} 𑄇𑄏𑄧 𑄃𑄉𑄬|#{num} 𑄟𑄏𑄧 𑄃𑄉𑄬",
     "#{num}s": "one#{num} 𑄥𑄬𑄂|#{num} 𑄥𑄬𑄂",
-    "#{num}s ago": "one#{num} 𑄥𑄬𑄉𑄬𑄚𑄴 𑄃𑄉𑄬|#{num} 𑄥𑄬𑄉𑄬𑄚𑄴 𑄃𑄉𑄬",
-    "#{num}w": "one#{num} 𑄥𑄛𑄴𑄖|#{num} 𑄥𑄛𑄴𑄖",
-    "#{num}w ago": "one#{num} 𑄥𑄛𑄴𑄖 𑄃𑄉𑄬|#{num} 𑄥𑄛𑄴𑄖 𑄃𑄉𑄬",
-    "#{num}y": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄴|#{num} 𑄝𑄧𑄏𑄧𑄢𑄴",
-    "#{num}y ago": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄴 𑄃𑄉𑄬|#{num} 𑄝𑄧𑄏𑄧𑄢𑄴 𑄃𑄉𑄬",
-    "1#1 day ago|#{num} days ago": "one#{num} 𑄘𑄨𑄚𑄴 𑄃𑄉𑄬|#{num} 𑄘𑄨𑄚𑄴 𑄃𑄉𑄬",
-    "1#1 day|#{num} days": "one#{num} 𑄘𑄨𑄚𑄴|#{num} 𑄘𑄨𑄚𑄴",
-    "1#1 dy ago|#{num} dys ago": "one#{num} 𑄘𑄨𑄚𑄴 𑄃𑄉𑄬|#{num} 𑄘𑄨𑄚𑄴 𑄃𑄉𑄬",
-    "1#1 dy|#{num} dys": "one#{num} 𑄘𑄨𑄚𑄴|#{num} 𑄘𑄨𑄚𑄴",
-    "1#1 hour ago|#{num} hours ago": "one#{num} 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬|#{num} 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬",
+    "#{num}s ago": "#{num} 𑄥𑄬𑄉𑄬𑄚𑄴 𑄃𑄉𑄬",
+    "#{num}w": "#{num} 𑄥𑄛𑄴𑄖",
+    "#{num}w ago": "#{num} 𑄥𑄛𑄴𑄖 𑄃𑄉𑄬",
+    "#{num}y": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄴",
+    "#{num}y ago": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄴 𑄃𑄉𑄬",
+    "1#1 day ago|#{num} days ago": "#{num} 𑄘𑄨𑄚𑄴 𑄃𑄉𑄬",
+    "1#1 day|#{num} days": "#{num} 𑄘𑄨𑄚𑄴",
+    "1#1 dy ago|#{num} dys ago": "#{num} 𑄘𑄨𑄚𑄴 𑄃𑄉𑄬",
+    "1#1 dy|#{num} dys": "#{num} 𑄘𑄨𑄚𑄴",
+    "1#1 hour ago|#{num} hours ago": "#{num} 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬",
     "1#1 hour|#{num} hours": "one#{num} 𑄊𑄧𑄚𑄴𑄘|#{num} 𑄊𑄧𑄚𑄴𑄘",
-    "1#1 hr ago|#{num} hrs ago": "one#{num} 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬|#{num} 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬",
-    "1#1 hr|#{num} hrs": "one#{num} 𑄊𑄧𑄚𑄴𑄑|#{num} 𑄊𑄧𑄚𑄴𑄑",
+    "1#1 hr ago|#{num} hrs ago": "#{num} 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬",
+    "1#1 hr|#{num} hrs": "#{num} 𑄊𑄧𑄚𑄴𑄑",
     "1#1 millisecond|#{num} milliseconds": "one#{num}𑄟𑄨𑄣𑄨𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴|#{num} 𑄟𑄨𑄣𑄨𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴",
-    "1#1 min ago|#{num} min ago": "one#{num} 𑄟𑄨𑄚𑄨𑄖𑄴 𑄃𑄉𑄬|#{num} 𑄟𑄨𑄚𑄨𑄖𑄴 𑄃𑄉𑄬",
-    "1#1 minute ago|#{num} minutes ago": "one#{num} 𑄟𑄨𑄚𑄨𑄖𑄴 𑄃𑄉𑄬|#{num} 𑄟𑄨𑄚𑄨𑄖𑄴 𑄃𑄉𑄬",
-    "1#1 minute|#{num} minutes": "one#{num} 𑄟𑄨𑄚𑄨𑄖𑄴|#{num} 𑄟𑄨𑄚𑄨𑄖𑄴",
-    "1#1 min|#{num} min": "one#{num} 𑄟𑄨𑄚𑄨𑄖𑄴|#{num} 𑄟𑄨𑄚𑄨𑄖𑄴",
+    "1#1 min ago|#{num} min ago": "#{num} 𑄟𑄨𑄚𑄨𑄖𑄴 𑄃𑄉𑄬",
+    "1#1 minute ago|#{num} minutes ago": "#{num} 𑄟𑄨𑄚𑄨𑄖𑄴 𑄃𑄉𑄬",
+    "1#1 minute|#{num} minutes": "#{num} 𑄟𑄨𑄚𑄨𑄖𑄴",
+    "1#1 min|#{num} min": "#{num} 𑄟𑄨𑄚𑄨𑄖𑄴",
     "1#1 mi|#{num} min": "one#{num} 𑄟𑄨𑄂|#{num} 𑄟𑄨𑄂",
-    "1#1 mon ago|#{num} mons ago": "one#{num} 𑄟𑄏𑄧 𑄃𑄉𑄬|#{num} 𑄟𑄏𑄧 𑄃𑄉𑄬",
-    "1#1 month ago|#{num} months ago": "one#{num} 𑄟𑄏𑄧 𑄃𑄉𑄬|#{num} 𑄟𑄏𑄧 𑄃𑄉𑄬",
-    "1#1 month|#{num} months": "one#{num} 𑄟𑄌𑄴|#{num} 𑄟𑄌𑄴",
-    "1#1 mon|#{num} mons": "one#{num} 𑄟𑄌𑄴|#{num} 𑄟𑄌𑄴",
-    "1#1 mo|#{num} mos": "one#{num} 𑄟𑄌𑄴|#{num} 𑄟𑄌𑄴",
-    "1#1 sec ago|#{num} sec ago": "one#{num} 𑄥𑄬𑄉𑄬𑄚𑄴 𑄃𑄉𑄬|#{num} 𑄥𑄬𑄉𑄬𑄚𑄴 𑄃𑄉𑄬",
-    "1#1 second ago|#{num} seconds ago": "one#{num} 𑄥𑄬𑄉𑄬𑄚𑄴 𑄃𑄉𑄬|#{num} 𑄥𑄬𑄉𑄬𑄚𑄴 𑄃𑄉𑄬",
-    "1#1 second|#{num} seconds": "one#{num} 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴|#{num} 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴",
-    "1#1 sec|#{num} sec": "one#{num} 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴|#{num} 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴",
+    "1#1 mon ago|#{num} mons ago": "#{num} 𑄟𑄏𑄧 𑄃𑄉𑄬",
+    "1#1 month ago|#{num} months ago": "#{num} 𑄟𑄏𑄧 𑄃𑄉𑄬",
+    "1#1 month|#{num} months": "#{num} 𑄟𑄌𑄴",
+    "1#1 mon|#{num} mons": "#{num} 𑄟𑄌𑄴",
+    "1#1 mo|#{num} mos": "#{num} 𑄟𑄌𑄴",
+    "1#1 sec ago|#{num} sec ago": "#{num} 𑄥𑄬𑄉𑄬𑄚𑄴 𑄃𑄉𑄬",
+    "1#1 second ago|#{num} seconds ago": "#{num} 𑄥𑄬𑄉𑄬𑄚𑄴 𑄃𑄉𑄬",
+    "1#1 second|#{num} seconds": "#{num} 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴",
+    "1#1 sec|#{num} sec": "#{num} 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴",
     "1#1 se|#{num} sec": "one#{num} 𑄥𑄬𑄂|#{num} 𑄥𑄬𑄂",
-    "1#1 week ago|#{num} weeks ago": "one#{num} 𑄥𑄛𑄴𑄖 𑄃𑄉𑄬|#{num} 𑄥𑄛𑄴𑄖 𑄃𑄉𑄬",
-    "1#1 week|#{num} weeks": "one#{num} 𑄥𑄛𑄴𑄖|#{num} 𑄥𑄛𑄴𑄖",
-    "1#1 wk ago|#{num} wks ago": "one#{num} 𑄥𑄛𑄴𑄖 𑄃𑄉𑄬|#{num} 𑄥𑄛𑄴𑄖 𑄃𑄉𑄬",
-    "1#1 wk|#{num} wks": "one#{num} 𑄥𑄛𑄴𑄖|#{num} 𑄥𑄛𑄴𑄖",
-    "1#1 year ago|#{num} years ago": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄴 𑄃𑄉𑄬|#{num} 𑄝𑄧𑄏𑄧𑄢𑄴 𑄃𑄉𑄬",
-    "1#1 year|#{num} years": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄴|#{num} 𑄝𑄧𑄏𑄧𑄢𑄴",
-    "1#1 yr ago|#{num} yrs ago": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄴 𑄃𑄉𑄬|#{num} 𑄝𑄧𑄏𑄧𑄢𑄴 𑄃𑄉𑄬",
-    "1#1 yr|#{num} yrs": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄴|#{num} 𑄝𑄧𑄏𑄧𑄢𑄴",
-    "1#in 1 day|#in {num} days": "one#{num} 𑄘𑄨𑄚𑄮 𑄟𑄧𑄖𑄴𑄙𑄳𑄠|#{num} 𑄘𑄨𑄚𑄮 𑄟𑄧𑄖𑄴𑄙𑄳𑄠",
-    "1#in 1 dy|#in {num} dys": "one#{num} 𑄘𑄨𑄚𑄮 𑄟𑄧𑄖𑄴𑄙𑄳𑄠|#{num} 𑄘𑄨𑄚𑄮 𑄟𑄧𑄖𑄴𑄙𑄳𑄠",
-    "1#in 1 hour|#in {num} hours": "one#{num} 𑄊𑄮𑄚𑄴𑄓𑄠𑄴|#{num} 𑄊𑄮𑄚𑄴𑄓𑄠𑄴",
-    "1#in 1 hr|#in {num} hrs": "one#{num} 𑄊𑄮𑄚𑄴𑄓𑄠𑄴|#{num} 𑄊𑄮𑄚𑄴𑄓𑄠𑄴",
-    "1#in 1 minute|#in {num} minutes": "one#{num} 𑄟𑄨𑄚𑄨𑄘𑄬|#{num} 𑄟𑄨𑄚𑄨𑄘𑄬",
-    "1#in 1 min|#in {num} min": "one#{num} 𑄟𑄨𑄚𑄨𑄘𑄬|#{num} 𑄟𑄨𑄚𑄨𑄘𑄬",
-    "1#in 1 month|#in {num} months": "one#{num} 𑄟𑄏𑄬|#{num} 𑄟𑄏𑄬",
-    "1#in 1 mon|#in {num} mons": "one#{num} 𑄟𑄏𑄬|#{num} 𑄟𑄏𑄬",
-    "1#in 1 second|#in {num} seconds": "one#{num} 𑄥𑄬𑄉𑄬𑄚𑄴𑄘𑄬|#{num} 𑄥𑄬𑄉𑄬𑄚𑄴𑄘𑄬",
-    "1#in 1 sec|#in {num} sec": "one#{num} 𑄥𑄬𑄉𑄬𑄚𑄴𑄘𑄬|#{num} 𑄥𑄬𑄉𑄬𑄚𑄴𑄘𑄬",
-    "1#in 1 week|#in {num} weeks": "one#{num} 𑄥𑄛𑄴𑄖𑄠𑄴|#{num} 𑄥𑄛𑄴𑄖𑄠𑄴",
-    "1#in 1 wk|#in {num} wks": "one#{num} 𑄥𑄛𑄴𑄖𑄠𑄴|#{num} 𑄥𑄛𑄴𑄖𑄠𑄴",
-    "1#in 1 year|#in {num} years": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄬|#{num} 𑄝𑄧𑄏𑄧𑄢𑄬",
-    "1#in 1 yr|#in {num} yrs": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄬|#{num} 𑄝𑄧𑄏𑄧𑄢𑄬",
+    "1#1 week ago|#{num} weeks ago": "#{num} 𑄥𑄛𑄴𑄖 𑄃𑄉𑄬",
+    "1#1 week|#{num} weeks": "#{num} 𑄥𑄛𑄴𑄖",
+    "1#1 wk ago|#{num} wks ago": "#{num} 𑄥𑄛𑄴𑄖 𑄃𑄉𑄬",
+    "1#1 wk|#{num} wks": "#{num} 𑄥𑄛𑄴𑄖",
+    "1#1 year ago|#{num} years ago": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄴 𑄃𑄉𑄬",
+    "1#1 year|#{num} years": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄴",
+    "1#1 yr ago|#{num} yrs ago": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄴 𑄃𑄉𑄬",
+    "1#1 yr|#{num} yrs": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄴",
+    "1#in 1 day|#in {num} days": "#{num} 𑄘𑄨𑄚𑄮 𑄟𑄧𑄖𑄴𑄙𑄳𑄠",
+    "1#in 1 dy|#in {num} dys": "#{num} 𑄘𑄨𑄚𑄮 𑄟𑄧𑄖𑄴𑄙𑄳𑄠",
+    "1#in 1 hour|#in {num} hours": "#{num} 𑄊𑄮𑄚𑄴𑄓𑄠𑄴",
+    "1#in 1 hr|#in {num} hrs": "#{num} 𑄊𑄮𑄚𑄴𑄓𑄠𑄴",
+    "1#in 1 minute|#in {num} minutes": "#{num} 𑄟𑄨𑄚𑄨𑄘𑄬",
+    "1#in 1 min|#in {num} min": "#{num} 𑄟𑄨𑄚𑄨𑄘𑄬",
+    "1#in 1 month|#in {num} months": "#{num} 𑄟𑄏𑄬",
+    "1#in 1 mon|#in {num} mons": "#{num} 𑄟𑄏𑄬",
+    "1#in 1 second|#in {num} seconds": "#{num} 𑄥𑄬𑄉𑄬𑄚𑄴𑄘𑄬",
+    "1#in 1 sec|#in {num} sec": "#{num} 𑄥𑄬𑄉𑄬𑄚𑄴𑄘𑄬",
+    "1#in 1 week|#in {num} weeks": "#{num} 𑄥𑄛𑄴𑄖𑄠𑄴",
+    "1#in 1 wk|#in {num} wks": "#{num} 𑄥𑄛𑄴𑄖𑄠𑄴",
+    "1#in 1 year|#in {num} years": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄬",
+    "1#in 1 yr|#in {num} yrs": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄬",
     "B0": "AM",
     "B1": "𑄛𑄧𑄖𑄳𑄠𑄃𑄟𑄧𑄣𑄳𑄠𑄬",
     "B2": "𑄝𑄬𑄚𑄳𑄠𑄬",
@@ -199,14 +199,14 @@
     "NN7": "𑄎",
     "NN8": "𑄃",
     "NN9": "𑄥",
-    "durationLongDays": "one#{num} 𑄘𑄨𑄚𑄴|#{num} 𑄘𑄨𑄚𑄴",
+    "durationLongDays": "#{num} 𑄘𑄨𑄚𑄴",
     "durationMediumHours": "one#{num} 𑄊𑄂|#{num} 𑄊𑄂",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
-    "durationMediumWeeks": "one#{num} 𑄥𑄛𑄴𑄖|#{num} 𑄥𑄛𑄴𑄖",
-    "durationMediumYears": "one#{num} 𑄝𑄧𑄏𑄧𑄢𑄴|#{num} 𑄝𑄧𑄏𑄧𑄢𑄴",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} 𑄥𑄛𑄴𑄖",
+    "durationMediumYears": "#{num} 𑄝𑄧𑄏𑄧𑄢𑄴",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} 𑄟𑄨𑄂|#{num} 𑄟𑄨𑄂",
-    "durationShortMonths": "one#{num} 𑄟𑄌𑄴|#{num} 𑄟𑄌𑄴",
+    "durationShortMonths": "#{num} 𑄟𑄌𑄴",
     "finalSeparatorFull": ", ",
     "finalSeparatorLong": ", ",
     "finalSeparatorMedium": ", ",
diff --git a/js/data/locale/ccp/unitfmt.json b/js/data/locale/ccp/unitfmt.json
index 7c5f6caad1..129250e8ed 100644
--- a/js/data/locale/ccp/unitfmt.json
+++ b/js/data/locale/ccp/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𑄝𑄨𑄖𑄴",
             "bit-per-second": "#{n} 𑄝𑄨𑄖𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴",
             "british-thermal-unit": "#{n} Btu",
@@ -53,7 +54,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} 𑄜𑄳𑄣𑄪𑄃𑄨𑄓𑄴 𑄃𑄅𑄪𑄚𑄳𑄌𑄴",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} 𑄇𑄳𑄠𑄣𑄮𑄢𑄨",
             "foot": "#{n} 𑄜𑄪𑄖𑄴",
             "foot-per-second": "#{n} 𑄜𑄪𑄖𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴",
             "furlong": "#{n} fur",
@@ -213,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𑄝𑄨𑄖𑄴",
             "bit-per-second": "#{n} 𑄝𑄨𑄖𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴",
             "british-thermal-unit": "#{n} Btu",
@@ -256,7 +257,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Cal",
             "foot": "#{n} 𑄜𑄪𑄖𑄴",
             "foot-per-second": "#{n} 𑄜𑄪𑄖𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/ce/ctrynames.json b/js/data/locale/ce/ctrynames.json
index 3806d08caf..d3b6cfd789 100644
--- a/js/data/locale/ce/ctrynames.json
+++ b/js/data/locale/ce/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "North Macedonia": "MK",
     "Pseudo-Accents": "XA",
     "Pseudo-Bidi": "XB",
@@ -39,7 +40,6 @@
     "Босни а, Герцеговина а": "BA",
     "Ботсвана": "BW",
     "Бразили": "BR",
-    "Британин латта Индин океанехь": "IO",
     "Бруней-Даруссалам": "BN",
     "Бувен гӀайре": "BV",
     "Буркина- Фасо": "BF",
diff --git a/js/data/locale/ce/ctryreverse.json b/js/data/locale/ce/ctryreverse.json
index 3d57052b87..9605410198 100644
--- a/js/data/locale/ce/ctryreverse.json
+++ b/js/data/locale/ce/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Израиль",
     "IM": "Мэн гӀайре",
     "IN": "ХӀинди",
-    "IO": "Британин латта Индин океанехь",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Ӏиракъ",
     "IR": "ГӀажарийчоь",
     "IS": "Исланди",
diff --git a/js/data/locale/ce/unitfmt.json b/js/data/locale/ce/unitfmt.json
index ef9bb371d1..62b82ee3e5 100644
--- a/js/data/locale/ce/unitfmt.json
+++ b/js/data/locale/ce/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit секундехь",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ceb/ctrynames.json b/js/data/locale/ceb/ctrynames.json
index a9b4de6931..5be75caba2 100644
--- a/js/data/locale/ceb/ctrynames.json
+++ b/js/data/locale/ceb/ctrynames.json
@@ -35,7 +35,6 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazil": "BR",
-    "British Indian Ocean Territory": "IO",
     "British Virgin Islands": "VG",
     "Brunei": "BN",
     "Bulgaria": "BG",
@@ -261,6 +260,7 @@
     "Taiwan": "TW",
     "Tajikistan": "TJ",
     "Tanzania": "TZ",
+    "Teritoryo sa British Indian Ocean": "IO",
     "Thailand": "TH",
     "Timor-Leste": "TL",
     "Togo": "TG",
diff --git a/js/data/locale/ceb/ctryreverse.json b/js/data/locale/ceb/ctryreverse.json
index 1ed534c82b..12f4ff3def 100644
--- a/js/data/locale/ceb/ctryreverse.json
+++ b/js/data/locale/ceb/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "British Indian Ocean Territory",
+    "IO": "Teritoryo sa British Indian Ocean",
     "IQ": "Iraq",
     "IR": "Iran",
     "IS": "Iceland",
diff --git a/js/data/locale/ceb/sysres.json b/js/data/locale/ceb/sysres.json
index fa7f379636..a4d0cff421 100644
--- a/js/data/locale/ceb/sysres.json
+++ b/js/data/locale/ceb/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "#+{num} s",
     "#in {num}w": "#+{num} w",
     "#in {num}y": "#+{num} y",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} adlaw|#{num} adlaw",
     "#{num}d ago": "#-{num} d",
     "#{num}h": "one#{num} ka oras|#{num} ka oras",
@@ -101,7 +101,6 @@
     "MMM6": "Hun",
     "MMM7": "Hul",
     "MMM8": "Ago",
-    "MMM9": "Set",
     "MMMM1": "Enero",
     "MMMM10": "Oktubre",
     "MMMM11": "Nobyembre",
@@ -113,7 +112,7 @@
     "MMMM6": "Hunyo",
     "MMMM7": "Hulyo",
     "MMMM8": "Agosto",
-    "MMMM9": "Setyembre",
+    "MMMM9": "Septiyembre",
     "N1": "E",
     "N2": "P",
     "N6": "H",
diff --git a/js/data/locale/ceb/unitfmt.json b/js/data/locale/ceb/unitfmt.json
index f3f9a17e67..c21e67502d 100644
--- a/js/data/locale/ceb/unitfmt.json
+++ b/js/data/locale/ceb/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} ka atmosphere|#{n} ka mga atmosphere",
             "bar": "one#{n} ka bar|#{n} ka mga bar",
             "barrel": "one#{n} ka barrel|#{n} ka mga barrel",
+            "beaufort": "#B {n}",
             "bit": "one#{n} ka bit|#{n} ka mga bit",
             "bit-per-second": "#{n} ka mga bit kada segundo",
             "british-thermal-unit": "one#{n} ka British thermal unit|#{n} ka mga British thermal unit",
@@ -42,9 +43,6 @@
             "degree": "one#{n} ka degree|#{n} ka mga degree",
             "dessert-spoon": "#{n} ka kutsarang panghinam-is",
             "dessert-spoon-imperial": "#{n} ka Imp. nga kutsarang panghinam-is",
-            "dot": "one#{n} dot|#{n} px",
-            "dot-per-centimeter": "one#{n} ka dot kada sentimetro|#{n} ka mga dot kada sentimetro",
-            "dot-per-inch": "one#{n} ka dot kada pulgada|#{n} ka mga dot kada pulgada",
             "dram": "#{n} ka dram",
             "drop": "#{n} ka drop",
             "dunam": "one#{n} ka dunam|#{n} ka mga dunam",
@@ -56,7 +54,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "one#{n} ka fluid ounce|#{n} ka mga fluid ounce",
             "fluid-ounce-imperial": "one#{n} ka Imp. fluid ounce|#{n} ka mga Imp. fluid ounce",
-            "foodcalorie": "one#{n} ka Calorie|#{n} ka mga Calorie",
             "foot": "one#{n} ka piye|#{n} ka mga piye",
             "foot-per-second": "#{n} ka mga piye kada segundo",
             "furlong": "#{n} fur",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} ka bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} ka bit",
             "bit-per-second": "#{n} ka bit/segundo",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +246,6 @@
             "degree": "#{n} deg",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} ka dram fl",
             "drop": "#{n} ka drop",
             "dunam": "#{n} ka dunam",
@@ -262,7 +257,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/segundo",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/cgg/unitfmt.json b/js/data/locale/cgg/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/cgg/unitfmt.json
+++ b/js/data/locale/cgg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/cho/unitfmt.json b/js/data/locale/cho/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/cho/unitfmt.json
+++ b/js/data/locale/cho/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/chr/unitfmt.json b/js/data/locale/chr/unitfmt.json
index 74e0dc7c91..82a9ed665a 100644
--- a/js/data/locale/chr/unitfmt.json
+++ b/js/data/locale/chr/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} ᎦᏃᎴᏍᎬ|#{n} ᏗᎦᏃᎴᏍᎬ",
             "bar": "one#{n} ᎦᎾᎸᎢ|#{n} ᏕᎦᎾᎸᎢ",
             "barrel": "one#{n} ᏒᏙᏂ|#{n} ᏧᏒᏙᏂ",
+            "beaufort": "#ᏉᏙᎢ {n}",
             "bit": "one#{n} ᎤᏍᎦᎳ|#{n} ᎤᏍᎦᎵᏨ",
             "bit-per-second": "#{n} ᎤᏍᎦᎵᏨ ᎠᏎᏢ ᎢᏳᏓᎵ",
             "british-thermal-unit": "#{n} ᏈᏗᏏ ᏗᎬᏍᎦᏢᏗ ᏂᎨᏒᎾ ᏓᎪᎵᏰᎥ ᏭᏍᏗᎬ ᎧᎵᎨᏒ",
@@ -152,7 +153,7 @@
             "ohm": "one#{n} ᎣᎻ|#{n} ᏗᎣᎻ",
             "ounce": "one#{n} ᎣᏂᏏ|#{n} ᎢᏯᎣᏂᏏ",
             "ounce-troy": "one#{n} ᏆᏯ ᎣᏂᏏ|#{n} ᏆᏯ ᎢᏯᎣᏂᏏ",
-            "parsec": "one#{n} ᏆᏎᎦ|#{n} ᎢᏯᏆᏎᎦ",
+            "parsec": "#{n} ᎢᏯᏆᏎᎦ",
             "pascal": "one#{n} ᏆᏌᎵ|#{n} ᏗᏆᏌᎵ",
             "percent": "#{n} ᏓᎬᏩᎶᏛ",
             "permille": "#{n} ᏈᎻᎴ",
@@ -215,6 +216,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} ᎦᎾᎸᎢ",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} ᎤᏍᎦᎳ",
             "bit-per-second": "#{n} ᎤᏍᎦᎳ/ᎠᏎ",
             "british-thermal-unit": "#{n} Btu",
@@ -378,7 +380,7 @@
             "pound-force-per-square-inch": "#{n} psi",
             "quart": "#{n} qt",
             "quart-imperial": "#{n} qt Imp.",
-            "quarter": "#{n} q",
+            "quarter": "#{n} ᎯᎸᏍᎩ",
             "radian": "#{n} rad",
             "revolution": "#{n} ᎠᏕᏲᎲ",
             "second": "#{n} ᎠᏎᏢ",
diff --git a/js/data/locale/cic/unitfmt.json b/js/data/locale/cic/unitfmt.json
index 4e9a636c5f..a3e45bb040 100644
--- a/js/data/locale/cic/unitfmt.json
+++ b/js/data/locale/cic/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ckb/IR/ctrynames.json b/js/data/locale/ckb/IR/ctrynames.json
index 270e6cd9f7..55ce85930e 100644
--- a/js/data/locale/ckb/IR/ctrynames.json
+++ b/js/data/locale/ckb/IR/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Pseudo-Accents": "XA",
     "Pseudo-Bidi": "XB",
     "Sark": "CQ",
@@ -285,7 +286,6 @@
     "هەنگاریا": "HU",
     "هۆنگ کۆنگ": "HK",
     "ھایتی": "HT",
-    "ھەرێمی بەریتانی لە ئۆقیانووسی ھیند": "IO",
     "ھۆڵەندا": "NL",
     "ھۆندووراس": "HN",
     "ھیندستان": "IN",
diff --git a/js/data/locale/ckb/IR/ctryreverse.json b/js/data/locale/ckb/IR/ctryreverse.json
index a595f12537..b52dbc7741 100644
--- a/js/data/locale/ckb/IR/ctryreverse.json
+++ b/js/data/locale/ckb/IR/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ئیسرائیل",
     "IM": "دوورگەی مان",
     "IN": "ھیندستان",
-    "IO": "ھەرێمی بەریتانی لە ئۆقیانووسی ھیند",
+    "IO": "British Indian Ocean Territory",
     "IQ": "عێراق",
     "IR": "ئێران",
     "IS": "ئایسلەند",
diff --git a/js/data/locale/ckb/ctrynames.json b/js/data/locale/ckb/ctrynames.json
index 270e6cd9f7..55ce85930e 100644
--- a/js/data/locale/ckb/ctrynames.json
+++ b/js/data/locale/ckb/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Pseudo-Accents": "XA",
     "Pseudo-Bidi": "XB",
     "Sark": "CQ",
@@ -285,7 +286,6 @@
     "هەنگاریا": "HU",
     "هۆنگ کۆنگ": "HK",
     "ھایتی": "HT",
-    "ھەرێمی بەریتانی لە ئۆقیانووسی ھیند": "IO",
     "ھۆڵەندا": "NL",
     "ھۆندووراس": "HN",
     "ھیندستان": "IN",
diff --git a/js/data/locale/ckb/ctryreverse.json b/js/data/locale/ckb/ctryreverse.json
index a595f12537..b52dbc7741 100644
--- a/js/data/locale/ckb/ctryreverse.json
+++ b/js/data/locale/ckb/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ئیسرائیل",
     "IM": "دوورگەی مان",
     "IN": "ھیندستان",
-    "IO": "ھەرێمی بەریتانی لە ئۆقیانووسی ھیند",
+    "IO": "British Indian Ocean Territory",
     "IQ": "عێراق",
     "IR": "ئێران",
     "IS": "ئایسلەند",
diff --git a/js/data/locale/ckb/unitfmt.json b/js/data/locale/ckb/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ckb/unitfmt.json
+++ b/js/data/locale/ckb/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/co/unitfmt.json b/js/data/locale/co/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/co/unitfmt.json
+++ b/js/data/locale/co/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/cs/sysres.json b/js/data/locale/cs/sysres.json
index 879c8ca3bc..2a6880a3e2 100644
--- a/js/data/locale/cs/sysres.json
+++ b/js/data/locale/cs/sysres.json
@@ -6,14 +6,14 @@
     "#in {num}s": "one#za {num} s|few#za {num} s|many#za {num} s|#za {num} s",
     "#in {num}w": "one#za {num} týd.|few#za {num} týd.|many#za {num} týd.|#za {num} týd.",
     "#in {num}y": "one#za {num} r.|few#za {num} r.|many#za {num} r.|#za {num} l.",
-    "#{num} ms": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d.|few#{num} d.|many#{num} d.|#{num} d.",
     "#{num}d ago": "one#před {num} dnem|few#před {num} dny|many#před {num} dne|#před {num} dny",
-    "#{num}h": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#před {num} h|few#před {num} h|many#před {num} h|#před {num} h",
     "#{num}mi ago": "one#před {num} min|few#před {num} min|many#před {num} min|#před {num} min",
     "#{num}mo ago": "one#před {num} měs.|few#před {num} měs.|many#před {num} měs.|#před {num} měs.",
-    "#{num}s": "one#{num} s|few#{num} s|many#{num} s|#{num} s",
+    "#{num}s": "#{num} s",
     "#{num}s ago": "one#před {num} s|few#před {num} s|many#před {num} s|#před {num} s",
     "#{num}w": "one#{num} t.|few#{num} t.|many#{num} t.|#{num} t.",
     "#{num}w ago": "one#před {num} týd.|few#před {num} týd.|many#před {num} týd.|#před {num} týd.",
@@ -26,12 +26,12 @@
     "1#1 hour ago|#{num} hours ago": "one#před {num} hodinou|few#před {num} hodinami|many#před {num} hodiny|#před {num} hodinami",
     "1#1 hour|#{num} hours": "one#{num} hodina|few#{num} hodiny|many#{num} hodiny|#{num} hodin",
     "1#1 hr ago|#{num} hrs ago": "one#před {num} hodinou|few#před {num} hodinami|many#před {num} hodiny|#před {num} hodinami",
-    "1#1 hr|#{num} hrs": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisekunda|few#{num} milisekundy|many#{num} milisekundy|#{num} milisekund",
     "1#1 min ago|#{num} min ago": "one#před {num} minutou|few#před {num} minutami|many#před {num} minuty|#před {num} minutami",
     "1#1 minute ago|#{num} minutes ago": "one#před {num} minutou|few#před {num} minutami|many#před {num} minuty|#před {num} minutami",
     "1#1 minute|#{num} minutes": "one#{num} minuta|few#{num} minuty|many#{num} minuty|#{num} minut",
-    "1#1 min|#{num} min": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num} m|few#{num} m|many#{num} m|#{num} m",
     "1#1 mon ago|#{num} mons ago": "one#před {num} měsícem|few#před {num} měsíci|many#před {num} měsíce|#před {num} měsíci",
     "1#1 month ago|#{num} months ago": "one#před {num} měsícem|few#před {num} měsíci|many#před {num} měsíce|#před {num} měsíci",
@@ -41,8 +41,8 @@
     "1#1 sec ago|#{num} sec ago": "one#před {num} sekundou|few#před {num} sekundami|many#před {num} sekundy|#před {num} sekundami",
     "1#1 second ago|#{num} seconds ago": "one#před {num} sekundou|few#před {num} sekundami|many#před {num} sekundy|#před {num} sekundami",
     "1#1 second|#{num} seconds": "one#{num} sekunda|few#{num} sekundy|many#{num} sekundy|#{num} sekund",
-    "1#1 sec|#{num} sec": "one#{num} s|few#{num} s|many#{num} s|#{num} s",
-    "1#1 se|#{num} sec": "one#{num} s|few#{num} s|many#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#před {num} týdnem|few#před {num} týdny|many#před {num} týdne|#před {num} týdny",
     "1#1 week|#{num} weeks": "one#{num} týden|few#{num} týdny|many#{num} týdne|#{num} týdnů",
     "1#1 wk ago|#{num} wks ago": "one#před {num} týdnem|few#před {num} týdny|many#před {num} týdne|#před {num} týdny",
@@ -202,11 +202,11 @@
     "a0": "dop.",
     "a1": "odp.",
     "durationLongDays": "one#{num} den|few#{num} dny|many#{num} dne|#{num} dnů",
-    "durationMediumHours": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} t.|few#{num} t.|many#{num} t.|#{num} t.",
     "durationMediumYears": "one#{num} r.|few#{num} r.|many#{num} r.|#{num} l.",
-    "durationShortMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} m|few#{num} m|many#{num} m|#{num} m",
     "durationShortMonths": "one#{num} m.|few#{num} m.|many#{num} m.|#{num} m.",
     "finalSeparatorFull": " a ",
diff --git a/js/data/locale/cs/unitfmt.json b/js/data/locale/cs/unitfmt.json
index 2075d05e27..33e95f538c 100644
--- a/js/data/locale/cs/unitfmt.json
+++ b/js/data/locale/cs/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosféra|few#{n} atmosféry|many#{n} atmosféry|#{n} atmosfér",
             "bar": "one#{n} bar|few#{n} bary|many#{n} baru|#{n} barů",
             "barrel": "one#{n} barel|few#{n} barely|many#{n} barelu|#{n} barelů",
+            "beaufort": "#{n}. stupeň Beaufortovy stupnice",
             "bit": "one#{n} bit|few#{n} bity|many#{n} bitu|#{n} bitů",
             "bit-per-second": "#{n} bitů za sekundu",
             "british-thermal-unit": "one#{n} britská tepelná jednotka|few#{n} britské tepelné jednotky|many#{n} britské tepelné jednotky|#{n} britských tepelných jednotek",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} Bft",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
@@ -249,7 +251,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp.",
-            "dot": "#{n} px",
+            "dot": "",
             "dot-per-centimeter": "#{n} DPCM",
             "dot-per-inch": "#{n} DPI",
             "dram": "#{n} fl dr",
@@ -263,7 +265,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/csw/ctrynames.json b/js/data/locale/csw/ctrynames.json
new file mode 100644
index 0000000000..0159a0efa1
--- /dev/null
+++ b/js/data/locale/csw/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "Afghanistan": "AF",
+    "Africa": "002",
+    "Åland Islands": "AX",
+    "Albania": "AL",
+    "Algeria": "DZ",
+    "American Samoa": "AS",
+    "Americas": "019",
+    "Andorra": "AD",
+    "Angola": "AO",
+    "Anguilla": "AI",
+    "Antarctica": "AQ",
+    "Antigua & Barbuda": "AG",
+    "Argentina": "AR",
+    "Armenia": "AM",
+    "Aruba": "AW",
+    "Ascension Island": "AC",
+    "Asia": "142",
+    "Australasia": "053",
+    "Australia": "AU",
+    "Austria": "AT",
+    "Azerbaijan": "AZ",
+    "Bahamas": "BS",
+    "Bahrain": "BH",
+    "Bangladesh": "BD",
+    "Barbados": "BB",
+    "Belarus": "BY",
+    "Belgium": "BE",
+    "Belize": "BZ",
+    "Benin": "BJ",
+    "Bermuda": "BM",
+    "Bhutan": "BT",
+    "Bolivia": "BO",
+    "Bosnia & Herzegovina": "BA",
+    "Botswana": "BW",
+    "Bouvet Island": "BV",
+    "Brazil": "BR",
+    "British Indian Ocean Territory": "IO",
+    "British Virgin Islands": "VG",
+    "Brunei": "BN",
+    "Bulgaria": "BG",
+    "Burkina Faso": "BF",
+    "Burundi": "BI",
+    "Cambodia": "KH",
+    "Cameroon": "CM",
+    "Canary Islands": "IC",
+    "Cape Verde": "CV",
+    "Caribbean": "029",
+    "Caribbean Netherlands": "BQ",
+    "Cayman Islands": "KY",
+    "Central African Republic": "CF",
+    "Central America": "013",
+    "Central Asia": "143",
+    "Ceuta & Melilla": "EA",
+    "Chad": "TD",
+    "Chile": "CL",
+    "China": "CN",
+    "Christmas Island": "CX",
+    "Clipperton Island": "CP",
+    "Cocos (Keeling) Islands": "CC",
+    "Colombia": "CO",
+    "Comoros": "KM",
+    "Congo - Brazzaville": "CG",
+    "Congo - Kinshasa": "CD",
+    "Cook Islands": "CK",
+    "Costa Rica": "CR",
+    "Côte d’Ivoire": "CI",
+    "Croatia": "HR",
+    "Cuba": "CU",
+    "Curaçao": "CW",
+    "Cyprus": "CY",
+    "Czechia": "CZ",
+    "Denmark": "DK",
+    "Diego Garcia": "DG",
+    "Djibouti": "DJ",
+    "Dominica": "DM",
+    "Dominican Republic": "DO",
+    "Eastern Africa": "014",
+    "Eastern Asia": "030",
+    "Eastern Europe": "151",
+    "Ecuador": "EC",
+    "Egypt": "EG",
+    "El Salvador": "SV",
+    "Equatorial Guinea": "GQ",
+    "Eritrea": "ER",
+    "Estonia": "EE",
+    "Eswatini": "SZ",
+    "Ethiopia": "ET",
+    "Europe": "150",
+    "European Union": "EU",
+    "Eurozone": "EZ",
+    "Falkland Islands": "FK",
+    "Faroe Islands": "FO",
+    "Fiji": "FJ",
+    "Finland": "FI",
+    "France": "FR",
+    "French Guiana": "GF",
+    "French Polynesia": "PF",
+    "French Southern Territories": "TF",
+    "Gabon": "GA",
+    "Gambia": "GM",
+    "Georgia": "GE",
+    "Germany": "DE",
+    "Ghana": "GH",
+    "Gibraltar": "GI",
+    "Greece": "GR",
+    "Greenland": "GL",
+    "Grenada": "GD",
+    "Guadeloupe": "GP",
+    "Guam": "GU",
+    "Guatemala": "GT",
+    "Guernsey": "GG",
+    "Guinea": "GN",
+    "Guinea-Bissau": "GW",
+    "Guyana": "GY",
+    "Haiti": "HT",
+    "Heard & McDonald Islands": "HM",
+    "Honduras": "HN",
+    "Hong Kong SAR China": "HK",
+    "Hungary": "HU",
+    "Iceland": "IS",
+    "India": "IN",
+    "Indonesia": "ID",
+    "Iran": "IR",
+    "Iraq": "IQ",
+    "Ireland": "IE",
+    "Isle of Man": "IM",
+    "Israel": "IL",
+    "Italy": "IT",
+    "Jamaica": "JM",
+    "Japan": "JP",
+    "Jersey": "JE",
+    "Jordan": "JO",
+    "Kazakhstan": "KZ",
+    "Kenya": "KE",
+    "Kiribati": "KI",
+    "Kosovo": "XK",
+    "Kuwait": "KW",
+    "Kyrgyzstan": "KG",
+    "Laos": "LA",
+    "Latin America": "419",
+    "Latvia": "LV",
+    "Lebanon": "LB",
+    "Lesotho": "LS",
+    "Liberia": "LR",
+    "Libya": "LY",
+    "Liechtenstein": "LI",
+    "Lithuania": "LT",
+    "Luxembourg": "LU",
+    "Macao SAR China": "MO",
+    "Madagascar": "MG",
+    "Malawi": "MW",
+    "Malaysia": "MY",
+    "Maldives": "MV",
+    "Mali": "ML",
+    "Malta": "MT",
+    "Marshall Islands": "MH",
+    "Martinique": "MQ",
+    "Mauritania": "MR",
+    "Mauritius": "MU",
+    "Mayotte": "YT",
+    "Melanesia": "054",
+    "Mexico": "MX",
+    "Micronesia": "FM",
+    "Micronesian Region": "057",
+    "Middle Africa": "017",
+    "Moldova": "MD",
+    "Monaco": "MC",
+    "Mongolia": "MN",
+    "Montenegro": "ME",
+    "Montserrat": "MS",
+    "Morocco": "MA",
+    "Mozambique": "MZ",
+    "Myanmar (Burma)": "MM",
+    "Namibia": "NA",
+    "Nauru": "NR",
+    "Nepal": "NP",
+    "Netherlands": "NL",
+    "New Caledonia": "NC",
+    "New Zealand": "NZ",
+    "Nicaragua": "NI",
+    "Niger": "NE",
+    "Nigeria": "NG",
+    "Niue": "NU",
+    "Norfolk Island": "NF",
+    "North America": "003",
+    "North Korea": "KP",
+    "North Macedonia": "MK",
+    "Northern Africa": "015",
+    "Northern America": "021",
+    "Northern Europe": "154",
+    "Northern Mariana Islands": "MP",
+    "Norway": "NO",
+    "Oceania": "009",
+    "Oman": "OM",
+    "Outlying Oceania": "QO",
+    "Pakistan": "PK",
+    "Palau": "PW",
+    "Palestinian Territories": "PS",
+    "Panama": "PA",
+    "Papua New Guinea": "PG",
+    "Paraguay": "PY",
+    "Peru": "PE",
+    "Philippines": "PH",
+    "Pitcairn Islands": "PN",
+    "Poland": "PL",
+    "Polynesia": "061",
+    "Portugal": "PT",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
+    "Puerto Rico": "PR",
+    "Qatar": "QA",
+    "Réunion": "RE",
+    "Romania": "RO",
+    "Russia": "RU",
+    "Rwanda": "RW",
+    "Samoa": "WS",
+    "San Marino": "SM",
+    "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
+    "Saudi Arabia": "SA",
+    "Senegal": "SN",
+    "Serbia": "RS",
+    "Seychelles": "SC",
+    "Sierra Leone": "SL",
+    "Singapore": "SG",
+    "Sint Maarten": "SX",
+    "Slovakia": "SK",
+    "Slovenia": "SI",
+    "Solomon Islands": "SB",
+    "Somalia": "SO",
+    "South Africa": "ZA",
+    "South America": "005",
+    "South Georgia & South Sandwich Islands": "GS",
+    "South Korea": "KR",
+    "South Sudan": "SS",
+    "Southeast Asia": "035",
+    "Southern Africa": "018",
+    "Southern Asia": "034",
+    "Southern Europe": "039",
+    "Spain": "ES",
+    "Sri Lanka": "LK",
+    "St. Barthélemy": "BL",
+    "St. Helena": "SH",
+    "St. Kitts & Nevis": "KN",
+    "St. Lucia": "LC",
+    "St. Martin": "MF",
+    "St. Pierre & Miquelon": "PM",
+    "St. Vincent & Grenadines": "VC",
+    "Sub-Saharan Africa": "202",
+    "Sudan": "SD",
+    "Suriname": "SR",
+    "Svalbard & Jan Mayen": "SJ",
+    "Sweden": "SE",
+    "Switzerland": "CH",
+    "Syria": "SY",
+    "Taiwan": "TW",
+    "Tajikistan": "TJ",
+    "Tanzania": "TZ",
+    "Thailand": "TH",
+    "Timor-Leste": "TL",
+    "Togo": "TG",
+    "Tokelau": "TK",
+    "Tonga": "TO",
+    "Trinidad & Tobago": "TT",
+    "Tristan da Cunha": "TA",
+    "Tunisia": "TN",
+    "Türkiye": "TR",
+    "Turkmenistan": "TM",
+    "Turks & Caicos Islands": "TC",
+    "Tuvalu": "TV",
+    "U.S. Outlying Islands": "UM",
+    "U.S. Virgin Islands": "VI",
+    "Uganda": "UG",
+    "Ukraine": "UA",
+    "United Arab Emirates": "AE",
+    "United Kingdom": "GB",
+    "United Nations": "UN",
+    "United States": "US",
+    "Unknown Region": "ZZ",
+    "Uruguay": "UY",
+    "Uzbekistan": "UZ",
+    "Vanuatu": "VU",
+    "Vatican City": "VA",
+    "Venezuela": "VE",
+    "Vietnam": "VN",
+    "Wallis & Futuna": "WF",
+    "Western Africa": "011",
+    "Western Asia": "145",
+    "Western Europe": "155",
+    "Western Sahara": "EH",
+    "world": "001",
+    "Yemen": "YE",
+    "Zambia": "ZM",
+    "Zimbabwe": "ZW",
+    "ᑲᓇᑕ": "CA"
+}
\ No newline at end of file
diff --git a/js/data/locale/csw/ctryreverse.json b/js/data/locale/csw/ctryreverse.json
new file mode 100644
index 0000000000..0adb3ac9ba
--- /dev/null
+++ b/js/data/locale/csw/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "world",
+    "002": "Africa",
+    "003": "North America",
+    "005": "South America",
+    "009": "Oceania",
+    "011": "Western Africa",
+    "013": "Central America",
+    "014": "Eastern Africa",
+    "015": "Northern Africa",
+    "017": "Middle Africa",
+    "018": "Southern Africa",
+    "019": "Americas",
+    "021": "Northern America",
+    "029": "Caribbean",
+    "030": "Eastern Asia",
+    "034": "Southern Asia",
+    "035": "Southeast Asia",
+    "039": "Southern Europe",
+    "053": "Australasia",
+    "054": "Melanesia",
+    "057": "Micronesian Region",
+    "061": "Polynesia",
+    "142": "Asia",
+    "143": "Central Asia",
+    "145": "Western Asia",
+    "150": "Europe",
+    "151": "Eastern Europe",
+    "154": "Northern Europe",
+    "155": "Western Europe",
+    "202": "Sub-Saharan Africa",
+    "419": "Latin America",
+    "AC": "Ascension Island",
+    "AD": "Andorra",
+    "AE": "United Arab Emirates",
+    "AF": "Afghanistan",
+    "AG": "Antigua & Barbuda",
+    "AI": "Anguilla",
+    "AL": "Albania",
+    "AM": "Armenia",
+    "AO": "Angola",
+    "AQ": "Antarctica",
+    "AR": "Argentina",
+    "AS": "American Samoa",
+    "AT": "Austria",
+    "AU": "Australia",
+    "AW": "Aruba",
+    "AX": "Åland Islands",
+    "AZ": "Azerbaijan",
+    "BA": "Bosnia & Herzegovina",
+    "BB": "Barbados",
+    "BD": "Bangladesh",
+    "BE": "Belgium",
+    "BF": "Burkina Faso",
+    "BG": "Bulgaria",
+    "BH": "Bahrain",
+    "BI": "Burundi",
+    "BJ": "Benin",
+    "BL": "St. Barthélemy",
+    "BM": "Bermuda",
+    "BN": "Brunei",
+    "BO": "Bolivia",
+    "BQ": "Caribbean Netherlands",
+    "BR": "Brazil",
+    "BS": "Bahamas",
+    "BT": "Bhutan",
+    "BV": "Bouvet Island",
+    "BW": "Botswana",
+    "BY": "Belarus",
+    "BZ": "Belize",
+    "CA": "ᑲᓇᑕ",
+    "CC": "Cocos (Keeling) Islands",
+    "CD": "Congo - Kinshasa",
+    "CF": "Central African Republic",
+    "CG": "Congo - Brazzaville",
+    "CH": "Switzerland",
+    "CI": "Côte d’Ivoire",
+    "CK": "Cook Islands",
+    "CL": "Chile",
+    "CM": "Cameroon",
+    "CN": "China",
+    "CO": "Colombia",
+    "CP": "Clipperton Island",
+    "CQ": "Sark",
+    "CR": "Costa Rica",
+    "CU": "Cuba",
+    "CV": "Cape Verde",
+    "CW": "Curaçao",
+    "CX": "Christmas Island",
+    "CY": "Cyprus",
+    "CZ": "Czechia",
+    "DE": "Germany",
+    "DG": "Diego Garcia",
+    "DJ": "Djibouti",
+    "DK": "Denmark",
+    "DM": "Dominica",
+    "DO": "Dominican Republic",
+    "DZ": "Algeria",
+    "EA": "Ceuta & Melilla",
+    "EC": "Ecuador",
+    "EE": "Estonia",
+    "EG": "Egypt",
+    "EH": "Western Sahara",
+    "ER": "Eritrea",
+    "ES": "Spain",
+    "ET": "Ethiopia",
+    "EU": "European Union",
+    "EZ": "Eurozone",
+    "FI": "Finland",
+    "FJ": "Fiji",
+    "FK": "Falkland Islands",
+    "FM": "Micronesia",
+    "FO": "Faroe Islands",
+    "FR": "France",
+    "GA": "Gabon",
+    "GB": "United Kingdom",
+    "GD": "Grenada",
+    "GE": "Georgia",
+    "GF": "French Guiana",
+    "GG": "Guernsey",
+    "GH": "Ghana",
+    "GI": "Gibraltar",
+    "GL": "Greenland",
+    "GM": "Gambia",
+    "GN": "Guinea",
+    "GP": "Guadeloupe",
+    "GQ": "Equatorial Guinea",
+    "GR": "Greece",
+    "GS": "South Georgia & South Sandwich Islands",
+    "GT": "Guatemala",
+    "GU": "Guam",
+    "GW": "Guinea-Bissau",
+    "GY": "Guyana",
+    "HK": "Hong Kong SAR China",
+    "HM": "Heard & McDonald Islands",
+    "HN": "Honduras",
+    "HR": "Croatia",
+    "HT": "Haiti",
+    "HU": "Hungary",
+    "IC": "Canary Islands",
+    "ID": "Indonesia",
+    "IE": "Ireland",
+    "IL": "Israel",
+    "IM": "Isle of Man",
+    "IN": "India",
+    "IO": "British Indian Ocean Territory",
+    "IQ": "Iraq",
+    "IR": "Iran",
+    "IS": "Iceland",
+    "IT": "Italy",
+    "JE": "Jersey",
+    "JM": "Jamaica",
+    "JO": "Jordan",
+    "JP": "Japan",
+    "KE": "Kenya",
+    "KG": "Kyrgyzstan",
+    "KH": "Cambodia",
+    "KI": "Kiribati",
+    "KM": "Comoros",
+    "KN": "St. Kitts & Nevis",
+    "KP": "North Korea",
+    "KR": "South Korea",
+    "KW": "Kuwait",
+    "KY": "Cayman Islands",
+    "KZ": "Kazakhstan",
+    "LA": "Laos",
+    "LB": "Lebanon",
+    "LC": "St. Lucia",
+    "LI": "Liechtenstein",
+    "LK": "Sri Lanka",
+    "LR": "Liberia",
+    "LS": "Lesotho",
+    "LT": "Lithuania",
+    "LU": "Luxembourg",
+    "LV": "Latvia",
+    "LY": "Libya",
+    "MA": "Morocco",
+    "MC": "Monaco",
+    "MD": "Moldova",
+    "ME": "Montenegro",
+    "MF": "St. Martin",
+    "MG": "Madagascar",
+    "MH": "Marshall Islands",
+    "MK": "North Macedonia",
+    "ML": "Mali",
+    "MM": "Myanmar (Burma)",
+    "MN": "Mongolia",
+    "MO": "Macao SAR China",
+    "MP": "Northern Mariana Islands",
+    "MQ": "Martinique",
+    "MR": "Mauritania",
+    "MS": "Montserrat",
+    "MT": "Malta",
+    "MU": "Mauritius",
+    "MV": "Maldives",
+    "MW": "Malawi",
+    "MX": "Mexico",
+    "MY": "Malaysia",
+    "MZ": "Mozambique",
+    "NA": "Namibia",
+    "NC": "New Caledonia",
+    "NE": "Niger",
+    "NF": "Norfolk Island",
+    "NG": "Nigeria",
+    "NI": "Nicaragua",
+    "NL": "Netherlands",
+    "NO": "Norway",
+    "NP": "Nepal",
+    "NR": "Nauru",
+    "NU": "Niue",
+    "NZ": "New Zealand",
+    "OM": "Oman",
+    "PA": "Panama",
+    "PE": "Peru",
+    "PF": "French Polynesia",
+    "PG": "Papua New Guinea",
+    "PH": "Philippines",
+    "PK": "Pakistan",
+    "PL": "Poland",
+    "PM": "St. Pierre & Miquelon",
+    "PN": "Pitcairn Islands",
+    "PR": "Puerto Rico",
+    "PS": "Palestinian Territories",
+    "PT": "Portugal",
+    "PW": "Palau",
+    "PY": "Paraguay",
+    "QA": "Qatar",
+    "QO": "Outlying Oceania",
+    "RE": "Réunion",
+    "RO": "Romania",
+    "RS": "Serbia",
+    "RU": "Russia",
+    "RW": "Rwanda",
+    "SA": "Saudi Arabia",
+    "SB": "Solomon Islands",
+    "SC": "Seychelles",
+    "SD": "Sudan",
+    "SE": "Sweden",
+    "SG": "Singapore",
+    "SH": "St. Helena",
+    "SI": "Slovenia",
+    "SJ": "Svalbard & Jan Mayen",
+    "SK": "Slovakia",
+    "SL": "Sierra Leone",
+    "SM": "San Marino",
+    "SN": "Senegal",
+    "SO": "Somalia",
+    "SR": "Suriname",
+    "SS": "South Sudan",
+    "ST": "São Tomé & Príncipe",
+    "SV": "El Salvador",
+    "SX": "Sint Maarten",
+    "SY": "Syria",
+    "SZ": "Eswatini",
+    "TA": "Tristan da Cunha",
+    "TC": "Turks & Caicos Islands",
+    "TD": "Chad",
+    "TF": "French Southern Territories",
+    "TG": "Togo",
+    "TH": "Thailand",
+    "TJ": "Tajikistan",
+    "TK": "Tokelau",
+    "TL": "Timor-Leste",
+    "TM": "Turkmenistan",
+    "TN": "Tunisia",
+    "TO": "Tonga",
+    "TR": "Türkiye",
+    "TT": "Trinidad & Tobago",
+    "TV": "Tuvalu",
+    "TW": "Taiwan",
+    "TZ": "Tanzania",
+    "UA": "Ukraine",
+    "UG": "Uganda",
+    "UM": "U.S. Outlying Islands",
+    "UN": "United Nations",
+    "US": "United States",
+    "UY": "Uruguay",
+    "UZ": "Uzbekistan",
+    "VA": "Vatican City",
+    "VC": "St. Vincent & Grenadines",
+    "VE": "Venezuela",
+    "VG": "British Virgin Islands",
+    "VI": "U.S. Virgin Islands",
+    "VN": "Vietnam",
+    "VU": "Vanuatu",
+    "WF": "Wallis & Futuna",
+    "WS": "Samoa",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
+    "XK": "Kosovo",
+    "YE": "Yemen",
+    "YT": "Mayotte",
+    "ZA": "South Africa",
+    "ZM": "Zambia",
+    "ZW": "Zimbabwe",
+    "ZZ": "Unknown Region"
+}
\ No newline at end of file
diff --git a/js/data/locale/csw/dateformats.json b/js/data/locale/csw/dateformats.json
new file mode 100644
index 0000000000..97a8977cbb
--- /dev/null
+++ b/js/data/locale/csw/dateformats.json
@@ -0,0 +1,133 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/csw/sysres.json b/js/data/locale/csw/sysres.json
new file mode 100644
index 0000000000..44dace67ae
--- /dev/null
+++ b/js/data/locale/csw/sysres.json
@@ -0,0 +1,151 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "EE0": "ᐊᔭᒥᐦᐁᐃ ᑭᓯᑲᐤ",
+    "EE1": "ᐯᔭᐠᑭᓯᑲᐤ",
+    "EE2": "ᓂᓱᑭᓯᑲᐤ",
+    "EE3": "ᐊᐱᐦᑕᐘᐣ",
+    "EE4": "ᓀᐓᑭᓯᑲᐤ",
+    "EE5": "ᓂᔭᓇᓄᑭᓯᑲᐤ",
+    "EE6": "ᒪᑎᓄᐏᑭᓯᑲᐤ",
+    "EEE0": "ᐊᔭᒥᐦᐁᐃ ᑭᓯᑲᐤ",
+    "EEE1": "ᐯᔭᐠᑭᓯᑲᐤ",
+    "EEE2": "ᓂᓱᑭᓯᑲᐤ",
+    "EEE3": "ᐊᐱᐦᑕᐘᐣ",
+    "EEE4": "ᓀᐓᑭᓯᑲᐤ",
+    "EEE5": "ᓂᔭᓇᓄᑭᓯᑲᐤ",
+    "EEE6": "ᒪᑎᓄᐏᑭᓯᑲᐤ",
+    "EEEE0": "ᐊᔭᒥᐦᐁᐃ ᑭᓯᑲᐤ",
+    "EEEE1": "ᐯᔭᐠᑭᓯᑲᐤ",
+    "EEEE2": "ᓂᓱᑭᓯᑲᐤ",
+    "EEEE3": "ᐊᐱᐦᑕᐘᐣ",
+    "EEEE4": "ᓀᐓᑭᓯᑲᐤ",
+    "EEEE5": "ᓂᔭᓇᓄᑭᓯᑲᐤ",
+    "EEEE6": "ᒪᑎᓄᐏᑭᓯᑲᐤ",
+    "MMM1": "ᑭᓴᐱᓯᒼ",
+    "MMM10": "ᐱᒪᐦᐊᒧᐏᐱᓯᒼ",
+    "MMM11": "ᐊᑿᑎᓄᐏᐱᓯᒼ",
+    "MMM12": "ᐸᐘᐢᒐᑲᓂᓹᐱᓯᒼ",
+    "MMM2": "ᒥᑭᓯᐏᐱᓯᒼ",
+    "MMM3": "ᓂᐢᑭᐱᓯᒼ",
+    "MMM4": "ᐊᓂᑭᐱᓯᒼ",
+    "MMM5": "ᓴᑭᐸᑲᐏᐱᓯᒼ",
+    "MMM6": "ᐸᐢᑲᐍᐦᐅᐱᓯᒼ",
+    "MMM7": "ᐸᐢᑯᐏᐱᓯᒼ",
+    "MMM8": "ᐅᐸᐦᐅᐏᐱᓯᒼ",
+    "MMM9": "ᑕᐦᑿᑭᐱᓯᒼ",
+    "MMMM1": "ᑭᓴᐱᓯᒼ",
+    "MMMM10": "ᐱᒪᐦᐊᒧᐏᐱᓯᒼ",
+    "MMMM11": "ᐊᑿᑎᓄᐏᐱᓯᒼ",
+    "MMMM12": "ᐸᐘᐢᒐᑲᓂᓹᐱᓯᒼ",
+    "MMMM2": "ᒥᑭᓯᐏᐱᓯᒼ",
+    "MMMM3": "ᓂᐢᑭᐱᓯᒼ",
+    "MMMM4": "ᐊᓂᑭᐱᓯᒼ",
+    "MMMM5": "ᓴᑭᐸᑲᐏᐱᓯᒼ",
+    "MMMM6": "ᐸᐢᑲᐍᐦᐅᐱᓯᒼ",
+    "MMMM7": "ᐸᐢᑯᐏᐱᓯᒼ",
+    "MMMM8": "ᐅᐸᐦᐅᐏᐱᓯᒼ",
+    "MMMM9": "ᑕᐦᑿᑭᐱᓯᒼ",
+    "N1": "ᑭ",
+    "N10": "ᐱ",
+    "N11": "ᐊ",
+    "N12": "ᐸ",
+    "N2": "ᒥ",
+    "N3": "ᓂ",
+    "N4": "ᐊ",
+    "N5": "ᓴ",
+    "N6": "ᐸ",
+    "N7": "ᐸ",
+    "N8": "ᐅ",
+    "N9": "ᑕ",
+    "NN1": "ᑭᓴ",
+    "NN10": "ᐱᒪ",
+    "NN11": "ᐊᑿ",
+    "NN12": "ᐸᐘ",
+    "NN2": "ᒥᑭ",
+    "NN3": "ᓂᐢ",
+    "NN4": "ᐊᓂ",
+    "NN5": "ᓴᑭ",
+    "NN6": "ᐸᐢ",
+    "NN7": "ᐸᐢ",
+    "NN8": "ᐅᐸ",
+    "NN9": "ᑕᐦ",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": ", ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/csw/unitfmt.json b/js/data/locale/csw/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/csw/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/ctype.json b/js/data/locale/ctype.json
index d9cfba51a1..0198b8f247 100644
--- a/js/data/locale/ctype.json
+++ b/js/data/locale/ctype.json
@@ -311,6 +311,12 @@
             205743
         ]
     ],
+    "cjk unified ideographs extension i": [
+        [
+            191472,
+            192095
+        ]
+    ],
     "cjkcompatibility": [
         [
             13056,
diff --git a/js/data/locale/ctype_c.json b/js/data/locale/ctype_c.json
index 2161027896..debc3695a6 100644
--- a/js/data/locale/ctype_c.json
+++ b/js/data/locale/ctype_c.json
@@ -1050,10 +1050,6 @@
             12246,
             12271
         ],
-        [
-            12284,
-            12287
-        ],
         [
             12352
         ],
@@ -1073,7 +1069,7 @@
         ],
         [
             12772,
-            12783
+            12782
         ],
         [
             12831
@@ -2637,6 +2633,10 @@
         ],
         [
             191457,
+            191471
+        ],
+        [
+            192094,
             194559
         ],
         [
diff --git a/js/data/locale/ctype_l.json b/js/data/locale/ctype_l.json
index 70571b89c4..6bf8421934 100644
--- a/js/data/locale/ctype_l.json
+++ b/js/data/locale/ctype_l.json
@@ -4254,6 +4254,10 @@
             183984,
             191456
         ],
+        [
+            191472,
+            192093
+        ],
         [
             194560,
             195101
diff --git a/js/data/locale/ctype_s.json b/js/data/locale/ctype_s.json
index 4957a7b73a..b648a1c3a7 100644
--- a/js/data/locale/ctype_s.json
+++ b/js/data/locale/ctype_s.json
@@ -722,7 +722,7 @@
         ],
         [
             12272,
-            12283
+            12287
         ],
         [
             12292
@@ -754,6 +754,9 @@
             12736,
             12771
         ],
+        [
+            12783
+        ],
         [
             12800,
             12830
diff --git a/js/data/locale/cu/unitfmt.json b/js/data/locale/cu/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/cu/unitfmt.json
+++ b/js/data/locale/cu/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/currency.json b/js/data/locale/currency.json
index 7fc39d80cc..bb43e07114 100644
--- a/js/data/locale/currency.json
+++ b/js/data/locale/currency.json
@@ -199,11 +199,6 @@
         "decimals": 2,
         "sign": "₡"
     },
-    "CUC": {
-        "name": "Cuban Convertible Peso",
-        "decimals": 2,
-        "sign": "$"
-    },
     "CUP": {
         "name": "Cuban Peso",
         "decimals": 2,
@@ -372,7 +367,7 @@
     "KGS": {
         "name": "Kyrgystani Som",
         "decimals": 2,
-        "sign": "лв"
+        "sign": "⃀"
     },
     "KHR": {
         "name": "Cambodian Riel",
diff --git a/js/data/locale/cv/ctrynames.json b/js/data/locale/cv/ctrynames.json
index 85680de8bf..2965e02753 100644
--- a/js/data/locale/cv/ctrynames.json
+++ b/js/data/locale/cv/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "Австралази": "053",
     "Австрали": "AU",
@@ -41,7 +42,6 @@
     "Ботсвана": "BW",
     "Бразили": "BR",
     "Британин Виргини утравӗсем": "VG",
-    "Британин территори Инди океанӗре": "IO",
     "Бруней-Даруссалам": "BN",
     "Буве утравӗ": "BV",
     "Буркина-Фасо": "BF",
diff --git a/js/data/locale/cv/ctryreverse.json b/js/data/locale/cv/ctryreverse.json
index 57b5e35804..4959811597 100644
--- a/js/data/locale/cv/ctryreverse.json
+++ b/js/data/locale/cv/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Израиль",
     "IM": "Мэн утравӗ",
     "IN": "Инди",
-    "IO": "Британин территори Инди океанӗре",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Ирак",
     "IR": "Иран",
     "IS": "Исланди",
diff --git a/js/data/locale/cv/unitfmt.json b/js/data/locale/cv/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/cv/unitfmt.json
+++ b/js/data/locale/cv/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/cy/ctrynames.json b/js/data/locale/cy/ctrynames.json
index d547b69334..fb6a359c64 100644
--- a/js/data/locale/cy/ctrynames.json
+++ b/js/data/locale/cy/ctrynames.json
@@ -250,7 +250,7 @@
     "Y Bahamas": "BS",
     "Y Byd": "001",
     "Y Caribî": "029",
-    "y Cenhedloedd Unedig": "UN",
+    "Y Cenhedloedd Unedig": "UN",
     "Y Congo - Brazzaville": "CG",
     "Y Congo - Kinshasa": "CD",
     "Y Deyrnas Unedig": "GB",
diff --git a/js/data/locale/cy/ctryreverse.json b/js/data/locale/cy/ctryreverse.json
index f00908eeb8..ab2b1fd552 100644
--- a/js/data/locale/cy/ctryreverse.json
+++ b/js/data/locale/cy/ctryreverse.json
@@ -272,7 +272,7 @@
     "UA": "Wcráin",
     "UG": "Uganda",
     "UM": "Ynysoedd Pellennig UDA",
-    "UN": "y Cenhedloedd Unedig",
+    "UN": "Y Cenhedloedd Unedig",
     "US": "Yr Unol Daleithiau",
     "UY": "Uruguay",
     "UZ": "Uzbekistan",
diff --git a/js/data/locale/cy/unitfmt.json b/js/data/locale/cy/unitfmt.json
index de8890c019..c4a378eacf 100644
--- a/js/data/locale/cy/unitfmt.json
+++ b/js/data/locale/cy/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "zero#{n} atm|two#{n} atm|few#{n} atm|many#{n} atm|#{n} atmosffer",
             "bar": "#{n} bar",
             "barrel": "zero#{n} bbl|two#{n} bbl|few#{n} bbl|many#{n} bbl|#{n} barel",
+            "beaufort": "zero#B {n}|two#B {n}|few#B {n}|many#B {n}|#Beaufort {n}",
             "bit": "#{n} did",
             "bit-per-second": "#{n} did yr eiliad",
             "british-thermal-unit": "zero#{n} Btu|two#{n} Btu|few#{n} Btu|many#{n} Btu|#{n} uned thermol Prydain",
@@ -42,8 +43,8 @@
             "degree": "one#{n} radd|two#{n} radd|#{n} gradd",
             "dessert-spoon": "zero#{n} dstspn|two#{n} dstspn|few#{n} dstspn|many#{n} dstspn|#{n} llond llwy bwdin",
             "dessert-spoon-imperial": "zero#{n} dstspn Imp|two#{n} dstspn Imp|few#{n} dstspn Imp|many#{n} dstspn Imp|#{n} llond llwy bwdin imp.",
-            "dot": "two#{n} ddot|#{n} px",
-            "dot-per-centimeter": "zero#{n} ppcm|one#{n} dot mewn centimedr|two#{n} ppcm|few#{n} ppcm|many#{n} ppcm|#{n} mewn centimedr",
+            "dot": "zero#{n} px|two#{n} px|few#{n} px|many#{n} px|#{n} dot",
+            "dot-per-centimeter": "zero#{n} ppcm|two#{n} ppcm|few#{n} ppcm|many#{n} ppcm|#{n} dot mewn centimedr",
             "dot-per-inch": "zero#{n} ppi|two#{n} ppi|few#{n} ppi|many#{n} ppi|#{n} dot mewn modfedd",
             "dram": "two#{n} ddracmon hy|#{n} dracmon hy",
             "drop": "two#{n} ddiferyn|#{n} diferyn",
@@ -56,7 +57,7 @@
             "fathom": "two#{n} wryd|#{n} gwryd",
             "fluid-ounce": "#{n} owns hylifol",
             "fluid-ounce-imperial": "zero#{n} fl oz Imp.|two#{n} fl oz Imp.|few#{n} fl oz Imp.|many#{n} fl oz Imp.|#{n} owns hylifol Imp.",
-            "foodcalorie": "zero#{n} Cal|two#{n} kcal|few#{n} kcal|many#{n} kcal|#{n} Calori",
+            "foodcalorie": "zero#{n} kcal|two#{n} kcal|few#{n} kcal|many#{n} kcal|#{n} Calori",
             "foot": "one#{n} droedfedd|two#{n} droedfedd|many#{n} throedfedd|#{n} troedfedd",
             "foot-per-second": "#{n} troedfedd yr eiliad",
             "furlong": "#{n} ystaden",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} did",
             "bit-per-second": "#{n} did/eil",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +250,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "two#{n} ddot|#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "zero#{n} px|two#{n} px|few#{n} px|many#{n} px|#{n} dot",
+            "dot-per-centimeter": "one#{n} dpcm|#{n} ppcm",
+            "dot-per-inch": "",
             "dram": "two#{n} ddracmon hy|#{n} dracmon hy",
             "drop": "two#{n} ddiferyn|#{n} diferyn",
             "dunam": "two#{n} ddunam|#{n} dunam",
@@ -262,7 +264,7 @@
             "fathom": "two#{n} wryd|#{n} gwryd",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "zero#{n} Cal|one#{n} Cal|#{n} kcal",
+            "foodcalorie": "zero#{n} kcal|two#{n} kcal|few#{n} kcal|many#{n} kcal|#{n} Cal",
             "foot": "#{n}′",
             "foot-per-second": "#{n}′/eil",
             "furlong": "#{n} yst",
diff --git a/js/data/locale/da/dateformats.json b/js/data/locale/da/dateformats.json
index 021b499798..57c6458874 100644
--- a/js/data/locale/da/dateformats.json
+++ b/js/data/locale/da/dateformats.json
@@ -93,33 +93,33 @@
         "order": {
             "f": "{date} 'kl'. {time}",
             "l": "{date} 'kl'. {time}",
-            "m": "{date} {time}",
-            "s": "{date} {time}"
+            "m": "{date}, {time}",
+            "s": "{date}, {time}"
         },
         "range": {
             "c00": {
                 "f": "{sd}. {sm} {sy} kl. {st} – {et}",
                 "l": "{sd}. {sm} {sy} kl. {st} – {et}",
-                "m": "{sd}. {sm} {sy} {st} – {et}",
-                "s": "{sd}.{sm}.{sy} {st} – {et}"
+                "m": "{sd}. {sm} {sy}, {st} – {et}",
+                "s": "{sd}.{sm}.{sy}, {st} – {et}"
             },
             "c01": {
                 "f": "{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}",
                 "l": "{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}",
-                "m": "{sd}. {sm} {sy} {st} – {ed}. {em} {ey} {et}",
-                "s": "{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}"
+                "m": "{sd}. {sm} {sy}, {st} – {ed}. {em} {ey}, {et}",
+                "s": "{sd}.{sm}.{sy}, {st} – {ed}.{em}.{ey}, {et}"
             },
             "c02": {
                 "f": "{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}",
                 "l": "{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}",
-                "m": "{sd}. {sm} {sy} {st} – {ed}. {em} {ey} {et}",
-                "s": "{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}"
+                "m": "{sd}. {sm} {sy}, {st} – {ed}. {em} {ey}, {et}",
+                "s": "{sd}.{sm}.{sy}, {st} – {ed}.{em}.{ey}, {et}"
             },
             "c03": {
                 "f": "{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}",
                 "l": "{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}",
-                "m": "{sd}. {sm} {sy} {st} – {ed}. {em} {ey} {et}",
-                "s": "{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}"
+                "m": "{sd}. {sm} {sy}, {st} – {ed}. {em} {ey}, {et}",
+                "s": "{sd}.{sm}.{sy}, {st} – {ed}.{em}.{ey}, {et}"
             },
             "c10": {
                 "f": "{sd} – {ed}. {em} {ey}",
diff --git a/js/data/locale/da/sysres.json b/js/data/locale/da/sysres.json
index 2c65ded26c..188aa95b87 100644
--- a/js/data/locale/da/sysres.json
+++ b/js/data/locale/da/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#om {num} sek.|#om {num} sek.",
     "#in {num}w": "one#om {num} uge|#om {num} uger",
     "#in {num}y": "one#om {num} år|#om {num} år",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d|#{num} d",
     "#{num}d ago": "one#{num} dag siden|#{num} dage siden",
     "#{num}h": "one#{num} t|#{num} t",
@@ -176,10 +176,10 @@
     "cccc6": "lørdag",
     "durationLongDays": "one#{num} dag|#{num} dage",
     "durationMediumHours": "one#{num} t|#{num} t",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} u|#{num} u",
     "durationMediumYears": "one#{num} år|#{num} år",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} m|#{num} m",
     "durationShortMonths": "one#{num} m|#{num} m",
     "finalSeparatorFull": " og ",
diff --git a/js/data/locale/da/unitfmt.json b/js/data/locale/da/unitfmt.json
index 5c02e614f3..1fca9b1029 100644
--- a/js/data/locale/da/unitfmt.json
+++ b/js/data/locale/da/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfære",
             "bar": "#{n} bar",
             "barrel": "one#{n} tønde|#{n} tønder",
+            "beaufort": "#beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit pr. sekund",
             "british-thermal-unit": "#{n} Btu",
@@ -97,7 +98,7 @@
             "kilohertz": "#{n} kilohertz",
             "kilojoule": "#{n} kilojoule",
             "kilometer": "#{n} kilometer",
-            "kilometer-per-hour": "one#kilometer i timen|#{n} kilometer i timen",
+            "kilometer-per-hour": "#{n} kilometer i timen",
             "kilometer-per-liter": "#{n} kilometer/l",
             "kilometer-per-second": "#{n} kilometer pr. sekund",
             "kilopascal": "#{n} kilopascal",
@@ -127,11 +128,11 @@
             "microgram": "#{n} mikrogram",
             "micrometer": "#{n} mikrometer",
             "microsecond": "one#{n} mikrosekund|#{n} mikrosekunder",
-            "mile": "one#{n} engelsk mil|#{n} engelske mil",
+            "mile": "one#{n} engelsk mil|#{n} miles",
             "mile-per-gallon": "one#mil pr. gallon|#{n} mil pr. gallon",
             "mile-per-gallon-imperial": "#{n} mil pr. engelsk gallon",
             "mile-per-hour": "one#{n} engelsk mil i timen|#{n} engelske mil i timen",
-            "mile-per-second": "#{n} engelske mil pr. sekund",
+            "mile-per-second": "#{n} miles pr. sekund",
             "mile-scandinavian": "one#{n} svensk mil|#{n} svenske mil",
             "milliampere": "#{n} milliampere",
             "millibar": "#{n} millibar",
@@ -217,12 +218,13 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "one#{n} td.|#{n} tdr.",
+            "beaufort": "#bft {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/sek.",
             "british-thermal-unit": "#{n} Btu",
             "bushel": "#{n} skp.",
             "byte": "#{n} B",
-            "byte-per-hour": "#{n} B /t",
+            "byte-per-hour": "#{n} B/t.",
             "byte-per-second": "#{n} B/sek.",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
@@ -250,8 +252,7 @@
             "dessert-spoon": "#{n} dsk.",
             "dessert-spoon-imperial": "#{n} brit. dsk.",
             "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} br. fl. dr.",
             "drop": "one#{n} dråbe|#{n} dråber",
             "dunam": "#{n} dunam",
@@ -274,7 +275,7 @@
             "gigabit": "#{n} Gbit",
             "gigabit-per-second": "#{n} Gbit/sek.",
             "gigabyte": "#{n} GB",
-            "gigabyte-per-hour": "#{n} GB /t",
+            "gigabyte-per-hour": "#{n} GB/t.",
             "gigabyte-per-second": "#{n} GB/sek.",
             "gigahertz": "#{n} GHz",
             "gigawatt": "#{n} GW",
@@ -296,7 +297,7 @@
             "kilobit": "#{n} kbit",
             "kilobit-per-second": "#{n} kbit/sek.",
             "kilobyte": "#{n} kB",
-            "kilobyte-per-hour": "#{n} kB /t",
+            "kilobyte-per-hour": "#{n} kB/t.",
             "kilobyte-per-second": "#{n} kB/sek.",
             "kilocalorie": "#{n} kcal",
             "kilogram": "#{n} kg",
@@ -309,7 +310,7 @@
             "kilopascal": "#{n} kPa",
             "kilowatt": "#{n} kW",
             "kilowatt-hour": "#{n} kWh",
-            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh pr. 100 km",
             "knot": "#{n} knob",
             "light-year": "#{n} ly",
             "liter": "#{n} l",
@@ -320,7 +321,7 @@
             "megabit": "#{n} Mbit",
             "megabit-per-second": "#{n} Mbit/sek.",
             "megabyte": "#{n} MB",
-            "megabyte-per-hour": "#{n} MB /t",
+            "megabyte-per-hour": "#{n} MB/t.",
             "megabyte-per-second": "#{n} MB/sek.",
             "megahertz": "#{n} MHz",
             "megaliter": "#{n} ML",
@@ -333,11 +334,11 @@
             "microgram": "#{n} μg",
             "micrometer": "#{n} μm",
             "microsecond": "#{n} μs",
-            "mile": "#{n} mil",
+            "mile": "#{n} mi",
             "mile-per-gallon": "#{n} mpg",
             "mile-per-gallon-imperial": "#{n} eng. mpg",
             "mile-per-hour": "#{n} mph",
-            "mile-per-second": "#{n} mil/sek.",
+            "mile-per-second": "#{n} mi/sek.",
             "mile-scandinavian": "#{n} smi",
             "milliampere": "#{n} mA",
             "millibar": "#{n} mbar",
@@ -356,7 +357,7 @@
             "nanosecond": "#{n} ns",
             "nautical-mile": "#{n} sm",
             "newton": "#{n} N",
-            "newton-meter": "#{n} N⋅m",
+            "newton-meter": "#{n} Nm",
             "ohm": "#{n} Ω",
             "ounce": "#{n} oz",
             "ounce-troy": "#{n} oz t",
@@ -402,7 +403,7 @@
             "terabit": "#{n} Tbit",
             "terabit-per-second": "#{n} Tbit/sek.",
             "terabyte": "#{n} TB",
-            "terabyte-per-hour": "#{n} TB /t",
+            "terabyte-per-hour": "#{n} TB/t.",
             "terabyte-per-second": "#{n} TB/sek.",
             "therm-us": "#{n} US therm",
             "ton": "#{n} tn",
diff --git a/js/data/locale/dav/ctrynames.json b/js/data/locale/dav/ctrynames.json
index f17a4fc647..2f48370426 100644
--- a/js/data/locale/dav/ctrynames.json
+++ b/js/data/locale/dav/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/dav/ctryreverse.json b/js/data/locale/dav/ctryreverse.json
index 3919b41208..894a6816e2 100644
--- a/js/data/locale/dav/ctryreverse.json
+++ b/js/data/locale/dav/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/dav/unitfmt.json b/js/data/locale/dav/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/dav/unitfmt.json
+++ b/js/data/locale/dav/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/de/CH/sysres.json b/js/data/locale/de/CH/sysres.json
index fdae83a4a3..37a194e5d1 100644
--- a/js/data/locale/de/CH/sysres.json
+++ b/js/data/locale/de/CH/sysres.json
@@ -5,5 +5,12 @@
     "EE3": "Mi",
     "EE4": "Do",
     "EE5": "Fr",
-    "EE6": "Sa"
+    "EE6": "Sa",
+    "cc0": "So",
+    "cc1": "Mo",
+    "cc2": "Di",
+    "cc3": "Mi",
+    "cc4": "Do",
+    "cc5": "Fr",
+    "cc6": "Sa"
 }
\ No newline at end of file
diff --git a/js/data/locale/de/CH/unitfmt.json b/js/data/locale/de/CH/unitfmt.json
index 63bcf34cd9..a3a4942f39 100644
--- a/js/data/locale/de/CH/unitfmt.json
+++ b/js/data/locale/de/CH/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} Atmosphäre|#{n} Atmosphären",
             "bar": "#{n} Bar",
             "barrel": "#{n} Barrel",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} Bit|#{n} Bit",
             "bit-per-second": "#{n} Bit pro Sekunde",
             "british-thermal-unit": "one#{n} British thermal unit|#{n} British thermal units",
@@ -43,9 +44,9 @@
             "degree": "#{n} Grad",
             "dessert-spoon": "#{n} Dessertlöffel",
             "dessert-spoon-imperial": "#{n} Imp. Dessertlöffel",
-            "dot": "#{n} Punkt",
-            "dot-per-centimeter": "one#{n} Punkt pro Zentimeter|#{n} Punkte pro Zentimeter",
-            "dot-per-inch": "one#{n} Punkt pro Inch|#{n} Punkte pro Inch",
+            "dot": "one#{n} Dot|#{n} Dots",
+            "dot-per-centimeter": "one#{n} Dot pro Zentimeter|#{n} Dots pro Zentimeter",
+            "dot-per-inch": "one#{n} Dot pro Inch|#{n} Dots pro Inch",
             "dram": "#{n} Dram",
             "drop": "#{n} Tropfen",
             "dunam": "one#{n} Dunam|#{n} Dunams",
@@ -57,13 +58,13 @@
             "fathom": "one#{n} Faden|#{n} Faden",
             "fluid-ounce": "one#{n} Flüssigunze|#{n} Flüssigunzen",
             "fluid-ounce-imperial": "one#{n} Imp. Flüssigunze|#{n} Imp. Flüssigunzen",
-            "foodcalorie": "#{n} Kilokalorien",
+            "foodcalorie": "one#{n} Kilokalorie|#{n} Kilokalorien",
             "foot": "#{n} Fuss",
             "foot-per-second": "#{n} Fuss pro Sekunde",
             "furlong": "#{n} Furlong",
             "g-force": "#{n} G",
             "gallon": "one#{n} Gallone|#{n} Gallonen",
-            "gallon-imperial": "#{n} gal Imp.",
+            "gallon-imperial": "one#{n} Imp. Gallone|#{n} Imp. Gallonen",
             "generic": "#{n} Grad",
             "gigabit": "one#{n} Gigabit|#{n} Gigabit",
             "gigabit-per-second": "#{n} Gigabit pro Sekunde",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} Bft",
             "bit": "one#{n} Bit|#{n} Bit",
             "bit-per-second": "#{n} Bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,9 +251,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} DL",
             "dessert-spoon-imperial": "#{n} Imp. DL",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "#{n} d",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dr.",
             "drop": "#{n} Trpf.",
             "dunam": "#{n} Dunam",
diff --git a/js/data/locale/de/sysres.json b/js/data/locale/de/sysres.json
index 0a71c26042..5707507c23 100644
--- a/js/data/locale/de/sysres.json
+++ b/js/data/locale/de/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#in {num} Sek.|#in {num} Sek.",
     "#in {num}w": "one#in {num} Woche|#in {num} Wochen",
     "#in {num}y": "one#in {num} Jahr|#in {num} Jahren",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} T|#{num} T",
     "#{num}d ago": "one#vor {num} Tag|#vor {num} Tagen",
     "#{num}h": "one#{num} Std.|#{num} Std.",
@@ -200,10 +200,10 @@
     "cccc6": "Samstag",
     "durationLongDays": "one#{num} Tg.|#{num} Tg.",
     "durationMediumHours": "one#{num} Std.|#{num} Std.",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} W|#{num} W",
     "durationMediumYears": "one#{num} J|#{num} J",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} Min.|#{num} Min.",
     "durationShortMonths": "one#{num} M|#{num} M",
     "finalSeparatorFull": " und ",
diff --git a/js/data/locale/de/unitfmt.json b/js/data/locale/de/unitfmt.json
index 608765201d..b8a73b0121 100644
--- a/js/data/locale/de/unitfmt.json
+++ b/js/data/locale/de/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} Atmosphäre|#{n} Atmosphären",
             "bar": "#{n} Bar",
             "barrel": "#{n} Barrel",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} Bit|#{n} Bit",
             "bit-per-second": "#{n} Bit pro Sekunde",
             "british-thermal-unit": "one#{n} British thermal unit|#{n} British thermal units",
@@ -43,9 +44,9 @@
             "degree": "#{n} Grad",
             "dessert-spoon": "#{n} Dessertlöffel",
             "dessert-spoon-imperial": "#{n} Imp. Dessertlöffel",
-            "dot": "#{n} Punkt",
-            "dot-per-centimeter": "one#{n} Punkt pro Zentimeter|#{n} Punkte pro Zentimeter",
-            "dot-per-inch": "one#{n} Punkt pro Inch|#{n} Punkte pro Inch",
+            "dot": "one#{n} Dot|#{n} Dots",
+            "dot-per-centimeter": "one#{n} Dot pro Zentimeter|#{n} Dots pro Zentimeter",
+            "dot-per-inch": "one#{n} Dot pro Inch|#{n} Dots pro Inch",
             "dram": "#{n} Dram",
             "drop": "#{n} Tropfen",
             "dunam": "one#{n} Dunam|#{n} Dunams",
@@ -57,7 +58,7 @@
             "fathom": "one#{n} Faden|#{n} Faden",
             "fluid-ounce": "one#{n} Flüssigunze|#{n} Flüssigunzen",
             "fluid-ounce-imperial": "one#{n} Imp. Flüssigunze|#{n} Imp. Flüssigunzen",
-            "foodcalorie": "#{n} Kilokalorien",
+            "foodcalorie": "one#{n} Kilokalorie|#{n} Kilokalorien",
             "foot": "#{n} Fuß",
             "foot-per-second": "#{n} Fuß pro Sekunde",
             "furlong": "#{n} Furlong",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "one#{n} Bit|#{n} Bit",
             "bit-per-second": "#{n} Bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,9 +251,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} DL",
             "dessert-spoon-imperial": "#{n} Imp. DL",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "#{n} d",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} Fl.-Dram",
             "drop": "#{n} Trpf.",
             "dunam": "#{n} Dunam",
diff --git a/js/data/locale/dje/ctrynames.json b/js/data/locale/dje/ctrynames.json
index 6ae54aafb5..43348aebae 100644
--- a/js/data/locale/dje/ctrynames.json
+++ b/js/data/locale/dje/ctrynames.json
@@ -37,7 +37,7 @@
     "Botswaana": "BW",
     "Bouvet Island": "BV",
     "Breezil": "BR",
-    "Britiši Indu teekoo laama": "IO",
+    "British Indian Ocean Territory": "IO",
     "Britiši Virgin gungey": "VG",
     "Bruunee": "BN",
     "Bulgaari": "BG",
diff --git a/js/data/locale/dje/ctryreverse.json b/js/data/locale/dje/ctryreverse.json
index 1590314b3d..477d278f18 100644
--- a/js/data/locale/dje/ctryreverse.json
+++ b/js/data/locale/dje/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israyel",
     "IM": "Isle of Man",
     "IN": "Indu laboo",
-    "IO": "Britiši Indu teekoo laama",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Ayseland",
diff --git a/js/data/locale/dje/unitfmt.json b/js/data/locale/dje/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/dje/unitfmt.json
+++ b/js/data/locale/dje/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/doi/unitfmt.json b/js/data/locale/doi/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/doi/unitfmt.json
+++ b/js/data/locale/doi/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/dsb/sysres.json b/js/data/locale/dsb/sysres.json
index 9c207a95ba..c38f325218 100644
--- a/js/data/locale/dsb/sysres.json
+++ b/js/data/locale/dsb/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#za {num} sek.|two#za {num} sek.|few#za {num} sek.|#za {num} sek.",
     "#in {num}w": "one#za {num} tyź.|two#za {num} tyź.|few#za {num} tyź.|#za {num} tyź.",
     "#in {num}y": "one#za {num} l.|two#za {num} l.|few#za {num} l.|#za {num} l.",
-    "#{num} ms": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} ź|two#{num} d|few#{num} d|#{num} d",
     "#{num}d ago": "one#pśed {num} dnj.|two#pśed {num} dnj.|few#pśed {num} dnj.|#pśed {num} dnj.",
     "#{num}h": "one#{num} g|two#{num} g|few#{num} g|#{num} g",
@@ -195,10 +195,10 @@
     "a1": "wótpołdnja",
     "durationLongDays": "one#{num} ź.|two#{num} dn.|few#{num} dn.|#{num} dn.",
     "durationMediumHours": "one#{num} g|two#{num} g|few#{num} g|#{num} g",
-    "durationMediumMillis": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} tyź.|two#{num} tyź.|few#{num} tyź.|#{num} tyź.",
     "durationMediumYears": "one#{num} l.|two#{num} l.|few#{num} l.|#{num} l.",
-    "durationShortMillis": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} min|two#{num} min|few#{num} min|#{num} min",
     "durationShortMonths": "one#{num} mjas.|two#{num} mjas.|few#{num} mjas.|#{num} mjas.",
     "finalSeparatorFull": " a ",
diff --git a/js/data/locale/dsb/unitfmt.json b/js/data/locale/dsb/unitfmt.json
index d329fb1736..af322eed54 100644
--- a/js/data/locale/dsb/unitfmt.json
+++ b/js/data/locale/dsb/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|two#{n} atmosferje|few#{n} atmosfery|#{n} atmosferow",
             "bar": "one#{n} bar|two#{n} bara|few#{n} bary|#{n} barow",
             "barrel": "one#{n} barel|two#{n} barela|few#{n} barele|#{n} barelow",
+            "beaufort": "one#{n} stopjeń beauforta|two#{n} stopnja beauforta|few#{n} stopnje beauforta|#{n} stopnjow beauforta",
             "bit": "one#{n} bit|two#{n} bita|few#{n} bity|#{n} bitow",
             "bit-per-second": "#{n} bitow na sekundu",
             "british-thermal-unit": "one#{n} britiska jadnotka śopłoty|two#{n} britiskej jadnotce śopłoty|few#{n} britiske jadnotki śopłoty|#{n} britiskich jadnotkow śopłoty",
@@ -213,6 +214,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} Bft",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -256,7 +258,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl. oz.",
             "fluid-ounce-imperial": "#{n} brit. fl oz",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/dua/unitfmt.json b/js/data/locale/dua/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/dua/unitfmt.json
+++ b/js/data/locale/dua/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/dv/unitfmt.json b/js/data/locale/dv/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/dv/unitfmt.json
+++ b/js/data/locale/dv/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/dyo/unitfmt.json b/js/data/locale/dyo/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/dyo/unitfmt.json
+++ b/js/data/locale/dyo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/dz/ctrynames.json b/js/data/locale/dz/ctrynames.json
index 376a8ca2dd..f4ff5a6561 100644
--- a/js/data/locale/dz/ctrynames.json
+++ b/js/data/locale/dz/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Eurozone": "EZ",
     "Kosovo": "XK",
     "North Macedonia": "MK",
@@ -125,7 +126,6 @@
     "བར་ཕྱོགས་ཨ་མི་རི་ཀ": "013",
     "བར་མུ་ཌ": "BM",
     "བྲ་ཛིལ": "BR",
-    "བྲི་ཊིཤ་རྒྱ་གར་གྱི་རྒྱ་མཚོ་ས་ཁོངས": "IO",
     "བལ་ཡུལ": "NP",
     "བྷ་རེན": "BH",
     "བྷ་ཧ་མས྄": "BS",
diff --git a/js/data/locale/dz/ctryreverse.json b/js/data/locale/dz/ctryreverse.json
index c19da9e0be..1be46c2d05 100644
--- a/js/data/locale/dz/ctryreverse.json
+++ b/js/data/locale/dz/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ཨིས་ར་ཡེལ",
     "IM": "ཨ་ཡུལ་ ཨོཕ་ མཱན",
     "IN": "རྒྱ་གར",
-    "IO": "བྲི་ཊིཤ་རྒྱ་གར་གྱི་རྒྱ་མཚོ་ས་ཁོངས",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ཨི་རཱཀ",
     "IR": "ཨི་རཱན",
     "IS": "ཨཱའིས་ལེནཌ",
diff --git a/js/data/locale/dz/unitfmt.json b/js/data/locale/dz/unitfmt.json
index 0bf9409e8f..3f1d2fbcac 100644
--- a/js/data/locale/dz/unitfmt.json
+++ b/js/data/locale/dz/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ebu/ctrynames.json b/js/data/locale/ebu/ctrynames.json
index f17a4fc647..2f48370426 100644
--- a/js/data/locale/ebu/ctrynames.json
+++ b/js/data/locale/ebu/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/ebu/ctryreverse.json b/js/data/locale/ebu/ctryreverse.json
index 3919b41208..894a6816e2 100644
--- a/js/data/locale/ebu/ctryreverse.json
+++ b/js/data/locale/ebu/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/ebu/unitfmt.json b/js/data/locale/ebu/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ebu/unitfmt.json
+++ b/js/data/locale/ebu/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ee/TG/ctrynames.json b/js/data/locale/ee/TG/ctrynames.json
index 78968bc0a7..7b1a951e41 100644
--- a/js/data/locale/ee/TG/ctrynames.json
+++ b/js/data/locale/ee/TG/ctrynames.json
@@ -46,8 +46,8 @@
     "Botswana nutome": "BW",
     "Bouvet ƒudomekpo nutome": "BV",
     "Brazil nutome": "BR",
-    "Britaintɔwo ƒe india ƒudome nutome": "IO",
     "Britaintɔwo ƒe Virgin ƒudomekpowo nutome": "VG",
+    "British Indian Ocean Territory": "IO",
     "Brunei nutome": "BN",
     "Bulgaria nutome": "BG",
     "Burkina Faso nutome": "BF",
diff --git a/js/data/locale/ee/TG/ctryreverse.json b/js/data/locale/ee/TG/ctryreverse.json
index 251eba7972..874dee2519 100644
--- a/js/data/locale/ee/TG/ctryreverse.json
+++ b/js/data/locale/ee/TG/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel nutome",
     "IM": "Aisle of Man nutome",
     "IN": "India nutome",
-    "IO": "Britaintɔwo ƒe india ƒudome nutome",
+    "IO": "British Indian Ocean Territory",
     "IQ": "iraqdukɔ",
     "IR": "Iran nutome",
     "IS": "Aiseland nutome",
diff --git a/js/data/locale/ee/ctrynames.json b/js/data/locale/ee/ctrynames.json
index 78968bc0a7..7b1a951e41 100644
--- a/js/data/locale/ee/ctrynames.json
+++ b/js/data/locale/ee/ctrynames.json
@@ -46,8 +46,8 @@
     "Botswana nutome": "BW",
     "Bouvet ƒudomekpo nutome": "BV",
     "Brazil nutome": "BR",
-    "Britaintɔwo ƒe india ƒudome nutome": "IO",
     "Britaintɔwo ƒe Virgin ƒudomekpowo nutome": "VG",
+    "British Indian Ocean Territory": "IO",
     "Brunei nutome": "BN",
     "Bulgaria nutome": "BG",
     "Burkina Faso nutome": "BF",
diff --git a/js/data/locale/ee/ctryreverse.json b/js/data/locale/ee/ctryreverse.json
index 251eba7972..874dee2519 100644
--- a/js/data/locale/ee/ctryreverse.json
+++ b/js/data/locale/ee/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel nutome",
     "IM": "Aisle of Man nutome",
     "IN": "India nutome",
-    "IO": "Britaintɔwo ƒe india ƒudome nutome",
+    "IO": "British Indian Ocean Territory",
     "IQ": "iraqdukɔ",
     "IR": "Iran nutome",
     "IS": "Aiseland nutome",
diff --git a/js/data/locale/ee/unitfmt.json b/js/data/locale/ee/unitfmt.json
index 8f0a56ba2a..c1e5144ef6 100644
--- a/js/data/locale/ee/unitfmt.json
+++ b/js/data/locale/ee/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/el/ctrynames.json b/js/data/locale/el/ctrynames.json
index 688f5fe10d..a60e0878bd 100644
--- a/js/data/locale/el/ctrynames.json
+++ b/js/data/locale/el/ctrynames.json
@@ -52,7 +52,7 @@
     "Βοσνία - Ἐρζεγοβίνη": "BA",
     "Βουλγαρία": "BG",
     "Βραζιλία": "BR",
-    "Βρετανικὰ Ἐδάφη Ἰνδικοῦ Ὠκεανοῦ": "IO",
+    "Βρετανικά Εδάφη Ινδικού Ωκεανού": "IO",
     "Βρετανικὲς Παρθένοι Νῆσοι": "VG",
     "Γαλλία": "FR",
     "Γαλλικὰ Νότια Ἐδάφη": "TF",
diff --git a/js/data/locale/el/ctryreverse.json b/js/data/locale/el/ctryreverse.json
index 7c79ce0faa..e98e3b4419 100644
--- a/js/data/locale/el/ctryreverse.json
+++ b/js/data/locale/el/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Ἰσραήλ",
     "IM": "Νήσος του Μαν",
     "IN": "Ἰνδία",
-    "IO": "Βρετανικὰ Ἐδάφη Ἰνδικοῦ Ὠκεανοῦ",
+    "IO": "Βρετανικά Εδάφη Ινδικού Ωκεανού",
     "IQ": "Ἰράκ",
     "IR": "Ἰράν, Ἰσλαμικὴ Δημοκρατία τοῦ",
     "IS": "Ἰσλανδία",
diff --git a/js/data/locale/el/sysres.json b/js/data/locale/el/sysres.json
index 6f8b8251c2..d057ea56e1 100644
--- a/js/data/locale/el/sysres.json
+++ b/js/data/locale/el/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#σε {num} δευτ.|#σε {num} δευτ.",
     "#in {num}w": "one#σε {num} εβδ.|#σε {num} εβδ.",
     "#in {num}y": "one#σε {num} έτος|#σε {num} έτη",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} η|#{num} η",
     "#{num}d ago": "one#πριν από {num} ημ.|#πριν από {num} ημ.",
     "#{num}h": "one#{num} ώ|#{num} ώ",
@@ -201,10 +201,10 @@
     "a1": "μ.μ.",
     "durationLongDays": "one#{num} ημέρα|#{num} ημέρες",
     "durationMediumHours": "one#{num} ώ|#{num} ώ",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} ε|#{num} ε",
     "durationMediumYears": "one#{num} έ|#{num} έ",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} λ|#{num} λ",
     "durationShortMonths": "one#{num} μ|#{num} μ",
     "finalSeparatorFull": ", ",
diff --git a/js/data/locale/el/unitfmt.json b/js/data/locale/el/unitfmt.json
index 302a8f5487..30f0ae86d9 100644
--- a/js/data/locale/el/unitfmt.json
+++ b/js/data/locale/el/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} ατμόσφαιρα|#{n} ατμόσφαιρες",
             "bar": "#{n} μπαρ",
             "barrel": "one#{n} βαρέλι|#{n} βαρέλια",
+            "beaufort": "#{n} μποφόρ",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit ανά δευτερόλεπτο",
             "british-thermal-unit": "one#{n} βρετανική μονάδα θερμότητας|#{n} βρετανικές μονάδες θερμότητας",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} μπαρ",
             "barrel": "#{n} βρλ",
+            "beaufort": "#{n} μποφ.",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/δευτ.",
             "british-thermal-unit": "#{n} BTU",
@@ -249,7 +251,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} κ.φρ.",
             "dessert-spoon-imperial": "#{n} αγγλ. κουτ. φρ.",
-            "dot": "#{n} px",
+            "dot": "#{n} κουκ.",
             "dot-per-centimeter": "#{n} κουκ./εκ.",
             "dot-per-inch": "#{n} κουκ./ίντσα",
             "dram": "#{n} δρ. όγκου",
diff --git a/js/data/locale/en/001/unitfmt.json b/js/data/locale/en/001/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/001/unitfmt.json
+++ b/js/data/locale/en/001/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/150/unitfmt.json b/js/data/locale/en/150/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/150/unitfmt.json
+++ b/js/data/locale/en/150/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/AG/unitfmt.json b/js/data/locale/en/AG/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/AG/unitfmt.json
+++ b/js/data/locale/en/AG/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/AI/unitfmt.json b/js/data/locale/en/AI/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/AI/unitfmt.json
+++ b/js/data/locale/en/AI/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/AT/unitfmt.json b/js/data/locale/en/AT/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/AT/unitfmt.json
+++ b/js/data/locale/en/AT/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/AU/dateformats.json b/js/data/locale/en/AU/dateformats.json
index 1ab6d50d55..27620ed6e4 100644
--- a/js/data/locale/en/AU/dateformats.json
+++ b/js/data/locale/en/AU/dateformats.json
@@ -8,16 +8,16 @@
                 "s": "d/M"
             },
             "dmw": {
-                "f": "EEEE, d MMMM",
-                "l": "EEE, d MMMM",
-                "m": "EE, d MMM",
-                "s": "E, d/M"
+                "f": "EEEE d MMMM",
+                "l": "EEE d MMMM",
+                "m": "EE d MMM",
+                "s": "E d/M"
             },
             "dmwy": {
-                "f": "EEEE, d MMMM yyyy",
-                "l": "EEE, d MMMM yyyy",
-                "m": "EE, d MMM yyyy",
-                "s": "E, d/M/yy"
+                "f": "EEEE d MMMM yyyy",
+                "l": "EEE d MMMM yyyy",
+                "m": "EE d MMM yyyy",
+                "s": "E d/M/yy"
             },
             "dmy": {
                 "f": "d MMMM yyyy",
@@ -25,6 +25,12 @@
                 "m": "d MMM yyyy",
                 "s": "d/M/yy"
             },
+            "dw": {
+                "f": "EEEE d",
+                "l": "EEE d",
+                "m": "EE d",
+                "s": "E d"
+            },
             "e": {
                 "f": "cccc",
                 "l": "ccc",
diff --git a/js/data/locale/en/AU/sysres.json b/js/data/locale/en/AU/sysres.json
index a6c90907e3..d0f74ee1ed 100644
--- a/js/data/locale/en/AU/sysres.json
+++ b/js/data/locale/en/AU/sysres.json
@@ -1,18 +1,19 @@
 {
     "#in {num}h": "one#in {num} hr|#in {num} hrs",
-    "#in {num}mi": "one#in {num} min.|#in {num} mins",
-    "#in {num}s": "one#in {num} sec.|#in {num} secs",
+    "#in {num}mi": "one#in {num} min|#in {num} mins",
+    "#in {num}mo": "one#in {num} mo|#in {num} mo",
+    "#in {num}s": "one#in {num} sec|#in {num} secs",
     "#in {num}w": "one#in {num} wk|#in {num} wks",
     "#in {num}y": "one#in {num} yr|#in {num} yrs",
     "#{num}h ago": "one#{num} hr ago|#{num} hrs ago",
-    "#{num}mi ago": "one#{num} min. ago|#{num} mins ago",
+    "#{num}mi ago": "one#{num} min ago|#{num} mins ago",
+    "#{num}mo ago": "one#{num} mo ago|#{num} mo ago",
     "#{num}s": "one#{num}s.|#{num}s.",
-    "#{num}s ago": "one#{num} sec. ago|#{num} secs ago",
+    "#{num}s ago": "one#{num} sec ago|#{num} secs ago",
     "#{num}w ago": "one#{num} wk ago|#{num} wks ago",
     "#{num}y ago": "one#{num} yr ago|#{num} yrs ago",
     "1#1 hr|#{num} hrs": "one#{num} hr|#{num} hrs",
-    "1#1 min|#{num} min": "one#{num} min.|#{num} mins",
-    "1#1 mi|#{num} min": "one#{num}min.|#{num}min.",
+    "1#1 min|#{num} min": "one#{num} min|#{num} mins",
     "1#1 sec|#{num} sec": "one#{num} sec.|#{num} secs",
     "1#1 se|#{num} sec": "one#{num}s.|#{num}s.",
     "B1": "am",
@@ -78,20 +79,20 @@
     "MMM9": "Sept",
     "a0": "am",
     "a1": "pm",
-    "c0": "Su.",
-    "c1": "M.",
-    "c2": "Tu.",
-    "c3": "W.",
-    "c4": "Th.",
-    "c5": "F.",
-    "c6": "Sa.",
-    "cc0": "Sun",
-    "cc1": "Mon",
+    "c0": "S",
+    "c1": "M",
+    "c2": "T",
+    "c3": "W",
+    "c4": "T",
+    "c5": "F",
+    "c6": "S",
+    "cc0": "Su",
+    "cc1": "Mo",
     "cc2": "Tu",
-    "cc3": "Wed",
-    "cc4": "Thu",
-    "cc5": "Fri",
-    "cc6": "Sat",
+    "cc3": "We",
+    "cc4": "Th",
+    "cc5": "Fr",
+    "cc6": "Sa",
     "ccc0": "Sun",
     "ccc1": "Mon",
     "ccc2": "Tue",
@@ -105,6 +106,5 @@
     "cccc3": "Wednesday",
     "cccc4": "Thursday",
     "cccc5": "Friday",
-    "cccc6": "Saturday",
-    "durationShortMinutes": "one#{num}min.|#{num}min."
+    "cccc6": "Saturday"
 }
\ No newline at end of file
diff --git a/js/data/locale/en/AU/unitfmt.json b/js/data/locale/en/AU/unitfmt.json
index 0fe55c9516..d7d953f0f1 100644
--- a/js/data/locale/en/AU/unitfmt.json
+++ b/js/data/locale/en/AU/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -55,7 +55,7 @@
             "em": "one#{n} em|#{n} ems",
             "fahrenheit": "one#{n} degree Fahrenheit|#{n} degrees Fahrenheit",
             "fathom": "one#{n} fathom|#{n} fathoms",
-            "fluid-ounce": "one#{n} fluid ounce|#{n} fluid ounces",
+            "fluid-ounce": "one#{n} US fluid ounce|#{n} US fluid ounces",
             "fluid-ounce-imperial": "one#{n} Imp. fluid ounce|#{n} Imp. fluid ounces",
             "foodcalorie": "one#{n} Calorie|#{n} Calories",
             "foot": "one#{n} foot|#{n} feet",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree|#{n} degrees",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -200,7 +201,7 @@
             "terabyte-per-second": "#{n} terabytes per second",
             "therm-us": "one#{n} US therm|#{n} US therms",
             "ton": "one#{n} ton|#{n} tons",
-            "tonne": "one#tonne|#{n} tonnes",
+            "tonne": "one#{n} tonne|#{n} tonnes",
             "volt": "one#{n} volt|#{n} volts",
             "watt": "one#{n} watt|#{n} watts",
             "week": "one#{n} week|#{n} weeks",
@@ -262,7 +263,7 @@
             "em": "#{n} em",
             "fahrenheit": "#{n}°F",
             "fathom": "#{n} fth",
-            "fluid-ounce": "#{n} fl oz",
+            "fluid-ounce": "#{n} US fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
             "foodcalorie": "#{n} Cal",
             "foot": "#{n} ft",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} gal US",
             "gallon-imperial": "#{n} gal.",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb ps.",
@@ -350,7 +352,7 @@
             "millimole-per-liter": "#{n} mmol/L",
             "millisecond": "#{n} ms",
             "milliwatt": "#{n} mW",
-            "minute": "one#{n} min.|#{n} mins",
+            "minute": "one#{n} min|#{n} mins",
             "mole": "#{n} mol",
             "month": "one#{n} mth|#{n} mths",
             "nanometer": "#{n} nm",
diff --git a/js/data/locale/en/BB/unitfmt.json b/js/data/locale/en/BB/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/BB/unitfmt.json
+++ b/js/data/locale/en/BB/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/BE/unitfmt.json b/js/data/locale/en/BE/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/BE/unitfmt.json
+++ b/js/data/locale/en/BE/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/BM/unitfmt.json b/js/data/locale/en/BM/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/BM/unitfmt.json
+++ b/js/data/locale/en/BM/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/BS/unitfmt.json b/js/data/locale/en/BS/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/BS/unitfmt.json
+++ b/js/data/locale/en/BS/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/BW/unitfmt.json b/js/data/locale/en/BW/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/BW/unitfmt.json
+++ b/js/data/locale/en/BW/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/BZ/unitfmt.json b/js/data/locale/en/BZ/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/BZ/unitfmt.json
+++ b/js/data/locale/en/BZ/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/CA/ctrynames.json b/js/data/locale/en/CA/ctrynames.json
index daa1b60a0c..ce80d657ce 100644
--- a/js/data/locale/en/CA/ctrynames.json
+++ b/js/data/locale/en/CA/ctrynames.json
@@ -207,8 +207,8 @@
     "Poland": "PL",
     "Polynesia": "061",
     "Portugal": "PT",
-    "pseudo-accents": "XA",
-    "pseudo-bidi": "XB",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
     "Puerto Rico": "PR",
     "Qatar": "QA",
     "Réunion": "RE",
@@ -276,7 +276,7 @@
     "United Kingdom": "GB",
     "United Nations": "UN",
     "United States": "US",
-    "unknown region": "ZZ",
+    "Unknown Region": "ZZ",
     "Uruguay": "UY",
     "US Outlying Islands": "UM",
     "US Virgin Islands": "VI",
diff --git a/js/data/locale/en/CA/ctryreverse.json b/js/data/locale/en/CA/ctryreverse.json
index 394f9135e8..ec747ab4d0 100644
--- a/js/data/locale/en/CA/ctryreverse.json
+++ b/js/data/locale/en/CA/ctryreverse.json
@@ -285,13 +285,13 @@
     "VU": "Vanuatu",
     "WF": "Wallis and Futuna",
     "WS": "Samoa",
-    "XA": "pseudo-accents",
-    "XB": "pseudo-bidi",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
     "XK": "Kosovo",
     "YE": "Yemen",
     "YT": "Mayotte",
     "ZA": "South Africa",
     "ZM": "Zambia",
     "ZW": "Zimbabwe",
-    "ZZ": "unknown region"
+    "ZZ": "Unknown Region"
 }
\ No newline at end of file
diff --git a/js/data/locale/en/CA/unitfmt.json b/js/data/locale/en/CA/unitfmt.json
index 39d642689e..7362c91f3e 100644
--- a/js/data/locale/en/CA/unitfmt.json
+++ b/js/data/locale/en/CA/unitfmt.json
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -215,7 +216,7 @@
             "arc-second": "one#{n} arcsec|#{n} arcsecs",
             "astronomical-unit": "#{n} au",
             "atmosphere": "#{n} atm",
-            "bar": "one#{n} bar|#{n} bars",
+            "bar": "#{n} bar",
             "barrel": "#{n} bbl",
             "beaufort": "#B {n}",
             "bit": "one#{n} bit|#{n} bits",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/sec",
@@ -288,7 +290,7 @@
             "horsepower": "#{n} hp",
             "hour": "one#{n} hr|#{n} hrs",
             "inch": "#{n} in",
-            "inch-ofhg": "#{n} in Hg",
+            "inch-ofhg": "#{n} inHg",
             "item": "one#{n} item|#{n} items",
             "jigger": "#{n} jiggers",
             "joule": "#{n} J",
diff --git a/js/data/locale/en/CC/unitfmt.json b/js/data/locale/en/CC/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/CC/unitfmt.json
+++ b/js/data/locale/en/CC/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/CH/unitfmt.json b/js/data/locale/en/CH/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/CH/unitfmt.json
+++ b/js/data/locale/en/CH/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/CK/unitfmt.json b/js/data/locale/en/CK/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/CK/unitfmt.json
+++ b/js/data/locale/en/CK/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/CM/unitfmt.json b/js/data/locale/en/CM/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/CM/unitfmt.json
+++ b/js/data/locale/en/CM/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/CX/unitfmt.json b/js/data/locale/en/CX/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/CX/unitfmt.json
+++ b/js/data/locale/en/CX/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/CY/unitfmt.json b/js/data/locale/en/CY/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/CY/unitfmt.json
+++ b/js/data/locale/en/CY/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/DE/unitfmt.json b/js/data/locale/en/DE/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/DE/unitfmt.json
+++ b/js/data/locale/en/DE/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/DG/unitfmt.json b/js/data/locale/en/DG/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/DG/unitfmt.json
+++ b/js/data/locale/en/DG/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/DK/unitfmt.json b/js/data/locale/en/DK/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/DK/unitfmt.json
+++ b/js/data/locale/en/DK/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/DM/unitfmt.json b/js/data/locale/en/DM/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/DM/unitfmt.json
+++ b/js/data/locale/en/DM/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/Dsrt/ctrynames.json b/js/data/locale/en/Dsrt/ctrynames.json
index ac8651dbc5..6a164dce97 100644
--- a/js/data/locale/en/Dsrt/ctrynames.json
+++ b/js/data/locale/en/Dsrt/ctrynames.json
@@ -1,5 +1,6 @@
 {
     "Ascension Island": "AC",
+    "British Indian Ocean Territory": "IO",
     "Canary Islands": "IC",
     "Caribbean Netherlands": "BQ",
     "Ceuta & Melilla": "EA",
@@ -117,7 +118,6 @@
     "𐐒𐐲𐑊𐑀𐐯𐑉𐐨𐐲": "BG",
     "𐐒𐐲𐑌𐐨𐑌": "BJ",
     "𐐒𐑉𐐭𐑌𐐴": "BN",
-    "𐐒𐑉𐐮𐐼𐐮𐑇 𐐆𐑌𐐼𐐨𐐲𐑌 𐐄𐑇𐐲𐑌 𐐓𐐯𐑉𐐲𐐻𐐱𐑉𐐨": "IO",
     "𐐒𐑉𐐮𐐼𐐮𐑇 𐐚𐐲𐑉𐐾𐐲𐑌 𐐌𐑊𐐲𐑌𐐼𐑆": "VG",
     "𐐒𐑉𐐲𐑆𐐮𐑊": "BR",
     "𐐓𐐪𐑍𐑀𐐲": "TO",
diff --git a/js/data/locale/en/Dsrt/ctryreverse.json b/js/data/locale/en/Dsrt/ctryreverse.json
index 1bad98a66c..db735fabf9 100644
--- a/js/data/locale/en/Dsrt/ctryreverse.json
+++ b/js/data/locale/en/Dsrt/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𐐆𐑆𐑉𐐨𐐲𐑊",
     "IM": "𐐌𐐲𐑊 𐐲𐑁 𐐣𐐰𐑌",
     "IN": "𐐆𐑌𐐼𐐨𐐲",
-    "IO": "𐐒𐑉𐐮𐐼𐐮𐑇 𐐆𐑌𐐼𐐨𐐲𐑌 𐐄𐑇𐐲𐑌 𐐓𐐯𐑉𐐲𐐻𐐱𐑉𐐨",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𐐆𐑉𐐰𐐿",
     "IR": "𐐆𐑉𐐪𐑌",
     "IS": "𐐌𐑅𐑊𐐲𐑌𐐼",
diff --git a/js/data/locale/en/Dsrt/unitfmt.json b/js/data/locale/en/Dsrt/unitfmt.json
index ffcb496680..77ec868061 100644
--- a/js/data/locale/en/Dsrt/unitfmt.json
+++ b/js/data/locale/en/Dsrt/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/en/ER/unitfmt.json b/js/data/locale/en/ER/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/ER/unitfmt.json
+++ b/js/data/locale/en/ER/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/FI/unitfmt.json b/js/data/locale/en/FI/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/FI/unitfmt.json
+++ b/js/data/locale/en/FI/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/FJ/unitfmt.json b/js/data/locale/en/FJ/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/FJ/unitfmt.json
+++ b/js/data/locale/en/FJ/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/FK/unitfmt.json b/js/data/locale/en/FK/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/FK/unitfmt.json
+++ b/js/data/locale/en/FK/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/FM/unitfmt.json b/js/data/locale/en/FM/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/FM/unitfmt.json
+++ b/js/data/locale/en/FM/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/GB/dateformats.json b/js/data/locale/en/GB/dateformats.json
index 0cb47b6565..f5d193e9f8 100644
--- a/js/data/locale/en/GB/dateformats.json
+++ b/js/data/locale/en/GB/dateformats.json
@@ -11,16 +11,16 @@
                 "s": "dd/MM"
             },
             "dmw": {
-                "f": "EEEE, d MMMM",
-                "l": "EEE, d MMMM",
-                "m": "EE, d MMM",
-                "s": "E, dd/MM"
+                "f": "EEEE d MMMM",
+                "l": "EEE d MMMM",
+                "m": "EE d MMM",
+                "s": "E dd/MM"
             },
             "dmwy": {
-                "f": "EEEE, d MMMM yyyy",
-                "l": "EEE, d MMMM yyyy",
-                "m": "EE, d MMM yyyy",
-                "s": "E, dd/MM/yyyy"
+                "f": "EEEE d MMMM yyyy",
+                "l": "EEE d MMMM yyyy",
+                "m": "EE d MMM yyyy",
+                "s": "E dd/MM/yyyy"
             },
             "dmy": {
                 "f": "d MMMM yyyy",
@@ -29,7 +29,10 @@
                 "s": "dd/MM/yyyy"
             },
             "dw": {
-                "s": "E, dd"
+                "f": "EEEE d",
+                "l": "EEE d",
+                "m": "EE d",
+                "s": "E dd"
             },
             "m": {
                 "s": "MM"
diff --git a/js/data/locale/en/GB/unitfmt.json b/js/data/locale/en/GB/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/GB/unitfmt.json
+++ b/js/data/locale/en/GB/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/GD/unitfmt.json b/js/data/locale/en/GD/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/GD/unitfmt.json
+++ b/js/data/locale/en/GD/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/GG/unitfmt.json b/js/data/locale/en/GG/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/GG/unitfmt.json
+++ b/js/data/locale/en/GG/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/GH/unitfmt.json b/js/data/locale/en/GH/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/GH/unitfmt.json
+++ b/js/data/locale/en/GH/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/GI/unitfmt.json b/js/data/locale/en/GI/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/GI/unitfmt.json
+++ b/js/data/locale/en/GI/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/GM/unitfmt.json b/js/data/locale/en/GM/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/GM/unitfmt.json
+++ b/js/data/locale/en/GM/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/GY/unitfmt.json b/js/data/locale/en/GY/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/GY/unitfmt.json
+++ b/js/data/locale/en/GY/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/HK/unitfmt.json b/js/data/locale/en/HK/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/HK/unitfmt.json
+++ b/js/data/locale/en/HK/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/ID/ctrynames.json b/js/data/locale/en/ID/ctrynames.json
new file mode 100644
index 0000000000..9260b1038c
--- /dev/null
+++ b/js/data/locale/en/ID/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "Afghanistan": "AF",
+    "Africa": "002",
+    "Åland Islands": "AX",
+    "Albania": "AL",
+    "Algeria": "DZ",
+    "American Samoa": "AS",
+    "Americas": "019",
+    "Andorra": "AD",
+    "Angola": "AO",
+    "Anguilla": "AI",
+    "Antarctica": "AQ",
+    "Antigua & Barbuda": "AG",
+    "Argentina": "AR",
+    "Armenia": "AM",
+    "Aruba": "AW",
+    "Ascension Island": "AC",
+    "Asia": "142",
+    "Australasia": "053",
+    "Australia": "AU",
+    "Austria": "AT",
+    "Azerbaijan": "AZ",
+    "Bahamas": "BS",
+    "Bahrain": "BH",
+    "Bangladesh": "BD",
+    "Barbados": "BB",
+    "Belarus": "BY",
+    "Belgium": "BE",
+    "Belize": "BZ",
+    "Benin": "BJ",
+    "Bermuda": "BM",
+    "Bhutan": "BT",
+    "Bolivia": "BO",
+    "Bosnia & Herzegovina": "BA",
+    "Botswana": "BW",
+    "Bouvet Island": "BV",
+    "Brazil": "BR",
+    "British Indian Ocean Territory": "IO",
+    "British Virgin Islands": "VG",
+    "Brunei": "BN",
+    "Bulgaria": "BG",
+    "Burkina Faso": "BF",
+    "Burundi": "BI",
+    "Cambodia": "KH",
+    "Cameroon": "CM",
+    "Canada": "CA",
+    "Canary Islands": "IC",
+    "Cape Verde": "CV",
+    "Caribbean": "029",
+    "Caribbean Netherlands": "BQ",
+    "Cayman Islands": "KY",
+    "Central African Republic": "CF",
+    "Central America": "013",
+    "Central Asia": "143",
+    "Ceuta & Melilla": "EA",
+    "Chad": "TD",
+    "Chile": "CL",
+    "China": "CN",
+    "Christmas Island": "CX",
+    "Clipperton Island": "CP",
+    "Cocos (Keeling) Islands": "CC",
+    "Colombia": "CO",
+    "Comoros": "KM",
+    "Congo - Brazzaville": "CG",
+    "Congo - Kinshasa": "CD",
+    "Cook Islands": "CK",
+    "Costa Rica": "CR",
+    "Côte d’Ivoire": "CI",
+    "Croatia": "HR",
+    "Cuba": "CU",
+    "Curaçao": "CW",
+    "Cyprus": "CY",
+    "Czechia": "CZ",
+    "Denmark": "DK",
+    "Diego Garcia": "DG",
+    "Djibouti": "DJ",
+    "Dominica": "DM",
+    "Dominican Republic": "DO",
+    "Eastern Africa": "014",
+    "Eastern Asia": "030",
+    "Eastern Europe": "151",
+    "Ecuador": "EC",
+    "Egypt": "EG",
+    "El Salvador": "SV",
+    "Equatorial Guinea": "GQ",
+    "Eritrea": "ER",
+    "Estonia": "EE",
+    "Eswatini": "SZ",
+    "Ethiopia": "ET",
+    "Europe": "150",
+    "European Union": "EU",
+    "Eurozone": "EZ",
+    "Falkland Islands": "FK",
+    "Faroe Islands": "FO",
+    "Fiji": "FJ",
+    "Finland": "FI",
+    "France": "FR",
+    "French Guiana": "GF",
+    "French Polynesia": "PF",
+    "French Southern Territories": "TF",
+    "Gabon": "GA",
+    "Gambia": "GM",
+    "Georgia": "GE",
+    "Germany": "DE",
+    "Ghana": "GH",
+    "Gibraltar": "GI",
+    "Greece": "GR",
+    "Greenland": "GL",
+    "Grenada": "GD",
+    "Guadeloupe": "GP",
+    "Guam": "GU",
+    "Guatemala": "GT",
+    "Guernsey": "GG",
+    "Guinea": "GN",
+    "Guinea-Bissau": "GW",
+    "Guyana": "GY",
+    "Haiti": "HT",
+    "Heard & McDonald Islands": "HM",
+    "Honduras": "HN",
+    "Hong Kong SAR China": "HK",
+    "Hungary": "HU",
+    "Iceland": "IS",
+    "India": "IN",
+    "Indonesia": "ID",
+    "Iran": "IR",
+    "Iraq": "IQ",
+    "Ireland": "IE",
+    "Isle of Man": "IM",
+    "Israel": "IL",
+    "Italy": "IT",
+    "Jamaica": "JM",
+    "Japan": "JP",
+    "Jersey": "JE",
+    "Jordan": "JO",
+    "Kazakhstan": "KZ",
+    "Kenya": "KE",
+    "Kiribati": "KI",
+    "Kosovo": "XK",
+    "Kuwait": "KW",
+    "Kyrgyzstan": "KG",
+    "Laos": "LA",
+    "Latin America": "419",
+    "Latvia": "LV",
+    "Lebanon": "LB",
+    "Lesotho": "LS",
+    "Liberia": "LR",
+    "Libya": "LY",
+    "Liechtenstein": "LI",
+    "Lithuania": "LT",
+    "Luxembourg": "LU",
+    "Macao SAR China": "MO",
+    "Madagascar": "MG",
+    "Malawi": "MW",
+    "Malaysia": "MY",
+    "Maldives": "MV",
+    "Mali": "ML",
+    "Malta": "MT",
+    "Marshall Islands": "MH",
+    "Martinique": "MQ",
+    "Mauritania": "MR",
+    "Mauritius": "MU",
+    "Mayotte": "YT",
+    "Melanesia": "054",
+    "Mexico": "MX",
+    "Micronesia": "FM",
+    "Micronesian Region": "057",
+    "Middle Africa": "017",
+    "Moldova": "MD",
+    "Monaco": "MC",
+    "Mongolia": "MN",
+    "Montenegro": "ME",
+    "Montserrat": "MS",
+    "Morocco": "MA",
+    "Mozambique": "MZ",
+    "Myanmar (Burma)": "MM",
+    "Namibia": "NA",
+    "Nauru": "NR",
+    "Nepal": "NP",
+    "Netherlands": "NL",
+    "New Caledonia": "NC",
+    "New Zealand": "NZ",
+    "Nicaragua": "NI",
+    "Niger": "NE",
+    "Nigeria": "NG",
+    "Niue": "NU",
+    "Norfolk Island": "NF",
+    "North America": "003",
+    "North Korea": "KP",
+    "North Macedonia": "MK",
+    "Northern Africa": "015",
+    "Northern America": "021",
+    "Northern Europe": "154",
+    "Northern Mariana Islands": "MP",
+    "Norway": "NO",
+    "Oceania": "009",
+    "Oman": "OM",
+    "Outlying Oceania": "QO",
+    "Pakistan": "PK",
+    "Palau": "PW",
+    "Palestinian Territories": "PS",
+    "Panama": "PA",
+    "Papua New Guinea": "PG",
+    "Paraguay": "PY",
+    "Peru": "PE",
+    "Philippines": "PH",
+    "Pitcairn Islands": "PN",
+    "Poland": "PL",
+    "Polynesia": "061",
+    "Portugal": "PT",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
+    "Puerto Rico": "PR",
+    "Qatar": "QA",
+    "Réunion": "RE",
+    "Romania": "RO",
+    "Russia": "RU",
+    "Rwanda": "RW",
+    "Samoa": "WS",
+    "San Marino": "SM",
+    "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
+    "Saudi Arabia": "SA",
+    "Senegal": "SN",
+    "Serbia": "RS",
+    "Seychelles": "SC",
+    "Sierra Leone": "SL",
+    "Singapore": "SG",
+    "Sint Maarten": "SX",
+    "Slovakia": "SK",
+    "Slovenia": "SI",
+    "Solomon Islands": "SB",
+    "Somalia": "SO",
+    "South Africa": "ZA",
+    "South America": "005",
+    "South Georgia & South Sandwich Islands": "GS",
+    "South Korea": "KR",
+    "South Sudan": "SS",
+    "Southeast Asia": "035",
+    "Southern Africa": "018",
+    "Southern Asia": "034",
+    "Southern Europe": "039",
+    "Spain": "ES",
+    "Sri Lanka": "LK",
+    "St Barthélemy": "BL",
+    "St Helena": "SH",
+    "St Kitts & Nevis": "KN",
+    "St Lucia": "LC",
+    "St Martin": "MF",
+    "St Pierre & Miquelon": "PM",
+    "St Vincent & the Grenadines": "VC",
+    "Sub-Saharan Africa": "202",
+    "Sudan": "SD",
+    "Suriname": "SR",
+    "Svalbard & Jan Mayen": "SJ",
+    "Sweden": "SE",
+    "Switzerland": "CH",
+    "Syria": "SY",
+    "Taiwan": "TW",
+    "Tajikistan": "TJ",
+    "Tanzania": "TZ",
+    "Thailand": "TH",
+    "Timor-Leste": "TL",
+    "Togo": "TG",
+    "Tokelau": "TK",
+    "Tonga": "TO",
+    "Trinidad & Tobago": "TT",
+    "Tristan da Cunha": "TA",
+    "Tunisia": "TN",
+    "Türkiye": "TR",
+    "Turkmenistan": "TM",
+    "Turks & Caicos Islands": "TC",
+    "Tuvalu": "TV",
+    "Uganda": "UG",
+    "Ukraine": "UA",
+    "United Arab Emirates": "AE",
+    "United Kingdom": "GB",
+    "United Nations": "UN",
+    "United States": "US",
+    "Unknown Region": "ZZ",
+    "Uruguay": "UY",
+    "US Outlying Islands": "UM",
+    "US Virgin Islands": "VI",
+    "Uzbekistan": "UZ",
+    "Vanuatu": "VU",
+    "Vatican City": "VA",
+    "Venezuela": "VE",
+    "Vietnam": "VN",
+    "Wallis & Futuna": "WF",
+    "Western Africa": "011",
+    "Western Asia": "145",
+    "Western Europe": "155",
+    "Western Sahara": "EH",
+    "world": "001",
+    "Yemen": "YE",
+    "Zambia": "ZM",
+    "Zimbabwe": "ZW"
+}
\ No newline at end of file
diff --git a/js/data/locale/en/ID/ctryreverse.json b/js/data/locale/en/ID/ctryreverse.json
new file mode 100644
index 0000000000..fa1b9fc669
--- /dev/null
+++ b/js/data/locale/en/ID/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "world",
+    "002": "Africa",
+    "003": "North America",
+    "005": "South America",
+    "009": "Oceania",
+    "011": "Western Africa",
+    "013": "Central America",
+    "014": "Eastern Africa",
+    "015": "Northern Africa",
+    "017": "Middle Africa",
+    "018": "Southern Africa",
+    "019": "Americas",
+    "021": "Northern America",
+    "029": "Caribbean",
+    "030": "Eastern Asia",
+    "034": "Southern Asia",
+    "035": "Southeast Asia",
+    "039": "Southern Europe",
+    "053": "Australasia",
+    "054": "Melanesia",
+    "057": "Micronesian Region",
+    "061": "Polynesia",
+    "142": "Asia",
+    "143": "Central Asia",
+    "145": "Western Asia",
+    "150": "Europe",
+    "151": "Eastern Europe",
+    "154": "Northern Europe",
+    "155": "Western Europe",
+    "202": "Sub-Saharan Africa",
+    "419": "Latin America",
+    "AC": "Ascension Island",
+    "AD": "Andorra",
+    "AE": "United Arab Emirates",
+    "AF": "Afghanistan",
+    "AG": "Antigua & Barbuda",
+    "AI": "Anguilla",
+    "AL": "Albania",
+    "AM": "Armenia",
+    "AO": "Angola",
+    "AQ": "Antarctica",
+    "AR": "Argentina",
+    "AS": "American Samoa",
+    "AT": "Austria",
+    "AU": "Australia",
+    "AW": "Aruba",
+    "AX": "Åland Islands",
+    "AZ": "Azerbaijan",
+    "BA": "Bosnia & Herzegovina",
+    "BB": "Barbados",
+    "BD": "Bangladesh",
+    "BE": "Belgium",
+    "BF": "Burkina Faso",
+    "BG": "Bulgaria",
+    "BH": "Bahrain",
+    "BI": "Burundi",
+    "BJ": "Benin",
+    "BL": "St Barthélemy",
+    "BM": "Bermuda",
+    "BN": "Brunei",
+    "BO": "Bolivia",
+    "BQ": "Caribbean Netherlands",
+    "BR": "Brazil",
+    "BS": "Bahamas",
+    "BT": "Bhutan",
+    "BV": "Bouvet Island",
+    "BW": "Botswana",
+    "BY": "Belarus",
+    "BZ": "Belize",
+    "CA": "Canada",
+    "CC": "Cocos (Keeling) Islands",
+    "CD": "Congo - Kinshasa",
+    "CF": "Central African Republic",
+    "CG": "Congo - Brazzaville",
+    "CH": "Switzerland",
+    "CI": "Côte d’Ivoire",
+    "CK": "Cook Islands",
+    "CL": "Chile",
+    "CM": "Cameroon",
+    "CN": "China",
+    "CO": "Colombia",
+    "CP": "Clipperton Island",
+    "CQ": "Sark",
+    "CR": "Costa Rica",
+    "CU": "Cuba",
+    "CV": "Cape Verde",
+    "CW": "Curaçao",
+    "CX": "Christmas Island",
+    "CY": "Cyprus",
+    "CZ": "Czechia",
+    "DE": "Germany",
+    "DG": "Diego Garcia",
+    "DJ": "Djibouti",
+    "DK": "Denmark",
+    "DM": "Dominica",
+    "DO": "Dominican Republic",
+    "DZ": "Algeria",
+    "EA": "Ceuta & Melilla",
+    "EC": "Ecuador",
+    "EE": "Estonia",
+    "EG": "Egypt",
+    "EH": "Western Sahara",
+    "ER": "Eritrea",
+    "ES": "Spain",
+    "ET": "Ethiopia",
+    "EU": "European Union",
+    "EZ": "Eurozone",
+    "FI": "Finland",
+    "FJ": "Fiji",
+    "FK": "Falkland Islands",
+    "FM": "Micronesia",
+    "FO": "Faroe Islands",
+    "FR": "France",
+    "GA": "Gabon",
+    "GB": "United Kingdom",
+    "GD": "Grenada",
+    "GE": "Georgia",
+    "GF": "French Guiana",
+    "GG": "Guernsey",
+    "GH": "Ghana",
+    "GI": "Gibraltar",
+    "GL": "Greenland",
+    "GM": "Gambia",
+    "GN": "Guinea",
+    "GP": "Guadeloupe",
+    "GQ": "Equatorial Guinea",
+    "GR": "Greece",
+    "GS": "South Georgia & South Sandwich Islands",
+    "GT": "Guatemala",
+    "GU": "Guam",
+    "GW": "Guinea-Bissau",
+    "GY": "Guyana",
+    "HK": "Hong Kong SAR China",
+    "HM": "Heard & McDonald Islands",
+    "HN": "Honduras",
+    "HR": "Croatia",
+    "HT": "Haiti",
+    "HU": "Hungary",
+    "IC": "Canary Islands",
+    "ID": "Indonesia",
+    "IE": "Ireland",
+    "IL": "Israel",
+    "IM": "Isle of Man",
+    "IN": "India",
+    "IO": "British Indian Ocean Territory",
+    "IQ": "Iraq",
+    "IR": "Iran",
+    "IS": "Iceland",
+    "IT": "Italy",
+    "JE": "Jersey",
+    "JM": "Jamaica",
+    "JO": "Jordan",
+    "JP": "Japan",
+    "KE": "Kenya",
+    "KG": "Kyrgyzstan",
+    "KH": "Cambodia",
+    "KI": "Kiribati",
+    "KM": "Comoros",
+    "KN": "St Kitts & Nevis",
+    "KP": "North Korea",
+    "KR": "South Korea",
+    "KW": "Kuwait",
+    "KY": "Cayman Islands",
+    "KZ": "Kazakhstan",
+    "LA": "Laos",
+    "LB": "Lebanon",
+    "LC": "St Lucia",
+    "LI": "Liechtenstein",
+    "LK": "Sri Lanka",
+    "LR": "Liberia",
+    "LS": "Lesotho",
+    "LT": "Lithuania",
+    "LU": "Luxembourg",
+    "LV": "Latvia",
+    "LY": "Libya",
+    "MA": "Morocco",
+    "MC": "Monaco",
+    "MD": "Moldova",
+    "ME": "Montenegro",
+    "MF": "St Martin",
+    "MG": "Madagascar",
+    "MH": "Marshall Islands",
+    "MK": "North Macedonia",
+    "ML": "Mali",
+    "MM": "Myanmar (Burma)",
+    "MN": "Mongolia",
+    "MO": "Macao SAR China",
+    "MP": "Northern Mariana Islands",
+    "MQ": "Martinique",
+    "MR": "Mauritania",
+    "MS": "Montserrat",
+    "MT": "Malta",
+    "MU": "Mauritius",
+    "MV": "Maldives",
+    "MW": "Malawi",
+    "MX": "Mexico",
+    "MY": "Malaysia",
+    "MZ": "Mozambique",
+    "NA": "Namibia",
+    "NC": "New Caledonia",
+    "NE": "Niger",
+    "NF": "Norfolk Island",
+    "NG": "Nigeria",
+    "NI": "Nicaragua",
+    "NL": "Netherlands",
+    "NO": "Norway",
+    "NP": "Nepal",
+    "NR": "Nauru",
+    "NU": "Niue",
+    "NZ": "New Zealand",
+    "OM": "Oman",
+    "PA": "Panama",
+    "PE": "Peru",
+    "PF": "French Polynesia",
+    "PG": "Papua New Guinea",
+    "PH": "Philippines",
+    "PK": "Pakistan",
+    "PL": "Poland",
+    "PM": "St Pierre & Miquelon",
+    "PN": "Pitcairn Islands",
+    "PR": "Puerto Rico",
+    "PS": "Palestinian Territories",
+    "PT": "Portugal",
+    "PW": "Palau",
+    "PY": "Paraguay",
+    "QA": "Qatar",
+    "QO": "Outlying Oceania",
+    "RE": "Réunion",
+    "RO": "Romania",
+    "RS": "Serbia",
+    "RU": "Russia",
+    "RW": "Rwanda",
+    "SA": "Saudi Arabia",
+    "SB": "Solomon Islands",
+    "SC": "Seychelles",
+    "SD": "Sudan",
+    "SE": "Sweden",
+    "SG": "Singapore",
+    "SH": "St Helena",
+    "SI": "Slovenia",
+    "SJ": "Svalbard & Jan Mayen",
+    "SK": "Slovakia",
+    "SL": "Sierra Leone",
+    "SM": "San Marino",
+    "SN": "Senegal",
+    "SO": "Somalia",
+    "SR": "Suriname",
+    "SS": "South Sudan",
+    "ST": "São Tomé & Príncipe",
+    "SV": "El Salvador",
+    "SX": "Sint Maarten",
+    "SY": "Syria",
+    "SZ": "Eswatini",
+    "TA": "Tristan da Cunha",
+    "TC": "Turks & Caicos Islands",
+    "TD": "Chad",
+    "TF": "French Southern Territories",
+    "TG": "Togo",
+    "TH": "Thailand",
+    "TJ": "Tajikistan",
+    "TK": "Tokelau",
+    "TL": "Timor-Leste",
+    "TM": "Turkmenistan",
+    "TN": "Tunisia",
+    "TO": "Tonga",
+    "TR": "Türkiye",
+    "TT": "Trinidad & Tobago",
+    "TV": "Tuvalu",
+    "TW": "Taiwan",
+    "TZ": "Tanzania",
+    "UA": "Ukraine",
+    "UG": "Uganda",
+    "UM": "US Outlying Islands",
+    "UN": "United Nations",
+    "US": "United States",
+    "UY": "Uruguay",
+    "UZ": "Uzbekistan",
+    "VA": "Vatican City",
+    "VC": "St Vincent & the Grenadines",
+    "VE": "Venezuela",
+    "VG": "British Virgin Islands",
+    "VI": "US Virgin Islands",
+    "VN": "Vietnam",
+    "VU": "Vanuatu",
+    "WF": "Wallis & Futuna",
+    "WS": "Samoa",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
+    "XK": "Kosovo",
+    "YE": "Yemen",
+    "YT": "Mayotte",
+    "ZA": "South Africa",
+    "ZM": "Zambia",
+    "ZW": "Zimbabwe",
+    "ZZ": "Unknown Region"
+}
\ No newline at end of file
diff --git a/js/data/locale/en/ID/dateformats.json b/js/data/locale/en/ID/dateformats.json
new file mode 100644
index 0000000000..647d8e2d61
--- /dev/null
+++ b/js/data/locale/en/ID/dateformats.json
@@ -0,0 +1,121 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "s": "dd"
+            },
+            "dm": {
+                "f": "d MMMM",
+                "l": "d MMMM",
+                "m": "d MMM",
+                "s": "dd/MM"
+            },
+            "dmw": {
+                "f": "EEEE, d MMMM",
+                "l": "EEE, d MMMM",
+                "m": "EE, d MMM",
+                "s": "E, dd/MM"
+            },
+            "dmwy": {
+                "f": "EEEE, d MMMM yyyy",
+                "l": "EEE, d MMMM yyyy",
+                "m": "EE, d MMM yyyy",
+                "s": "E, dd/MM/yyyy"
+            },
+            "dmy": {
+                "f": "d MMMM yyyy",
+                "l": "d MMMM yyyy",
+                "m": "d MMM yyyy",
+                "s": "dd/MM/yyyy"
+            },
+            "dw": {
+                "s": "E, dd"
+            },
+            "m": {
+                "s": "MM"
+            },
+            "my": {
+                "f": "MMMM yyyy",
+                "l": "MMMM yyyy",
+                "m": "MMM yyyy",
+                "s": "MM/yyyy"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sd} {sm} {sy} at {st} – {et}",
+                "l": "{sd} {sm} {sy} at {st} – {et}",
+                "m": "{sd} {sm} {sy}, {st} – {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {et}"
+            },
+            "c01": {
+                "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c02": {
+                "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c03": {
+                "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c10": {
+                "f": "{sd} – {ed} {em} {ey}",
+                "l": "{sd} – {ed} {em} {ey}",
+                "m": "{sd} – {ed} {em} {ey}",
+                "s": "{sd} – {ed}/{em}/{ey}"
+            },
+            "c11": {
+                "f": "{sd} {sm} – {ed} {em} {ey}",
+                "l": "{sd} {sm} – {ed} {em} {ey}",
+                "m": "{sd} {sm} – {ed} {em} {ey}",
+                "s": "{sd}/{sm} – {ed}/{em}/{ey}"
+            },
+            "c12": {
+                "f": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "l": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "m": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "s": "{sd}/{sm}/{sy} – {ed}/{em}/{ey}"
+            },
+            "c20": {
+                "f": "{sm} {sy} – {em} {ey}",
+                "l": "{sm} {sy} – {em} {ey}",
+                "m": "{sm} {sy} – {em} {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ahm": "h.mma",
+                "ahms": "h.mm.ssa",
+                "ahmsz": "h.mm.ssa z",
+                "ahmz": "h.mma z",
+                "hm": "h.mm",
+                "hms": "h.mm.ss",
+                "hmsz": "h.mm.ss z",
+                "hmz": "h.mm z",
+                "ms": "mm.ss"
+            },
+            "24": {
+                "ahm": "HH.mm",
+                "ahms": "HH.mm.ss",
+                "ahmsz": "HH.mm.ss z",
+                "ahmz": "HH.mm z",
+                "hm": "HH.mm",
+                "hms": "HH.mm.ss",
+                "hmsz": "HH.mm.ss z",
+                "hmz": "HH.mm z",
+                "ms": "mm.ss"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/en/ID/list.json b/js/data/locale/en/ID/list.json
new file mode 100644
index 0000000000..89c716081c
--- /dev/null
+++ b/js/data/locale/en/ID/list.json
@@ -0,0 +1,28 @@
+{
+    "or": {
+        "full": {
+            "end": "{0} or {1}"
+        },
+        "long": {
+            "end": "{0} or {1}"
+        },
+        "medium": {
+            "end": "{0} or {1}"
+        },
+        "short": {
+            "end": "{0} or {1}"
+        }
+    },
+    "standard": {
+        "full": {
+            "end": "{0} and {1}"
+        },
+        "long": {
+            "end": "{0} and {1}"
+        },
+        "medium": {
+            "2": "{0} and {1}",
+            "end": "{0} and {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/en/ID/numfmt.jf b/js/data/locale/en/ID/numfmt.jf
new file mode 100644
index 0000000000..8f7a2a778e
--- /dev/null
+++ b/js/data/locale/en/ID/numfmt.jf
@@ -0,0 +1,7 @@
+{
+    "generated": true,
+    "numfmt": {
+        "decimalChar": ",",
+        "groupChar": "."
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/en/ID/sysres.json b/js/data/locale/en/ID/sysres.json
new file mode 100644
index 0000000000..fdf184597c
--- /dev/null
+++ b/js/data/locale/en/ID/sysres.json
@@ -0,0 +1,22 @@
+{
+    "#in {num}h": "one#in {num} hr|#in {num} hr",
+    "#in {num}mi": "one#in {num} min|#in {num} min",
+    "#in {num}mo": "one#in {num} mo|#in {num} mo",
+    "#in {num}s": "one#in {num} sec|#in {num} sec",
+    "#in {num}w": "one#in {num} wk|#in {num} wk",
+    "#in {num}y": "one#in {num} yr|#in {num} yr",
+    "#{num}h ago": "one#{num} hr ago|#{num} hr ago",
+    "#{num}mi ago": "one#{num} min ago|#{num} min ago",
+    "#{num}mo ago": "one#{num} mo ago|#{num} mo ago",
+    "#{num}s ago": "one#{num} sec ago|#{num} sec ago",
+    "#{num}w ago": "one#{num} wk ago|#{num} wk ago",
+    "#{num}y ago": "one#{num} yr ago|#{num} yr ago",
+    "1#1 hr|#{num} hrs": "one#{num} hr|#{num} hrs",
+    "1#1 min|#{num} min": "one#{num} min|#{num} mins",
+    "1#1 sec|#{num} sec": "one#{num} sec|#{num} secs",
+    "B1": "am",
+    "B5": "pm",
+    "MMM9": "Sept",
+    "a0": "am",
+    "a1": "pm"
+}
\ No newline at end of file
diff --git a/js/data/locale/en/ID/unitfmt.json b/js/data/locale/en/ID/unitfmt.json
new file mode 100644
index 0000000000..1fc00a4398
--- /dev/null
+++ b/js/data/locale/en/ID/unitfmt.json
@@ -0,0 +1,420 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "one#{n} acre|#{n} acres",
+            "acre-foot": "one#{n} acre-foot|#{n} acre-feet",
+            "ampere": "one#{n} ampere|#{n} amperes",
+            "arc-minute": "one#{n} arcminute|#{n} arcminutes",
+            "arc-second": "one#{n} arcsecond|#{n} arcseconds",
+            "astronomical-unit": "one#{n} astronomical unit|#{n} astronomical units",
+            "atmosphere": "one#{n} atmosphere|#{n} atmospheres",
+            "bar": "one#{n} bar|#{n} bars",
+            "barrel": "one#{n} barrel|#{n} barrels",
+            "beaufort": "#Beaufort {n}",
+            "bit": "one#{n} bit|#{n} bits",
+            "bit-per-second": "#{n} bits per second",
+            "british-thermal-unit": "one#{n} British thermal unit|#{n} British thermal units",
+            "bushel": "one#{n} bushel|#{n} bushels",
+            "byte": "one#{n} byte|#{n} bytes",
+            "byte-per-hour": "#{n} bytes per hour",
+            "byte-per-second": "#{n} bytes per second",
+            "calorie": "one#{n} calorie|#{n} calories",
+            "candela": "one#{n} candela|#{n} candelas",
+            "carat": "one#{n} carat|#{n} carats",
+            "celsius": "one#{n} degree Celsius|#{n} degrees Celsius",
+            "centiliter": "one#{n} centilitre|#{n} centilitres",
+            "centimeter": "one#{n} centimetre|#{n} centimetres",
+            "century": "one#{n} century|#{n} centuries",
+            "coordinateUnit": "",
+            "cubic-centimeter": "one#{n} cubic centimetre|#{n} cubic centimetres",
+            "cubic-foot": "one#{n} cubic foot|#{n} cubic feet",
+            "cubic-inch": "one#{n} cubic inch|#{n} cubic inches",
+            "cubic-kilometer": "one#{n} cubic kilometre|#{n} cubic kilometres",
+            "cubic-meter": "one#{n} cubic metre|#{n} cubic metres",
+            "cubic-mile": "one#{n} cubic mile|#{n} cubic miles",
+            "cubic-yard": "one#{n} cubic yard|#{n} cubic yards",
+            "cup": "one#{n} cup|#{n} cups",
+            "cup-metric": "one#{n} metric cup|#{n} metric cups",
+            "dalton": "one#{n} dalton|#{n} daltons",
+            "day": "one#{n} day|#{n} days",
+            "decade": "one#{n} decade|#{n} decades",
+            "deciliter": "one#{n} decilitre|#{n} decilitres",
+            "decimeter": "one#{n} decimetre|#{n} decimetres",
+            "degree": "one#{n} degree|#{n} degrees",
+            "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
+            "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
+            "dot": "one#{n} dot|#{n} dots",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
+            "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
+            "dram": "one#{n} dram|#{n} drams",
+            "drop": "one#{n} drop|#{n} drops",
+            "dunam": "one#{n} dunam|#{n} dunams",
+            "earth-mass": "one#{n} Earth mass|#{n} Earth masses",
+            "earth-radius": "one#{n} earth radius|#{n} earth radii",
+            "electronvolt": "one#{n} electronvolt|#{n} electronvolts",
+            "em": "one#{n} em|#{n} ems",
+            "fahrenheit": "one#{n} degree Fahrenheit|#{n} degrees Fahrenheit",
+            "fathom": "one#{n} fathom|#{n} fathoms",
+            "fluid-ounce": "one#{n} US fluid ounce|#{n} US fluid ounces",
+            "fluid-ounce-imperial": "one#{n} fluid ounce|#{n} fluid ounces",
+            "foodcalorie": "one#{n} Calorie|#{n} Calories",
+            "foot": "one#{n} foot|#{n} feet",
+            "foot-per-second": "#{n} feet per second",
+            "furlong": "one#{n} furlong|#{n} furlongs",
+            "g-force": "#{n} g-force",
+            "gallon": "one#{n} US gallon|#{n} US gallons",
+            "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
+            "generic": "one#{n} degree temperature|#{n} degrees temperature",
+            "gigabit": "one#{n} gigabit|#{n} gigabits",
+            "gigabit-per-second": "#{n} gigabits per second",
+            "gigabyte": "one#{n} gigabyte|#{n} gigabytes",
+            "gigabyte-per-hour": "#{n} gigabytes per hour",
+            "gigabyte-per-second": "#{n} gigabytes per second",
+            "gigahertz": "#{n} gigahertz",
+            "gigawatt": "one#{n} gigawatt|#{n} gigawatts",
+            "grain": "one#{n} grain|#{n} grains",
+            "gram": "one#{n} gram|#{n} grams",
+            "hectare": "one#{n} hectare|#{n} hectares",
+            "hectoliter": "one#{n} hectolitre|#{n} hectolitres",
+            "hectopascal": "one#{n} hectopascal|#{n} hectopascals",
+            "hertz": "#{n} hertz",
+            "horsepower": "#{n} horsepower",
+            "hour": "one#{n} hour|#{n} hours",
+            "inch": "one#{n} inch|#{n} inches",
+            "inch-ofhg": "one#{n} inch of mercury|#{n} inches of mercury",
+            "item": "one#{n} item|#{n} items",
+            "jigger": "one#{n} jigger|#{n} jiggers",
+            "joule": "one#{n} joule|#{n} joules",
+            "karat": "one#{n} carat|#{n} carats",
+            "kelvin": "#{n} kelvin",
+            "kilobit": "one#{n} kilobit|#{n} kilobits",
+            "kilobit-per-second": "#{n} kilobits per second",
+            "kilobyte": "one#{n} kilobyte|#{n} kilobytes",
+            "kilobyte-per-hour": "#{n} kilobytes per hour",
+            "kilobyte-per-second": "#{n} kilobytes per second",
+            "kilocalorie": "one#{n} kilocalorie|#{n} kilocalories",
+            "kilogram": "one#{n} kilogram|#{n} kilograms",
+            "kilohertz": "#{n} kilohertz",
+            "kilojoule": "one#{n} kilojoule|#{n} kilojoules",
+            "kilometer": "one#{n} kilometre|#{n} kilometres",
+            "kilometer-per-hour": "one#{n} kilometre per hour|#{n} kilometres per hour",
+            "kilometer-per-liter": "#{n} kilometres per litre",
+            "kilometer-per-second": "#{n} kilometres per second",
+            "kilopascal": "one#{n} kilopascal|#{n} kilopascals",
+            "kilowatt": "one#{n} kilowatt|#{n} kilowatts",
+            "kilowatt-hour": "one#{n} kilowatt-hour|#{n} kilowatt-hours",
+            "kilowatt-hour-per-100-kilometer": "one#{n} kilowatt-hour per 100 kilometres|#{n} kilowatt-hours per 100 kilometres",
+            "knot": "one#{n} knot|#{n} knots",
+            "light-year": "one#{n} light year|#{n} light years",
+            "liter": "one#{n} litre|#{n} litres",
+            "liter-per-100-kilometer": "one#{n} litre per 100 kilometres|#{n} litres per 100 kilometres",
+            "liter-per-kilometer": "one#{n} litre per kilometre|#{n} litres per kilometre",
+            "lumen": "one#{n} lumen|#{n} lumens",
+            "lux": "#{n} lux",
+            "megabit": "one#{n} megabit|#{n} megabits",
+            "megabit-per-second": "#{n} megabits per second",
+            "megabyte": "one#{n} megabyte|#{n} megabytes",
+            "megabyte-per-hour": "#{n} megabytes per hour",
+            "megabyte-per-second": "#{n} megabytes per second",
+            "megahertz": "#{n} megahertz",
+            "megaliter": "one#{n} megalitre|#{n} megalitres",
+            "megapascal": "one#{n} megapascal|#{n} megapascals",
+            "megapixel": "one#{n} megapixel|#{n} megapixels",
+            "megawatt": "one#{n} megawatt|#{n} megawatts",
+            "meter": "one#{n} metre|#{n} metres",
+            "meter-per-second": "one#{n} metre per second|#{n} metres per second",
+            "meter-per-square-second": "one#{n} metre per second squared|#{n} metres per second squared",
+            "microgram": "one#{n} microgram|#{n} micrograms",
+            "micrometer": "one#{n} micrometre|#{n} micrometres",
+            "microsecond": "one#{n} microsecond|#{n} microseconds",
+            "mile": "one#{n} mile|#{n} miles",
+            "mile-per-gallon": "one#{n} mile per US gallon|#{n} miles per US gallon",
+            "mile-per-gallon-imperial": "one#{n} mile per gallon|#{n} miles per gallon",
+            "mile-per-hour": "one#{n} mile per hour|#{n} miles per hour",
+            "mile-per-second": "#{n} miles per second",
+            "mile-scandinavian": "one#{n} Scandinavian mile|#{n} Scandinavian miles",
+            "milliampere": "one#{n} milliampere|#{n} milliamperes",
+            "millibar": "one#{n} millibar|#{n} millibars",
+            "milligram": "one#{n} milligram|#{n} milligrams",
+            "milligram-ofglucose-per-deciliter": "one#{n} milligram per decilitre|#{n} milligrams per decilitre",
+            "milliliter": "one#{n} millilitre|#{n} millilitres",
+            "millimeter": "one#{n} millimetre|#{n} millimetres",
+            "millimeter-ofhg": "one#{n} millimetre of mercury|#{n} millimetres of mercury",
+            "millimole-per-liter": "one#{n} millimole per litre|#{n} millimoles per litre",
+            "millisecond": "one#{n} millisecond|#{n} milliseconds",
+            "milliwatt": "one#{n} milliwatt|#{n} milliwatts",
+            "minute": "one#{n} minute|#{n} minutes",
+            "mole": "one#{n} mole|#{n} moles",
+            "month": "one#{n} month|#{n} months",
+            "nanometer": "one#{n} nanometre|#{n} nanometres",
+            "nanosecond": "one#{n} nanosecond|#{n} nanoseconds",
+            "nautical-mile": "one#{n} nautical mile|#{n} nautical miles",
+            "newton": "one#{n} newton|#{n} newtons",
+            "newton-meter": "one#{n} newton metre|#{n} newton metres",
+            "ohm": "one#{n} ohm|#{n} ohms",
+            "ounce": "one#{n} ounce|#{n} ounces",
+            "ounce-troy": "one#{n} troy ounce|#{n} troy ounces",
+            "parsec": "one#{n} parsec|#{n} parsecs",
+            "pascal": "one#{n} pascal|#{n} pascals",
+            "percent": "#{n} per cent",
+            "permille": "#{n} per mille",
+            "permillion": "one#{n} part per million|#{n} parts per million",
+            "permyriad": "#{n} permyriad",
+            "petabyte": "one#{n} petabyte|#{n} petabytes",
+            "picometer": "one#{n} picometre|#{n} picometres",
+            "pinch": "one#{n} pinch|#{n} pinches",
+            "pint": "one#{n} pint|#{n} pints",
+            "pint-metric": "one#{n} metric pint|#{n} metric pints",
+            "pixel": "one#{n} pixel|#{n} pixels",
+            "pixel-per-centimeter": "one#{n} pixel per centimetre|#{n} pixels per centimetre",
+            "pixel-per-inch": "one#{n} pixel per inch|#{n} pixels per inch",
+            "point": "one#{n} point|#{n} points",
+            "pound": "one#{n} pound|#{n} pounds",
+            "pound-force": "one#{n} pound of force|#{n} pounds of force",
+            "pound-force-foot": "one#{n} pound-force-foot|#{n} pound-force-feet",
+            "pound-force-per-square-inch": "one#{n} pound-force per square inch|#{n} pounds-force per square inch",
+            "quart": "one#{n} US quart|#{n} US quarts",
+            "quart-imperial": "one#{n} quart|#{n} quarts",
+            "quarter": "one#{n} quarter|#{n} quarters",
+            "radian": "one#{n} radian|#{n} radians",
+            "revolution": "one#{n} revolution|#{n} revolutions",
+            "second": "one#{n} second|#{n} seconds",
+            "short-ton": "one#{n} ton|#{n} tons",
+            "solar-luminosity": "one#{n} solar luminosity|#{n} solar luminosities",
+            "solar-mass": "one#{n} solar mass|#{n} solar masses",
+            "solar-radius": "one#{n} solar radius|#{n} solar radii",
+            "square-centimeter": "one#{n} square centimetre|#{n} square centimetres",
+            "square-foot": "one#{n} square foot|#{n} square feet",
+            "square-inch": "one#{n} square inch|#{n} square inches",
+            "square-kilometer": "one#{n} square kilometre|#{n} square kilometres",
+            "square-meter": "one#{n} square metre|#{n} square metres",
+            "square-mile": "one#{n} square mile|#{n} square miles",
+            "square-yard": "one#{n} square yard|#{n} square yards",
+            "stone": "#{n} stone",
+            "tablespoon": "one#{n} tablespoon|#{n} tablespoons",
+            "teaspoon": "one#{n} teaspoon|#{n} teaspoons",
+            "terabit": "one#{n} terabit|#{n} terabits",
+            "terabit-per-second": "#{n} terabits per second",
+            "terabyte": "one#{n} terabyte|#{n} terabytes",
+            "terabyte-per-hour": "#{n} terabytes per hour",
+            "terabyte-per-second": "#{n} terabytes per second",
+            "therm-us": "one#{n} US therm|#{n} US therms",
+            "ton": "one#{n} ton|#{n} tons",
+            "tonne": "one#{n} tonne|#{n} tonnes",
+            "volt": "one#{n} volt|#{n} volts",
+            "watt": "one#{n} watt|#{n} watts",
+            "week": "one#{n} week|#{n} weeks",
+            "yard": "one#{n} yard|#{n} yards",
+            "year": "one#{n} year|#{n} years"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "one#{n} arcmin|#{n} arcmins",
+            "arc-second": "one#{n} arcsec|#{n} arcsecs",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} ct",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cl",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "one#{n} day|#{n} days",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dl",
+            "decimeter": "#{n} dm",
+            "degree": "#{n} deg",
+            "dessert-spoon": "#{n} US dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn",
+            "dot": "one#{n} dot|#{n} dots",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
+            "dram": "one#{n} dram|#{n} drams",
+            "drop": "#{n} drops",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} US fl oz",
+            "fluid-ounce-imperial": "#{n} fl oz",
+            "foodcalorie": "#{n} Cal",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} US gal",
+            "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grains",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hl",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "one#{n} hr|#{n} hrs",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "one#{n} item|#{n} items",
+            "jigger": "one#{n} jigger|#{n} jiggers",
+            "joule": "#{n} J",
+            "karat": "#{n} ct",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} l/100 km",
+            "liter-per-kilometer": "#{n} l/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} Ml",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg",
+            "mile-per-hour": "#{n} mph",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dl",
+            "milliliter": "#{n} ml",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mmHg",
+            "millimole-per-liter": "#{n} mmol/l",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "one#{n} min|#{n} mins",
+            "mole": "#{n} mol",
+            "month": "one#{n} mth|#{n} mths",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinches",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} US qt",
+            "quart-imperial": "#{n} qt",
+            "quarter": "one#{n} qtr|#{n} qtrs",
+            "radian": "#{n} rad",
+            "revolution": "one#{n} rev|#{n} revs",
+            "second": "one#{n} sec|#{n} secs",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} sq ft",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} sq mi",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "one#{n} US therm|#{n} US therms",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "one#{n} wk|#{n} wks",
+            "yard": "#{n} yd",
+            "year": "one#{n} yr|#{n} yrs"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/en/IE/unitfmt.json b/js/data/locale/en/IE/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/IE/unitfmt.json
+++ b/js/data/locale/en/IE/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/IL/unitfmt.json b/js/data/locale/en/IL/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/IL/unitfmt.json
+++ b/js/data/locale/en/IL/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/IM/unitfmt.json b/js/data/locale/en/IM/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/IM/unitfmt.json
+++ b/js/data/locale/en/IM/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/IN/dateformats.json b/js/data/locale/en/IN/dateformats.json
index a376ee09ae..f800488c14 100644
--- a/js/data/locale/en/IN/dateformats.json
+++ b/js/data/locale/en/IN/dateformats.json
@@ -2,43 +2,44 @@
     "gregorian": {
         "date": {
             "d": {
-                "m": "dd",
                 "s": "dd"
             },
             "dm": {
                 "f": "d MMMM",
                 "l": "d MMMM",
-                "m": "dd-MMM",
+                "m": "d MMM",
                 "s": "dd/MM"
             },
             "dmw": {
-                "f": "EEEE, d MMMM",
-                "l": "EEE, d MMMM",
-                "m": "EE, dd-MMM",
-                "s": "E, dd/MM"
+                "f": "EEEE d MMMM",
+                "l": "EEE d MMMM",
+                "m": "EE d MMM",
+                "s": "E dd/MM"
             },
             "dmwy": {
-                "f": "EEEE, d MMMM, yyyy",
-                "l": "EEE, d MMMM yyyy",
-                "m": "EE, dd-MMM-yyyy",
-                "s": "E, dd/MM/yy"
+                "f": "EEEE d MMMM, yyyy",
+                "l": "EEE d MMMM yyyy",
+                "m": "EE d MMM yyyy",
+                "s": "E dd/MM/yy"
             },
             "dmy": {
                 "f": "d MMMM, yyyy",
                 "l": "d MMMM yyyy",
-                "m": "dd-MMM-yyyy",
+                "m": "d MMM yyyy",
                 "s": "dd/MM/yy"
             },
             "dw": {
-                "m": "EE, dd",
-                "s": "E, dd"
+                "f": "EEEE d",
+                "l": "EEE d",
+                "m": "EE d",
+                "s": "E dd"
             },
             "m": {
                 "s": "MM"
             },
             "my": {
                 "l": "MMMM yyyy",
-                "m": "MMM-yyyy",
+                "m": "MMM yyyy",
                 "s": "MM/yy"
             }
         },
@@ -46,48 +47,48 @@
             "c00": {
                 "f": "{sd} {sm}, {sy} at {st} – {et}",
                 "l": "{sd} {sm} {sy} at {st} – {et}",
-                "m": "{sd}-{sm}-{sy}, {st} – {et}",
+                "m": "{sd} {sm} {sy}, {st} – {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {et}"
             },
             "c01": {
                 "f": "{sd} {sm}, {sy} at {st} – {ed} {em}, {ey} at {et}",
                 "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
-                "m": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c02": {
                 "f": "{sd} {sm}, {sy} at {st} – {ed} {em}, {ey} at {et}",
                 "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
-                "m": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c03": {
                 "f": "{sd} {sm}, {sy} at {st} – {ed} {em}, {ey} at {et}",
                 "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
-                "m": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c10": {
                 "f": "{sd} – {ed} {em}, {ey}",
                 "l": "{sd} – {ed} {em} {ey}",
-                "m": "{sd} – {ed}-{em}-{ey}",
+                "m": "{sd} – {ed} {em} {ey}",
                 "s": "{sd} – {ed}/{em}/{ey}"
             },
             "c11": {
                 "f": "{sd} {sm} – {ed} {em}, {ey}",
                 "l": "{sd} {sm} – {ed} {em} {ey}",
-                "m": "{sd}-{sm} – {ed}-{em}-{ey}",
+                "m": "{sd} {sm} – {ed} {em} {ey}",
                 "s": "{sd}/{sm} – {ed}/{em}/{ey}"
             },
             "c12": {
                 "f": "{sd} {sm}, {sy} – {ed} {em}, {ey}",
                 "l": "{sd} {sm} {sy} – {ed} {em} {ey}",
-                "m": "{sd}-{sm}-{sy} – {ed}-{em}-{ey}",
+                "m": "{sd} {sm} {sy} – {ed} {em} {ey}",
                 "s": "{sd}/{sm}/{sy} – {ed}/{em}/{ey}"
             },
             "c20": {
                 "l": "{sm} {sy} – {em} {ey}",
-                "m": "{sm}-{sy} – {em}-{ey}"
+                "m": "{sm} {sy} – {em} {ey}"
             }
         }
     }
diff --git a/js/data/locale/en/IN/unitfmt.json b/js/data/locale/en/IN/unitfmt.json
index 9d5a3ff93c..31306a9bb2 100644
--- a/js/data/locale/en/IN/unitfmt.json
+++ b/js/data/locale/en/IN/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "#{n}°",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/IO/unitfmt.json b/js/data/locale/en/IO/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/IO/unitfmt.json
+++ b/js/data/locale/en/IO/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/JE/unitfmt.json b/js/data/locale/en/JE/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/JE/unitfmt.json
+++ b/js/data/locale/en/JE/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/JM/unitfmt.json b/js/data/locale/en/JM/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/JM/unitfmt.json
+++ b/js/data/locale/en/JM/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/KE/unitfmt.json b/js/data/locale/en/KE/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/KE/unitfmt.json
+++ b/js/data/locale/en/KE/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/KI/unitfmt.json b/js/data/locale/en/KI/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/KI/unitfmt.json
+++ b/js/data/locale/en/KI/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/KN/unitfmt.json b/js/data/locale/en/KN/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/KN/unitfmt.json
+++ b/js/data/locale/en/KN/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/KY/unitfmt.json b/js/data/locale/en/KY/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/KY/unitfmt.json
+++ b/js/data/locale/en/KY/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/LC/unitfmt.json b/js/data/locale/en/LC/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/LC/unitfmt.json
+++ b/js/data/locale/en/LC/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/LR/unitfmt.json b/js/data/locale/en/LR/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/LR/unitfmt.json
+++ b/js/data/locale/en/LR/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/LS/unitfmt.json b/js/data/locale/en/LS/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/LS/unitfmt.json
+++ b/js/data/locale/en/LS/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/MG/unitfmt.json b/js/data/locale/en/MG/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/MG/unitfmt.json
+++ b/js/data/locale/en/MG/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/MO/unitfmt.json b/js/data/locale/en/MO/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/MO/unitfmt.json
+++ b/js/data/locale/en/MO/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/MS/unitfmt.json b/js/data/locale/en/MS/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/MS/unitfmt.json
+++ b/js/data/locale/en/MS/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/MT/unitfmt.json b/js/data/locale/en/MT/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/MT/unitfmt.json
+++ b/js/data/locale/en/MT/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/MU/unitfmt.json b/js/data/locale/en/MU/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/MU/unitfmt.json
+++ b/js/data/locale/en/MU/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/MV/dateformats.json b/js/data/locale/en/MV/dateformats.json
index 0f5e433de8..2b1bf8acf4 100644
--- a/js/data/locale/en/MV/dateformats.json
+++ b/js/data/locale/en/MV/dateformats.json
@@ -44,34 +44,30 @@
                 "s": "M-yy"
             }
         },
-        "order": {
-            "m": "{date} {time}",
-            "s": "{date} {time}"
-        },
         "range": {
             "c00": {
                 "f": "{sd} {sm} {sy} at {st} – {et}",
                 "l": "{sd} {sm} {sy} at {st} – {et}",
-                "m": "{sd}-{sm}-{sy} {st} – {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {et}"
+                "m": "{sd}-{sm}-{sy}, {st} – {et}",
+                "s": "{sd}-{sm}-{sy}, {st} – {et}"
             },
             "c01": {
                 "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
                 "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
-                "m": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
+                "m": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}",
+                "s": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}"
             },
             "c02": {
                 "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
                 "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
-                "m": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
+                "m": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}",
+                "s": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}"
             },
             "c03": {
                 "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
                 "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
-                "m": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
+                "m": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}",
+                "s": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}"
             },
             "c10": {
                 "f": "{sd} – {ed} {em} {ey}",
diff --git a/js/data/locale/en/MV/unitfmt.json b/js/data/locale/en/MV/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/MV/unitfmt.json
+++ b/js/data/locale/en/MV/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/MW/unitfmt.json b/js/data/locale/en/MW/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/MW/unitfmt.json
+++ b/js/data/locale/en/MW/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/MY/unitfmt.json b/js/data/locale/en/MY/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/MY/unitfmt.json
+++ b/js/data/locale/en/MY/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/NA/unitfmt.json b/js/data/locale/en/NA/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/NA/unitfmt.json
+++ b/js/data/locale/en/NA/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/NF/unitfmt.json b/js/data/locale/en/NF/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/NF/unitfmt.json
+++ b/js/data/locale/en/NF/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/NG/unitfmt.json b/js/data/locale/en/NG/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/NG/unitfmt.json
+++ b/js/data/locale/en/NG/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/NL/unitfmt.json b/js/data/locale/en/NL/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/NL/unitfmt.json
+++ b/js/data/locale/en/NL/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/NR/unitfmt.json b/js/data/locale/en/NR/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/NR/unitfmt.json
+++ b/js/data/locale/en/NR/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/NU/unitfmt.json b/js/data/locale/en/NU/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/NU/unitfmt.json
+++ b/js/data/locale/en/NU/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/NZ/dateformats.json b/js/data/locale/en/NZ/dateformats.json
index 26a9eb4ef3..3a98a11836 100644
--- a/js/data/locale/en/NZ/dateformats.json
+++ b/js/data/locale/en/NZ/dateformats.json
@@ -1,88 +1,96 @@
 {
     "gregorian": {
         "date": {
+            "d": {
+                "s": "dd"
+            },
             "dm": {
                 "f": "d MMMM",
                 "l": "d MMMM",
-                "m": "d/MM",
-                "s": "d/MM"
+                "m": "d MMM",
+                "s": "dd/MM"
             },
             "dmw": {
                 "f": "EEEE, d MMMM",
                 "l": "EEE, d MMMM",
-                "m": "EE, d/MM",
-                "s": "E, d/MM"
+                "m": "EE, d MMM",
+                "s": "E, dd/MM"
             },
             "dmwy": {
                 "f": "EEEE, d MMMM yyyy",
                 "l": "EEE, d MMMM yyyy",
-                "m": "EE, d/MM/yyyy",
-                "s": "E, d/MM/yy"
+                "m": "EE, d MMM yyyy",
+                "s": "E, dd/MM/yyyy"
             },
             "dmy": {
                 "f": "d MMMM yyyy",
                 "l": "d MMMM yyyy",
-                "m": "d/MM/yyyy",
-                "s": "d/MM/yy"
+                "m": "d MMM yyyy",
+                "s": "dd/MM/yyyy"
+            },
+            "dw": {
+                "s": "E, dd"
             },
             "m": {
-                "m": "MM",
                 "s": "MM"
             },
             "my": {
                 "f": "MMMM yyyy",
                 "l": "MMMM yyyy",
-                "m": "MM/yyyy",
-                "s": "MM/yy"
+                "m": "MMM yyyy",
+                "s": "MM/yyyy"
+            },
+            "y": {
+                "s": "yyyy"
             }
         },
         "range": {
             "c00": {
                 "f": "{sd} {sm} {sy} at {st} – {et}",
                 "l": "{sd} {sm} {sy} at {st} – {et}",
-                "m": "{sd}/{sm}/{sy}, {st} – {et}",
+                "m": "{sd} {sm} {sy}, {st} – {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {et}"
             },
             "c01": {
                 "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
                 "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
-                "m": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c02": {
                 "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
                 "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
-                "m": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c03": {
                 "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
                 "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
-                "m": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c10": {
                 "f": "{sd} – {ed} {em} {ey}",
                 "l": "{sd} – {ed} {em} {ey}",
-                "m": "{sd} – {ed}/{em}/{ey}",
+                "m": "{sd} – {ed} {em} {ey}",
                 "s": "{sd} – {ed}/{em}/{ey}"
             },
             "c11": {
                 "f": "{sd} {sm} – {ed} {em} {ey}",
                 "l": "{sd} {sm} – {ed} {em} {ey}",
-                "m": "{sd}/{sm} – {ed}/{em}/{ey}",
+                "m": "{sd} {sm} – {ed} {em} {ey}",
                 "s": "{sd}/{sm} – {ed}/{em}/{ey}"
             },
             "c12": {
                 "f": "{sd} {sm} {sy} – {ed} {em} {ey}",
                 "l": "{sd} {sm} {sy} – {ed} {em} {ey}",
-                "m": "{sd}/{sm}/{sy} – {ed}/{em}/{ey}",
+                "m": "{sd} {sm} {sy} – {ed} {em} {ey}",
                 "s": "{sd}/{sm}/{sy} – {ed}/{em}/{ey}"
             },
             "c20": {
                 "f": "{sm} {sy} – {em} {ey}",
                 "l": "{sm} {sy} – {em} {ey}",
-                "m": "{sm}/{sy} – {em}/{ey}"
+                "m": "{sm} {sy} – {em} {ey}"
             }
         }
     }
diff --git a/js/data/locale/en/NZ/unitfmt.json b/js/data/locale/en/NZ/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/NZ/unitfmt.json
+++ b/js/data/locale/en/NZ/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/PG/unitfmt.json b/js/data/locale/en/PG/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/PG/unitfmt.json
+++ b/js/data/locale/en/PG/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/PK/unitfmt.json b/js/data/locale/en/PK/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/PK/unitfmt.json
+++ b/js/data/locale/en/PK/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/PN/unitfmt.json b/js/data/locale/en/PN/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/PN/unitfmt.json
+++ b/js/data/locale/en/PN/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/PW/unitfmt.json b/js/data/locale/en/PW/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/PW/unitfmt.json
+++ b/js/data/locale/en/PW/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/RW/unitfmt.json b/js/data/locale/en/RW/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/RW/unitfmt.json
+++ b/js/data/locale/en/RW/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SB/unitfmt.json b/js/data/locale/en/SB/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SB/unitfmt.json
+++ b/js/data/locale/en/SB/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SC/unitfmt.json b/js/data/locale/en/SC/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SC/unitfmt.json
+++ b/js/data/locale/en/SC/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SD/unitfmt.json b/js/data/locale/en/SD/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SD/unitfmt.json
+++ b/js/data/locale/en/SD/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SE/unitfmt.json b/js/data/locale/en/SE/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SE/unitfmt.json
+++ b/js/data/locale/en/SE/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SG/unitfmt.json b/js/data/locale/en/SG/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SG/unitfmt.json
+++ b/js/data/locale/en/SG/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SH/unitfmt.json b/js/data/locale/en/SH/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SH/unitfmt.json
+++ b/js/data/locale/en/SH/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SI/unitfmt.json b/js/data/locale/en/SI/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SI/unitfmt.json
+++ b/js/data/locale/en/SI/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SL/unitfmt.json b/js/data/locale/en/SL/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SL/unitfmt.json
+++ b/js/data/locale/en/SL/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SS/unitfmt.json b/js/data/locale/en/SS/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SS/unitfmt.json
+++ b/js/data/locale/en/SS/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SX/unitfmt.json b/js/data/locale/en/SX/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SX/unitfmt.json
+++ b/js/data/locale/en/SX/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/SZ/unitfmt.json b/js/data/locale/en/SZ/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/SZ/unitfmt.json
+++ b/js/data/locale/en/SZ/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/Shaw/unitfmt.json b/js/data/locale/en/Shaw/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/en/Shaw/unitfmt.json
+++ b/js/data/locale/en/Shaw/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/en/TC/unitfmt.json b/js/data/locale/en/TC/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/TC/unitfmt.json
+++ b/js/data/locale/en/TC/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/TK/unitfmt.json b/js/data/locale/en/TK/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/TK/unitfmt.json
+++ b/js/data/locale/en/TK/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/TO/unitfmt.json b/js/data/locale/en/TO/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/TO/unitfmt.json
+++ b/js/data/locale/en/TO/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/TT/unitfmt.json b/js/data/locale/en/TT/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/TT/unitfmt.json
+++ b/js/data/locale/en/TT/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/TV/unitfmt.json b/js/data/locale/en/TV/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/TV/unitfmt.json
+++ b/js/data/locale/en/TV/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/TZ/unitfmt.json b/js/data/locale/en/TZ/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/TZ/unitfmt.json
+++ b/js/data/locale/en/TZ/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/UG/unitfmt.json b/js/data/locale/en/UG/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/UG/unitfmt.json
+++ b/js/data/locale/en/UG/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/VC/unitfmt.json b/js/data/locale/en/VC/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/VC/unitfmt.json
+++ b/js/data/locale/en/VC/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/VG/unitfmt.json b/js/data/locale/en/VG/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/VG/unitfmt.json
+++ b/js/data/locale/en/VG/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/VU/unitfmt.json b/js/data/locale/en/VU/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/VU/unitfmt.json
+++ b/js/data/locale/en/VU/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/WS/unitfmt.json b/js/data/locale/en/WS/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/WS/unitfmt.json
+++ b/js/data/locale/en/WS/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/ZA/unitfmt.json b/js/data/locale/en/ZA/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/ZA/unitfmt.json
+++ b/js/data/locale/en/ZA/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/ZM/unitfmt.json b/js/data/locale/en/ZM/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/ZM/unitfmt.json
+++ b/js/data/locale/en/ZM/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/ZW/unitfmt.json b/js/data/locale/en/ZW/unitfmt.json
index 9fc21d1777..1fc00a4398 100644
--- a/js/data/locale/en/ZW/unitfmt.json
+++ b/js/data/locale/en/ZW/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} US dessertspoon|#{n} US dessertspoons",
             "dessert-spoon-imperial": "one#{n} dessertspoon|#{n} dessertspoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} gallon|#{n} gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} US gal",
             "gallon-imperial": "#{n} gal",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/en/unitfmt.json b/js/data/locale/en/unitfmt.json
index 8fc6d26cb2..ca102a2581 100644
--- a/js/data/locale/en/unitfmt.json
+++ b/js/data/locale/en/unitfmt.json
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} gallon|#{n} gallons",
             "gallon-imperial": "one#{n} Imp. gallon|#{n} Imp. gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits per second",
@@ -248,12 +249,13 @@
             "deciliter": "#{n} dL",
             "decimeter": "#{n} dm",
             "degree": "#{n} deg",
-            "dessert-spoon": "#{n} dstspn",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dessert-spoon": "#{n} dsp",
+            "dessert-spoon-imperial": "#{n} dsp-Imp.",
+            "dot": "one#{n} dot|#{n} dots",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
-            "dram": "#{n} dram fl",
-            "drop": "#{n} drop",
+            "dram": "one#{n} dram|#{n} drams",
+            "drop": "one#{n} dr|#{n} drdrops",
             "dunam": "#{n} dunam",
             "earth-mass": "#{n} M⊕",
             "earth-radius": "#{n} R⊕",
@@ -270,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
             "gallon-imperial": "#{n} gal Imp.",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
@@ -278,7 +281,7 @@
             "gigabyte-per-second": "#{n} GB/s",
             "gigahertz": "#{n} GHz",
             "gigawatt": "#{n} GW",
-            "grain": "#{n} grain",
+            "grain": "#{n} gr",
             "gram": "#{n} g",
             "hectare": "#{n} ha",
             "hectoliter": "#{n} hL",
@@ -289,7 +292,7 @@
             "inch": "#{n} in",
             "inch-ofhg": "#{n} inHg",
             "item": "one#{n} item|#{n} items",
-            "jigger": "#{n} jigger",
+            "jigger": "one#{n} jigger|#{n} jiggers",
             "joule": "#{n} J",
             "karat": "#{n} kt",
             "kelvin": "#{n} K",
@@ -368,7 +371,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
+            "pinch": "#{n} pn",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
@@ -380,7 +383,7 @@
             "pound-force-foot": "#{n} lbf⋅ft",
             "pound-force-per-square-inch": "#{n} psi",
             "quart": "#{n} qt",
-            "quart-imperial": "#{n} qt Imp.",
+            "quart-imperial": "#{n} qt-Imp.",
             "quarter": "one#{n} qtr|#{n} qtrs",
             "radian": "#{n} rad",
             "revolution": "#{n} rev",
diff --git a/js/data/locale/eo/ctrynames.json b/js/data/locale/eo/ctrynames.json
index a542beeb51..0ae3542e23 100644
--- a/js/data/locale/eo/ctrynames.json
+++ b/js/data/locale/eo/ctrynames.json
@@ -10,7 +10,7 @@
     "Angolo": "AO",
     "Angvilo": "AI",
     "Antarkto": "AQ",
-    "Antigvo-Barbudo": "AG",
+    "Antigvo kaj Barbudo": "AG",
     "Argentino": "AR",
     "Armenujo": "AM",
     "Arubo": "AW",
@@ -24,19 +24,19 @@
     "Bangladeŝo": "BD",
     "Barbado": "BB",
     "Barejno": "BH",
-    "Belaŭo": "PW",
     "Belgujo": "BE",
     "Belizo": "BZ",
     "Belorusujo": "BY",
     "Benino": "BJ",
     "Bermudoj": "BM",
+    "Birmo": "MM",
     "Bocvano": "BW",
     "Bolivio": "BO",
-    "Bosnio-Hercegovino": "BA",
+    "Bosnujo kaj Hercegovino": "BA",
     "Bouvet Island": "BV",
     "Brazilo": "BR",
-    "Brita Hindoceana Teritorio": "IO",
     "Britaj Virgulininsuloj": "VG",
+    "British Indian Ocean Territory": "IO",
     "Brunejo": "BN",
     "Bulgarujo": "BG",
     "Burkino": "BF",
@@ -66,7 +66,7 @@
     "Eastern Asia": "030",
     "Eastern Europe": "151",
     "Ebur-Bordo": "CI",
-    "Egipto": "EG",
+    "Egiptujo": "EG",
     "Ekvadoro": "EC",
     "Ekvatora Gvineo": "GQ",
     "Eritreo": "ER",
@@ -120,21 +120,21 @@
     "Jemeno": "YE",
     "Jersey": "JE",
     "Jordanio": "JO",
-    "Kabo-Verdo": "CV",
+    "Kaboverdo": "CV",
     "Kamboĝo": "KH",
     "Kameruno": "CM",
     "Kanado": "CA",
     "Kartvelujo": "GE",
     "Kataro": "QA",
-    "Kazaĥstano": "KZ",
+    "Kazaĥujo": "KZ",
     "Kejmanoj": "KY",
     "Kenjo": "KE",
     "Kipro": "CY",
-    "Kirgizistano": "KG",
+    "Kirgizujo": "KG",
     "Kiribato": "KI",
     "Kolombio": "CO",
     "Komoroj": "KM",
-    "Kongolo": "CG",
+    "Kongo Brazavila": "CG",
     "Kosovo": "XK",
     "Kostariko": "CR",
     "Kroatujo": "HR",
@@ -169,10 +169,9 @@
     "Micronesian Region": "057",
     "Middle Africa": "017",
     "Mikronezio": "FM",
-    "Mjanmao": "MM",
     "Moldavujo": "MD",
     "Monako": "MC",
-    "Mondo": "001",
+    "mondo": "001",
     "Mongolujo": "MN",
     "Montenegro": "ME",
     "Montserrat": "MS",
@@ -201,6 +200,7 @@
     "Omano": "OM",
     "Outlying Oceania": "QO",
     "Pakistano": "PK",
+    "Palaŭo": "PW",
     "Palestinian Territories": "PS",
     "Panamo": "PA",
     "Papuo-Nov-Gvineo": "PG",
@@ -212,7 +212,7 @@
     "Portugalujo": "PT",
     "Pseudo-Accents": "XA",
     "Pseudo-Bidi": "XB",
-    "Puerto-Riko": "PR",
+    "Puertoriko": "PR",
     "Reunio": "RE",
     "Ruando": "RW",
     "Rumanujo": "RO",
@@ -220,19 +220,19 @@
     "Salomonoj": "SB",
     "Salvadoro": "SV",
     "Samoo": "WS",
-    "San-Marino": "SM",
-    "Sao-Tomeo kaj Principeo": "ST",
+    "Sankta Heleno": "SH",
+    "Sankta Kristoforo kaj Neviso": "KN",
+    "Sankta Lucio": "LC",
+    "Sankta Piero kaj Mikelono": "PM",
+    "Sankta Vincento kaj Grenadinoj": "VC",
+    "Sanmarino": "SM",
+    "Santomeo kaj Principeo": "ST",
     "Sark": "CQ",
-    "Saŭda Arabujo": "SA",
+    "Sauda Arabujo": "SA",
     "Sejŝeloj": "SC",
     "Senegalo": "SN",
-    "Sent-Heleno": "SH",
-    "Sent-Kristofo kaj Neviso": "KN",
-    "Sent-Lucio": "LC",
-    "Sent-Piero kaj Mikelono": "PM",
-    "Sent-Vincento kaj la Grenadinoj": "VC",
     "Serbia": "RS",
-    "Siera-Leono": "SL",
+    "Sieraleono": "SL",
     "Singapuro": "SG",
     "Sint Maarten": "SX",
     "Sirio": "SY",
@@ -245,7 +245,7 @@
     "Southern Africa": "018",
     "Southern Asia": "034",
     "Southern Europe": "039",
-    "Sri-Lanko": "LK",
+    "Srilanko": "LK",
     "St. Barthélemy": "BL",
     "St. Martin": "MF",
     "Sub-Saharan Africa": "202",
@@ -254,7 +254,7 @@
     "Sud-Koreo": "KR",
     "Sudano": "SD",
     "Surinamo": "SR",
-    "Svalbardo kaj Jan-Majen-insulo": "SJ",
+    "Svalbardo kaj Janmajeno": "SJ",
     "Svazilando": "SZ",
     "Svedujo": "SE",
     "Svisujo": "CH",
@@ -263,7 +263,7 @@
     "Tajvano": "TW",
     "Tanzanio": "TZ",
     "Timor-Leste": "TL",
-    "Togolo": "TG",
+    "Togolando": "TG",
     "Tokelau": "TK",
     "Tongo": "TO",
     "Trinidado kaj Tobago": "TT",
@@ -274,7 +274,7 @@
     "Turkujo": "TR",
     "Tuvalo": "TV",
     "Ugando": "UG",
-    "Ukrajno": "UA",
+    "Ukrainujo": "UA",
     "United Nations": "UN",
     "Unknown Region": "ZZ",
     "Unuiĝinta Reĝlando": "GB",
diff --git a/js/data/locale/eo/ctryreverse.json b/js/data/locale/eo/ctryreverse.json
index 4758716558..183e64da92 100644
--- a/js/data/locale/eo/ctryreverse.json
+++ b/js/data/locale/eo/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mondo",
+    "001": "mondo",
     "002": "Africa",
     "003": "North America",
     "005": "South America",
@@ -34,7 +34,7 @@
     "AD": "Andoro",
     "AE": "Unuiĝintaj Arabaj Emirlandoj",
     "AF": "Afganujo",
-    "AG": "Antigvo-Barbudo",
+    "AG": "Antigvo kaj Barbudo",
     "AI": "Angvilo",
     "AL": "Albanujo",
     "AM": "Armenujo",
@@ -47,7 +47,7 @@
     "AW": "Arubo",
     "AX": "Åland Islands",
     "AZ": "Azerbajĝano",
-    "BA": "Bosnio-Hercegovino",
+    "BA": "Bosnujo kaj Hercegovino",
     "BB": "Barbado",
     "BD": "Bangladeŝo",
     "BE": "Belgujo",
@@ -72,7 +72,7 @@
     "CC": "Cocos (Keeling) Islands",
     "CD": "Congo - Kinshasa",
     "CF": "Centr-Afrika Respubliko",
-    "CG": "Kongolo",
+    "CG": "Kongo Brazavila",
     "CH": "Svisujo",
     "CI": "Ebur-Bordo",
     "CK": "Kukinsuloj",
@@ -84,7 +84,7 @@
     "CQ": "Sark",
     "CR": "Kostariko",
     "CU": "Kubo",
-    "CV": "Kabo-Verdo",
+    "CV": "Kaboverdo",
     "CW": "Curaçao",
     "CX": "Christmas Island",
     "CY": "Kipro",
@@ -99,7 +99,7 @@
     "EA": "Ceuta & Melilla",
     "EC": "Ekvadoro",
     "EE": "Estonujo",
-    "EG": "Egipto",
+    "EG": "Egiptujo",
     "EH": "Okcidenta Saharo",
     "ER": "Eritreo",
     "ES": "Hispanujo",
@@ -143,7 +143,7 @@
     "IL": "Israelo",
     "IM": "Isle of Man",
     "IN": "Hindujo",
-    "IO": "Brita Hindoceana Teritorio",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irako",
     "IR": "Irano",
     "IS": "Islando",
@@ -153,21 +153,21 @@
     "JO": "Jordanio",
     "JP": "Japanujo",
     "KE": "Kenjo",
-    "KG": "Kirgizistano",
+    "KG": "Kirgizujo",
     "KH": "Kamboĝo",
     "KI": "Kiribato",
     "KM": "Komoroj",
-    "KN": "Sent-Kristofo kaj Neviso",
+    "KN": "Sankta Kristoforo kaj Neviso",
     "KP": "Nord-Koreo",
     "KR": "Sud-Koreo",
     "KW": "Kuvajto",
     "KY": "Kejmanoj",
-    "KZ": "Kazaĥstano",
+    "KZ": "Kazaĥujo",
     "LA": "Laoso",
     "LB": "Libano",
-    "LC": "Sent-Lucio",
+    "LC": "Sankta Lucio",
     "LI": "Liĥtenŝtejno",
-    "LK": "Sri-Lanko",
+    "LK": "Srilanko",
     "LR": "Liberio",
     "LS": "Lesoto",
     "LT": "Litovujo",
@@ -183,7 +183,7 @@
     "MH": "Marŝaloj",
     "MK": "North Macedonia",
     "ML": "Malio",
-    "MM": "Mjanmao",
+    "MM": "Birmo",
     "MN": "Mongolujo",
     "MO": "Macao SAR China",
     "MP": "Nord-Marianoj",
@@ -217,12 +217,12 @@
     "PH": "Filipinoj",
     "PK": "Pakistano",
     "PL": "Pollando",
-    "PM": "Sent-Piero kaj Mikelono",
+    "PM": "Sankta Piero kaj Mikelono",
     "PN": "Pitkarna Insulo",
-    "PR": "Puerto-Riko",
+    "PR": "Puertoriko",
     "PS": "Palestinian Territories",
     "PT": "Portugalujo",
-    "PW": "Belaŭo",
+    "PW": "Palaŭo",
     "PY": "Paragvajo",
     "QA": "Kataro",
     "QO": "Outlying Oceania",
@@ -231,23 +231,23 @@
     "RS": "Serbia",
     "RU": "Rusujo",
     "RW": "Ruando",
-    "SA": "Saŭda Arabujo",
+    "SA": "Sauda Arabujo",
     "SB": "Salomonoj",
     "SC": "Sejŝeloj",
     "SD": "Sudano",
     "SE": "Svedujo",
     "SG": "Singapuro",
-    "SH": "Sent-Heleno",
+    "SH": "Sankta Heleno",
     "SI": "Slovenujo",
-    "SJ": "Svalbardo kaj Jan-Majen-insulo",
+    "SJ": "Svalbardo kaj Janmajeno",
     "SK": "Slovakujo",
-    "SL": "Siera-Leono",
-    "SM": "San-Marino",
+    "SL": "Sieraleono",
+    "SM": "Sanmarino",
     "SN": "Senegalo",
     "SO": "Somalujo",
     "SR": "Surinamo",
     "SS": "South Sudan",
-    "ST": "Sao-Tomeo kaj Principeo",
+    "ST": "Santomeo kaj Principeo",
     "SV": "Salvadoro",
     "SX": "Sint Maarten",
     "SY": "Sirio",
@@ -256,7 +256,7 @@
     "TC": "Turks & Caicos Islands",
     "TD": "Ĉado",
     "TF": "French Southern Territories",
-    "TG": "Togolo",
+    "TG": "Togolando",
     "TH": "Tajlando",
     "TJ": "Taĝikujo",
     "TK": "Tokelau",
@@ -269,7 +269,7 @@
     "TV": "Tuvalo",
     "TW": "Tajvano",
     "TZ": "Tanzanio",
-    "UA": "Ukrajno",
+    "UA": "Ukrainujo",
     "UG": "Ugando",
     "UM": "Usonaj malgrandaj insuloj",
     "UN": "United Nations",
@@ -277,7 +277,7 @@
     "UY": "Urugvajo",
     "UZ": "Uzbekujo",
     "VA": "Vatikano",
-    "VC": "Sent-Vincento kaj la Grenadinoj",
+    "VC": "Sankta Vincento kaj Grenadinoj",
     "VE": "Venezuelo",
     "VG": "Britaj Virgulininsuloj",
     "VI": "Usonaj Virgulininsuloj",
diff --git a/js/data/locale/eo/dateformats.json b/js/data/locale/eo/dateformats.json
index 09a0adf63b..82b5cc9827 100644
--- a/js/data/locale/eo/dateformats.json
+++ b/js/data/locale/eo/dateformats.json
@@ -14,16 +14,16 @@
                 "s": "MM-dd"
             },
             "dmw": {
-                "f": "EEEE, d-'a' 'de' MMMM",
-                "l": "EEE, MMMM-dd",
-                "m": "EE, MMM-dd",
-                "s": "E, MM-dd"
+                "f": "EEEE, 'la' d-'a' 'de' MMMM",
+                "l": "EEE, 'la' MMMM-dd",
+                "m": "EE, 'la' MMM-dd",
+                "s": "E, 'la' MM-dd"
             },
             "dmwy": {
-                "f": "EEEE, d-'a' 'de' MMMM yyyy",
-                "l": "EEE, yyyy-MMMM-dd",
-                "m": "EE, yyyy-MMM-dd",
-                "s": "E, yy-MM-dd"
+                "f": "EEEE, 'la' d-'a' 'de' MMMM yyyy",
+                "l": "EEE, 'la' yyyy-MMMM-dd",
+                "m": "EE, 'la' yyyy-MMM-dd",
+                "s": "E, 'la' yy-MM-dd"
             },
             "dmy": {
                 "f": "d-'a' 'de' MMMM yyyy",
@@ -32,10 +32,10 @@
                 "s": "yy-MM-dd"
             },
             "dw": {
-                "f": "EEEE, d",
-                "l": "EEE, dd",
-                "m": "EE, dd",
-                "s": "E, dd"
+                "f": "EEEE, 'la' d",
+                "l": "EEE, 'la' dd",
+                "m": "EE, 'la' dd",
+                "s": "E, 'la' dd"
             },
             "m": {
                 "l": "MMMM",
diff --git a/js/data/locale/eo/numfmt.jf b/js/data/locale/eo/numfmt.jf
index 627863342a..277420711c 100644
--- a/js/data/locale/eo/numfmt.jf
+++ b/js/data/locale/eo/numfmt.jf
@@ -1,6 +1,10 @@
 {
     "generated": true,
     "numfmt": {
+        "currencyFormats": {
+            "common": "{n} {s}",
+            "commonNegative": "-{n} {s}"
+        },
         "decimalChar": ",",
         "groupChar": " "
     }
diff --git a/js/data/locale/eo/sysres.json b/js/data/locale/eo/sysres.json
index d4cc24b3a8..dec443ae87 100644
--- a/js/data/locale/eo/sysres.json
+++ b/js/data/locale/eo/sysres.json
@@ -86,56 +86,25 @@
     "EEEE4": "ĵaŭdo",
     "EEEE5": "vendredo",
     "EEEE6": "sabato",
-    "G-1": "aK",
-    "G1": "pK",
-    "MMM1": "jan",
-    "MMM10": "okt",
-    "MMM11": "nov",
-    "MMM12": "dec",
-    "MMM2": "feb",
-    "MMM3": "mar",
-    "MMM4": "apr",
-    "MMM5": "maj",
-    "MMM6": "jun",
-    "MMM7": "jul",
-    "MMM8": "aŭg",
-    "MMM9": "sep",
-    "MMMM1": "januaro",
-    "MMMM10": "oktobro",
-    "MMMM11": "novembro",
-    "MMMM12": "decembro",
-    "MMMM2": "februaro",
-    "MMMM3": "marto",
-    "MMMM4": "aprilo",
-    "MMMM5": "majo",
-    "MMMM6": "junio",
-    "MMMM7": "julio",
-    "MMMM8": "aŭgusto",
-    "MMMM9": "septembro",
-    "N1": "j",
-    "N10": "o",
-    "N11": "n",
-    "N12": "d",
-    "N2": "f",
-    "N3": "m",
-    "N4": "a",
-    "N5": "m",
-    "N6": "j",
-    "N7": "j",
-    "N8": "a",
-    "N9": "s",
-    "NN1": "ja",
-    "NN10": "ok",
-    "NN11": "no",
-    "NN12": "de",
-    "NN2": "fe",
-    "NN3": "ma",
-    "NN4": "ap",
-    "NN5": "ma",
-    "NN6": "ju",
-    "NN7": "ju",
-    "NN8": "aŭ",
-    "NN9": "se",
+    "G-1": "a.K.",
+    "G1": "p.K.",
+    "MMM10": "Okt",
+    "MMM5": "Maj",
+    "MMM8": "Aŭg",
+    "MMMM1": "Januaro",
+    "MMMM10": "Oktobro",
+    "MMMM11": "Novembro",
+    "MMMM12": "Decembro",
+    "MMMM2": "Februaro",
+    "MMMM3": "Marto",
+    "MMMM4": "Aprilo",
+    "MMMM5": "Majo",
+    "MMMM6": "Junio",
+    "MMMM7": "Julio",
+    "MMMM8": "Aŭgusto",
+    "MMMM9": "Septembro",
+    "NN10": "Ok",
+    "NN8": "Aŭ",
     "a0": "atm",
     "a1": "ptm",
     "durationLongDays": "#{num} d",
diff --git a/js/data/locale/eo/unitfmt.json b/js/data/locale/eo/unitfmt.json
index f22dff677e..3d19fc2472 100644
--- a/js/data/locale/eo/unitfmt.json
+++ b/js/data/locale/eo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/es/419/ctrynames.json b/js/data/locale/es/419/ctrynames.json
index ac730288f0..89ece596a0 100644
--- a/js/data/locale/es/419/ctrynames.json
+++ b/js/data/locale/es/419/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
@@ -271,12 +271,12 @@
     "Territorio Británico del Océano Índico": "IO",
     "Territorios Australes Franceses": "TF",
     "Territorios Palestinos": "PS",
-    "Timor-Leste": "TL",
+    "Timor Oriental": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
     "Trinidad y Tobago": "TT",
-    "Tristán da Cunha": "TA",
+    "Tristán de Acuña": "TA",
     "Túnez": "TN",
     "Turkmenistán": "TM",
     "Turquía": "TR",
diff --git a/js/data/locale/es/419/ctryreverse.json b/js/data/locale/es/419/ctryreverse.json
index 26b7346f45..a9bd3540f8 100644
--- a/js/data/locale/es/419/ctryreverse.json
+++ b/js/data/locale/es/419/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
@@ -252,7 +252,7 @@
     "SX": "Sint Maarten",
     "SY": "Siria",
     "SZ": "Esuatini",
-    "TA": "Tristán da Cunha",
+    "TA": "Tristán de Acuña",
     "TC": "Islas Turcas y Caicos",
     "TD": "Chad",
     "TF": "Territorios Australes Franceses",
@@ -260,7 +260,7 @@
     "TH": "Tailandia",
     "TJ": "Tayikistán",
     "TK": "Tokelau",
-    "TL": "Timor-Leste",
+    "TL": "Timor Oriental",
     "TM": "Turkmenistán",
     "TN": "Túnez",
     "TO": "Tonga",
diff --git a/js/data/locale/es/419/dateformats.json b/js/data/locale/es/419/dateformats.json
index 5d3b07ead1..2dfbc44878 100644
--- a/js/data/locale/es/419/dateformats.json
+++ b/js/data/locale/es/419/dateformats.json
@@ -9,6 +9,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/419/delimiters.jf b/js/data/locale/es/419/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/419/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/419/numfmt.jf b/js/data/locale/es/419/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/419/numfmt.jf
+++ b/js/data/locale/es/419/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/419/sysres.json b/js/data/locale/es/419/sysres.json
index 69b0a9ca20..96b1c2dada 100644
--- a/js/data/locale/es/419/sysres.json
+++ b/js/data/locale/es/419/sysres.json
@@ -5,14 +5,17 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "B1": "a.m.",
+    "B5": "p.m.",
     "E3": "M",
     "G-1": "a.e.c.",
     "G1": "e.c.",
+    "a0": "a.m.",
+    "a1": "p.m.",
     "c0": "D",
     "c1": "L",
     "c2": "M",
@@ -44,6 +47,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/419/unitfmt.json b/js/data/locale/es/419/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/419/unitfmt.json
+++ b/js/data/locale/es/419/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/AR/ctrynames.json b/js/data/locale/es/AR/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/AR/ctrynames.json
+++ b/js/data/locale/es/AR/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/AR/ctryreverse.json b/js/data/locale/es/AR/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/AR/ctryreverse.json
+++ b/js/data/locale/es/AR/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/AR/dateformats.json b/js/data/locale/es/AR/dateformats.json
index 063f9bcd4d..df49b932b0 100644
--- a/js/data/locale/es/AR/dateformats.json
+++ b/js/data/locale/es/AR/dateformats.json
@@ -1,6 +1,12 @@
 {
     "gregorian": {
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/AR/delimiters.jf b/js/data/locale/es/AR/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/AR/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/AR/numfmt.jf b/js/data/locale/es/AR/numfmt.jf
index 9e587faf8b..f25c08bb36 100644
--- a/js/data/locale/es/AR/numfmt.jf
+++ b/js/data/locale/es/AR/numfmt.jf
@@ -4,6 +4,8 @@
         "currencyFormats": {
             "common": "{s} {n}",
             "commonNegative": "-{s} {n}"
-        }
+        },
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/AR/sysres.json b/js/data/locale/es/AR/sysres.json
index 20157da765..ebb797ad96 100644
--- a/js/data/locale/es/AR/sysres.json
+++ b/js/data/locale/es/AR/sysres.json
@@ -8,7 +8,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}a.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 sec|#{num} sec": "one#{num} seg.|#{num} seg.",
@@ -26,6 +25,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}a.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/AR/unitfmt.json b/js/data/locale/es/AR/unitfmt.json
index 640c239f54..091addd3dc 100644
--- a/js/data/locale/es/AR/unitfmt.json
+++ b/js/data/locale/es/AR/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/seg.",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/seg.",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/seg.",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/seg.",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/BO/ctrynames.json b/js/data/locale/es/BO/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/BO/ctrynames.json
+++ b/js/data/locale/es/BO/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/BO/ctryreverse.json b/js/data/locale/es/BO/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/BO/ctryreverse.json
+++ b/js/data/locale/es/BO/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/BO/dateformats.json b/js/data/locale/es/BO/dateformats.json
index 4d8a029f7f..a7aa30b39f 100644
--- a/js/data/locale/es/BO/dateformats.json
+++ b/js/data/locale/es/BO/dateformats.json
@@ -44,6 +44,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/BO/delimiters.jf b/js/data/locale/es/BO/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/BO/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/BO/numfmt.jf b/js/data/locale/es/BO/numfmt.jf
index 51b46ffa22..7612989dd0 100644
--- a/js/data/locale/es/BO/numfmt.jf
+++ b/js/data/locale/es/BO/numfmt.jf
@@ -4,6 +4,8 @@
         "currencyFormats": {
             "common": "{s}{n}",
             "commonNegative": "-{s}{n}"
-        }
+        },
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/BO/sysres.json b/js/data/locale/es/BO/sysres.json
index 69b0a9ca20..2b2e181f05 100644
--- a/js/data/locale/es/BO/sysres.json
+++ b/js/data/locale/es/BO/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -44,6 +43,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/BO/unitfmt.json b/js/data/locale/es/BO/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/BO/unitfmt.json
+++ b/js/data/locale/es/BO/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/BR/ctrynames.json b/js/data/locale/es/BR/ctrynames.json
index ac730288f0..89ece596a0 100644
--- a/js/data/locale/es/BR/ctrynames.json
+++ b/js/data/locale/es/BR/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
@@ -271,12 +271,12 @@
     "Territorio Británico del Océano Índico": "IO",
     "Territorios Australes Franceses": "TF",
     "Territorios Palestinos": "PS",
-    "Timor-Leste": "TL",
+    "Timor Oriental": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
     "Trinidad y Tobago": "TT",
-    "Tristán da Cunha": "TA",
+    "Tristán de Acuña": "TA",
     "Túnez": "TN",
     "Turkmenistán": "TM",
     "Turquía": "TR",
diff --git a/js/data/locale/es/BR/ctryreverse.json b/js/data/locale/es/BR/ctryreverse.json
index 26b7346f45..a9bd3540f8 100644
--- a/js/data/locale/es/BR/ctryreverse.json
+++ b/js/data/locale/es/BR/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
@@ -252,7 +252,7 @@
     "SX": "Sint Maarten",
     "SY": "Siria",
     "SZ": "Esuatini",
-    "TA": "Tristán da Cunha",
+    "TA": "Tristán de Acuña",
     "TC": "Islas Turcas y Caicos",
     "TD": "Chad",
     "TF": "Territorios Australes Franceses",
@@ -260,7 +260,7 @@
     "TH": "Tailandia",
     "TJ": "Tayikistán",
     "TK": "Tokelau",
-    "TL": "Timor-Leste",
+    "TL": "Timor Oriental",
     "TM": "Turkmenistán",
     "TN": "Túnez",
     "TO": "Tonga",
diff --git a/js/data/locale/es/BR/delimiters.jf b/js/data/locale/es/BR/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/BR/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/BR/numfmt.jf b/js/data/locale/es/BR/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/BR/numfmt.jf
+++ b/js/data/locale/es/BR/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/BR/sysres.json b/js/data/locale/es/BR/sysres.json
index 69b0a9ca20..96b1c2dada 100644
--- a/js/data/locale/es/BR/sysres.json
+++ b/js/data/locale/es/BR/sysres.json
@@ -5,14 +5,17 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "B1": "a.m.",
+    "B5": "p.m.",
     "E3": "M",
     "G-1": "a.e.c.",
     "G1": "e.c.",
+    "a0": "a.m.",
+    "a1": "p.m.",
     "c0": "D",
     "c1": "L",
     "c2": "M",
@@ -44,6 +47,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/BR/unitfmt.json b/js/data/locale/es/BR/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/BR/unitfmt.json
+++ b/js/data/locale/es/BR/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/BZ/ctrynames.json b/js/data/locale/es/BZ/ctrynames.json
index ac730288f0..89ece596a0 100644
--- a/js/data/locale/es/BZ/ctrynames.json
+++ b/js/data/locale/es/BZ/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
@@ -271,12 +271,12 @@
     "Territorio Británico del Océano Índico": "IO",
     "Territorios Australes Franceses": "TF",
     "Territorios Palestinos": "PS",
-    "Timor-Leste": "TL",
+    "Timor Oriental": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
     "Trinidad y Tobago": "TT",
-    "Tristán da Cunha": "TA",
+    "Tristán de Acuña": "TA",
     "Túnez": "TN",
     "Turkmenistán": "TM",
     "Turquía": "TR",
diff --git a/js/data/locale/es/BZ/ctryreverse.json b/js/data/locale/es/BZ/ctryreverse.json
index 26b7346f45..a9bd3540f8 100644
--- a/js/data/locale/es/BZ/ctryreverse.json
+++ b/js/data/locale/es/BZ/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
@@ -252,7 +252,7 @@
     "SX": "Sint Maarten",
     "SY": "Siria",
     "SZ": "Esuatini",
-    "TA": "Tristán da Cunha",
+    "TA": "Tristán de Acuña",
     "TC": "Islas Turcas y Caicos",
     "TD": "Chad",
     "TF": "Territorios Australes Franceses",
@@ -260,7 +260,7 @@
     "TH": "Tailandia",
     "TJ": "Tayikistán",
     "TK": "Tokelau",
-    "TL": "Timor-Leste",
+    "TL": "Timor Oriental",
     "TM": "Turkmenistán",
     "TN": "Túnez",
     "TO": "Tonga",
diff --git a/js/data/locale/es/BZ/delimiters.jf b/js/data/locale/es/BZ/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/BZ/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/BZ/numfmt.jf b/js/data/locale/es/BZ/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/BZ/numfmt.jf
+++ b/js/data/locale/es/BZ/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/BZ/sysres.json b/js/data/locale/es/BZ/sysres.json
index 69b0a9ca20..96b1c2dada 100644
--- a/js/data/locale/es/BZ/sysres.json
+++ b/js/data/locale/es/BZ/sysres.json
@@ -5,14 +5,17 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "B1": "a.m.",
+    "B5": "p.m.",
     "E3": "M",
     "G-1": "a.e.c.",
     "G1": "e.c.",
+    "a0": "a.m.",
+    "a1": "p.m.",
     "c0": "D",
     "c1": "L",
     "c2": "M",
@@ -44,6 +47,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/BZ/unitfmt.json b/js/data/locale/es/BZ/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/BZ/unitfmt.json
+++ b/js/data/locale/es/BZ/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/CL/ctrynames.json b/js/data/locale/es/CL/ctrynames.json
index 738155eee8..eaabe4ea8d 100644
--- a/js/data/locale/es/CL/ctrynames.json
+++ b/js/data/locale/es/CL/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sahara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/CL/ctryreverse.json b/js/data/locale/es/CL/ctryreverse.json
index 647721d7fa..89b9968a30 100644
--- a/js/data/locale/es/CL/ctryreverse.json
+++ b/js/data/locale/es/CL/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/CL/dateformats.json b/js/data/locale/es/CL/dateformats.json
index 009e9ce422..9811522e98 100644
--- a/js/data/locale/es/CL/dateformats.json
+++ b/js/data/locale/es/CL/dateformats.json
@@ -81,6 +81,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/CL/delimiters.jf b/js/data/locale/es/CL/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/CL/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/CL/numfmt.jf b/js/data/locale/es/CL/numfmt.jf
index 7db6b1fe14..e3ded0a122 100644
--- a/js/data/locale/es/CL/numfmt.jf
+++ b/js/data/locale/es/CL/numfmt.jf
@@ -4,6 +4,8 @@
         "currencyFormats": {
             "common": "{s}{n}",
             "commonNegative": "{s}-{n}"
-        }
+        },
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/CL/sysres.json b/js/data/locale/es/CL/sysres.json
index fb42076622..7f08f237b7 100644
--- a/js/data/locale/es/CL/sysres.json
+++ b/js/data/locale/es/CL/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -99,6 +98,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/CL/unitfmt.json b/js/data/locale/es/CL/unitfmt.json
index 78837a4f79..1e85cb69bd 100644
--- a/js/data/locale/es/CL/unitfmt.json
+++ b/js/data/locale/es/CL/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/CO/ctrynames.json b/js/data/locale/es/CO/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/CO/ctrynames.json
+++ b/js/data/locale/es/CO/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/CO/ctryreverse.json b/js/data/locale/es/CO/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/CO/ctryreverse.json
+++ b/js/data/locale/es/CO/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/CO/delimiters.jf b/js/data/locale/es/CO/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/CO/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/CO/numfmt.jf b/js/data/locale/es/CO/numfmt.jf
index 9e587faf8b..f25c08bb36 100644
--- a/js/data/locale/es/CO/numfmt.jf
+++ b/js/data/locale/es/CO/numfmt.jf
@@ -4,6 +4,8 @@
         "currencyFormats": {
             "common": "{s} {n}",
             "commonNegative": "-{s} {n}"
-        }
+        },
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/CO/sysres.json b/js/data/locale/es/CO/sysres.json
index 02e2ba139a..99609d76c3 100644
--- a/js/data/locale/es/CO/sysres.json
+++ b/js/data/locale/es/CO/sysres.json
@@ -13,7 +13,8 @@
     "1#1 se|#{num} sec": "one#{num} s|#{num} s",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} a.",
-    "E3": "M",
+    "B3": "m.",
+    "E3": "m",
     "G-1": "a.e.c.",
     "G1": "e.c.",
     "L1": "E",
diff --git a/js/data/locale/es/CO/unitfmt.json b/js/data/locale/es/CO/unitfmt.json
index 05a725f23d..b7edc2ed70 100644
--- a/js/data/locale/es/CO/unitfmt.json
+++ b/js/data/locale/es/CO/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/CR/ctrynames.json b/js/data/locale/es/CR/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/CR/ctrynames.json
+++ b/js/data/locale/es/CR/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/CR/ctryreverse.json b/js/data/locale/es/CR/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/CR/ctryreverse.json
+++ b/js/data/locale/es/CR/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/CR/dateformats.json b/js/data/locale/es/CR/dateformats.json
index 5d3b07ead1..2dfbc44878 100644
--- a/js/data/locale/es/CR/dateformats.json
+++ b/js/data/locale/es/CR/dateformats.json
@@ -9,6 +9,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/CR/delimiters.jf b/js/data/locale/es/CR/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/CR/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/CR/numfmt.jf b/js/data/locale/es/CR/numfmt.jf
index f956ac014f..25d25fe4fb 100644
--- a/js/data/locale/es/CR/numfmt.jf
+++ b/js/data/locale/es/CR/numfmt.jf
@@ -5,6 +5,8 @@
             "common": "{s}{n}",
             "commonNegative": "-{s}{n}"
         },
-        "groupChar": " "
+        "groupChar": " ",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/CR/sysres.json b/js/data/locale/es/CR/sysres.json
index 69b0a9ca20..2b2e181f05 100644
--- a/js/data/locale/es/CR/sysres.json
+++ b/js/data/locale/es/CR/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -44,6 +43,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/CR/unitfmt.json b/js/data/locale/es/CR/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/CR/unitfmt.json
+++ b/js/data/locale/es/CR/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/CU/ctrynames.json b/js/data/locale/es/CU/ctrynames.json
index ac730288f0..89ece596a0 100644
--- a/js/data/locale/es/CU/ctrynames.json
+++ b/js/data/locale/es/CU/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
@@ -271,12 +271,12 @@
     "Territorio Británico del Océano Índico": "IO",
     "Territorios Australes Franceses": "TF",
     "Territorios Palestinos": "PS",
-    "Timor-Leste": "TL",
+    "Timor Oriental": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
     "Trinidad y Tobago": "TT",
-    "Tristán da Cunha": "TA",
+    "Tristán de Acuña": "TA",
     "Túnez": "TN",
     "Turkmenistán": "TM",
     "Turquía": "TR",
diff --git a/js/data/locale/es/CU/ctryreverse.json b/js/data/locale/es/CU/ctryreverse.json
index 26b7346f45..a9bd3540f8 100644
--- a/js/data/locale/es/CU/ctryreverse.json
+++ b/js/data/locale/es/CU/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
@@ -252,7 +252,7 @@
     "SX": "Sint Maarten",
     "SY": "Siria",
     "SZ": "Esuatini",
-    "TA": "Tristán da Cunha",
+    "TA": "Tristán de Acuña",
     "TC": "Islas Turcas y Caicos",
     "TD": "Chad",
     "TF": "Territorios Australes Franceses",
@@ -260,7 +260,7 @@
     "TH": "Tailandia",
     "TJ": "Tayikistán",
     "TK": "Tokelau",
-    "TL": "Timor-Leste",
+    "TL": "Timor Oriental",
     "TM": "Turkmenistán",
     "TN": "Túnez",
     "TO": "Tonga",
diff --git a/js/data/locale/es/CU/dateformats.json b/js/data/locale/es/CU/dateformats.json
index 5d3b07ead1..2dfbc44878 100644
--- a/js/data/locale/es/CU/dateformats.json
+++ b/js/data/locale/es/CU/dateformats.json
@@ -9,6 +9,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/CU/delimiters.jf b/js/data/locale/es/CU/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/CU/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/CU/numfmt.jf b/js/data/locale/es/CU/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/CU/numfmt.jf
+++ b/js/data/locale/es/CU/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/CU/sysres.json b/js/data/locale/es/CU/sysres.json
index 69b0a9ca20..96b1c2dada 100644
--- a/js/data/locale/es/CU/sysres.json
+++ b/js/data/locale/es/CU/sysres.json
@@ -5,14 +5,17 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "B1": "a.m.",
+    "B5": "p.m.",
     "E3": "M",
     "G-1": "a.e.c.",
     "G1": "e.c.",
+    "a0": "a.m.",
+    "a1": "p.m.",
     "c0": "D",
     "c1": "L",
     "c2": "M",
@@ -44,6 +47,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/CU/unitfmt.json b/js/data/locale/es/CU/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/CU/unitfmt.json
+++ b/js/data/locale/es/CU/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/DO/ctrynames.json b/js/data/locale/es/DO/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/DO/ctrynames.json
+++ b/js/data/locale/es/DO/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/DO/ctryreverse.json b/js/data/locale/es/DO/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/DO/ctryreverse.json
+++ b/js/data/locale/es/DO/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/DO/delimiters.jf b/js/data/locale/es/DO/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/DO/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/DO/numfmt.jf b/js/data/locale/es/DO/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/DO/numfmt.jf
+++ b/js/data/locale/es/DO/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/DO/sysres.json b/js/data/locale/es/DO/sysres.json
index 7bb1936a38..472fa653ab 100644
--- a/js/data/locale/es/DO/sysres.json
+++ b/js/data/locale/es/DO/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}d.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}m.",
     "1#1 sec|#{num} sec": "one#{num} seg.|#{num} seg.",
@@ -17,7 +16,6 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}m.",
     "finalSeparatorLong": " y ",
     "finalSeparatorMedium": " y ",
diff --git a/js/data/locale/es/DO/unitfmt.json b/js/data/locale/es/DO/unitfmt.json
index 0c1644cce9..2589fb5b5d 100644
--- a/js/data/locale/es/DO/unitfmt.json
+++ b/js/data/locale/es/DO/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/EC/clock.jf b/js/data/locale/es/EC/clock.jf
deleted file mode 100644
index 5399494fdb..0000000000
--- a/js/data/locale/es/EC/clock.jf
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "clock": "24",
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/EC/ctrynames.json b/js/data/locale/es/EC/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/EC/ctrynames.json
+++ b/js/data/locale/es/EC/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/EC/ctryreverse.json b/js/data/locale/es/EC/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/EC/ctryreverse.json
+++ b/js/data/locale/es/EC/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/EC/dateformats.json b/js/data/locale/es/EC/dateformats.json
index 5d3b07ead1..2dfbc44878 100644
--- a/js/data/locale/es/EC/dateformats.json
+++ b/js/data/locale/es/EC/dateformats.json
@@ -9,6 +9,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/EC/delimiters.jf b/js/data/locale/es/EC/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/EC/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/EC/numfmt.jf b/js/data/locale/es/EC/numfmt.jf
index 7db6b1fe14..e3ded0a122 100644
--- a/js/data/locale/es/EC/numfmt.jf
+++ b/js/data/locale/es/EC/numfmt.jf
@@ -4,6 +4,8 @@
         "currencyFormats": {
             "common": "{s}{n}",
             "commonNegative": "{s}-{n}"
-        }
+        },
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/EC/sysres.json b/js/data/locale/es/EC/sysres.json
index 69b0a9ca20..2b2e181f05 100644
--- a/js/data/locale/es/EC/sysres.json
+++ b/js/data/locale/es/EC/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -44,6 +43,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/EC/unitfmt.json b/js/data/locale/es/EC/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/EC/unitfmt.json
+++ b/js/data/locale/es/EC/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/GT/ctrynames.json b/js/data/locale/es/GT/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/GT/ctrynames.json
+++ b/js/data/locale/es/GT/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/GT/ctryreverse.json b/js/data/locale/es/GT/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/GT/ctryreverse.json
+++ b/js/data/locale/es/GT/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/GT/dateformats.json b/js/data/locale/es/GT/dateformats.json
index 67877ae608..859c6ad00a 100644
--- a/js/data/locale/es/GT/dateformats.json
+++ b/js/data/locale/es/GT/dateformats.json
@@ -59,6 +59,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/GT/delimiters.jf b/js/data/locale/es/GT/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/GT/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/GT/numfmt.jf b/js/data/locale/es/GT/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/GT/numfmt.jf
+++ b/js/data/locale/es/GT/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/GT/sysres.json b/js/data/locale/es/GT/sysres.json
index 69b0a9ca20..2b2e181f05 100644
--- a/js/data/locale/es/GT/sysres.json
+++ b/js/data/locale/es/GT/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -44,6 +43,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/GT/unitfmt.json b/js/data/locale/es/GT/unitfmt.json
index 13b33cf6a7..a9aaa79923 100644
--- a/js/data/locale/es/GT/unitfmt.json
+++ b/js/data/locale/es/GT/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/HN/ctrynames.json b/js/data/locale/es/HN/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/HN/ctrynames.json
+++ b/js/data/locale/es/HN/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/HN/ctryreverse.json b/js/data/locale/es/HN/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/HN/ctryreverse.json
+++ b/js/data/locale/es/HN/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/HN/dateformats.json b/js/data/locale/es/HN/dateformats.json
index ac4649000a..7ddab968f0 100644
--- a/js/data/locale/es/HN/dateformats.json
+++ b/js/data/locale/es/HN/dateformats.json
@@ -39,6 +39,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/HN/delimiters.jf b/js/data/locale/es/HN/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/HN/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/HN/numfmt.jf b/js/data/locale/es/HN/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/HN/numfmt.jf
+++ b/js/data/locale/es/HN/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/HN/sysres.json b/js/data/locale/es/HN/sysres.json
index 69b0a9ca20..2b2e181f05 100644
--- a/js/data/locale/es/HN/sysres.json
+++ b/js/data/locale/es/HN/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -44,6 +43,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/HN/unitfmt.json b/js/data/locale/es/HN/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/HN/unitfmt.json
+++ b/js/data/locale/es/HN/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/MX/ctrynames.json b/js/data/locale/es/MX/ctrynames.json
index 444c63a1a3..1a2054db70 100644
--- a/js/data/locale/es/MX/ctrynames.json
+++ b/js/data/locale/es/MX/ctrynames.json
@@ -135,7 +135,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -190,7 +190,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -271,7 +271,7 @@
     "Territorio Británico del Océano Índico": "IO",
     "Territorios Australes Franceses": "TF",
     "Territorios Palestinos": "PS",
-    "Timor-Leste": "TL",
+    "Timor Oriental": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
diff --git a/js/data/locale/es/MX/ctryreverse.json b/js/data/locale/es/MX/ctryreverse.json
index 7cd97f1191..52bfd9edf8 100644
--- a/js/data/locale/es/MX/ctryreverse.json
+++ b/js/data/locale/es/MX/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -260,7 +260,7 @@
     "TH": "Tailandia",
     "TJ": "Tayikistán",
     "TK": "Tokelau",
-    "TL": "Timor-Leste",
+    "TL": "Timor Oriental",
     "TM": "Turkmenistán",
     "TN": "Túnez",
     "TO": "Tonga",
diff --git a/js/data/locale/es/MX/dateformats.json b/js/data/locale/es/MX/dateformats.json
index 212fe463d7..dc468a6096 100644
--- a/js/data/locale/es/MX/dateformats.json
+++ b/js/data/locale/es/MX/dateformats.json
@@ -27,6 +27,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/MX/delimiters.jf b/js/data/locale/es/MX/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/MX/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/MX/sysres.json b/js/data/locale/es/MX/sysres.json
index 00549b6ae5..12c733302a 100644
--- a/js/data/locale/es/MX/sysres.json
+++ b/js/data/locale/es/MX/sysres.json
@@ -6,14 +6,17 @@
     "#in {num}w": "one#en {num} sem.|#en {num} sem.",
     "#in {num}y": "one#en {num} a|#en {num} a",
     "#{num}d ago": "one#hace {num} día|#hace {num} días",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
-    "1#1 mon|#{num} mons": "one#{num} m|#{num} m",
-    "1#1 wk|#{num} wks": "one#{num} sem|#{num} sem",
+    "1#1 mon|#{num} mons": "one#{num} m.|#{num} m",
+    "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sem",
     "1#in 1 month|#in {num} months": "one#en {num} mes|#en {num} meses",
     "1#in 1 mon|#in {num} mons": "one#en {num} mes|#en {num} meses",
+    "B1": "a.m.",
+    "B5": "p.m.",
     "E3": "M",
     "G-1": "a.e.c.",
     "G1": "e.c.",
-    "durationLongDays": "one#{num} día|#{num} días",
-    "durationShortMinutes": "one#{num}m|#{num}m"
+    "MMM9": "sep",
+    "a0": "a.m.",
+    "a1": "p.m.",
+    "durationLongDays": "one#{num} día|#{num} días"
 }
\ No newline at end of file
diff --git a/js/data/locale/es/MX/unitfmt.json b/js/data/locale/es/MX/unitfmt.json
index d4533a1aad..b3e4490c00 100644
--- a/js/data/locale/es/MX/unitfmt.json
+++ b/js/data/locale/es/MX/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#B {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "one#{n} B|#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} c",
@@ -239,17 +241,17 @@
             "cubic-meter": "#{n} m³",
             "cubic-mile": "#{n} mi³",
             "cubic-yard": "#{n} yd³",
-            "cup": "one#{n} tza.|#{n} tzas.",
+            "cup": "#{n} tzas.",
             "cup-metric": "#{n} tza m",
             "dalton": "#{n} Da",
             "day": "one#{n} día|#{n} días",
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "one#{n}°|#{n} grados",
+            "degree": "#{n} grados",
             "dessert-spoon": "#{n} c/p",
             "dessert-spoon-imperial": "#{n} dstspn imp.",
-            "dot": "one#{n} pto|#{n} ptos",
+            "dot": "#{n} p",
             "dot-per-centimeter": "#{n} ppcm",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} fl dr",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
@@ -351,7 +352,7 @@
             "milliwatt": "#{n} mW",
             "minute": "#{n} min",
             "mole": "#{n} mol",
-            "month": "#{n} m",
+            "month": "one#{n} m.|#{n} m",
             "nanometer": "#{n} nm",
             "nanosecond": "#{n} ns",
             "nautical-mile": "#{n} M",
@@ -409,7 +410,7 @@
             "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
-            "week": "#{n} sem",
+            "week": "one#{n} sem.|#{n} sem",
             "yard": "#{n} yd",
             "year": "#{n} a"
         }
diff --git a/js/data/locale/es/NI/ctrynames.json b/js/data/locale/es/NI/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/NI/ctrynames.json
+++ b/js/data/locale/es/NI/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/NI/ctryreverse.json b/js/data/locale/es/NI/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/NI/ctryreverse.json
+++ b/js/data/locale/es/NI/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/NI/dateformats.json b/js/data/locale/es/NI/dateformats.json
index 5d3b07ead1..2dfbc44878 100644
--- a/js/data/locale/es/NI/dateformats.json
+++ b/js/data/locale/es/NI/dateformats.json
@@ -9,6 +9,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/NI/delimiters.jf b/js/data/locale/es/NI/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/NI/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/NI/numfmt.jf b/js/data/locale/es/NI/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/NI/numfmt.jf
+++ b/js/data/locale/es/NI/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/NI/sysres.json b/js/data/locale/es/NI/sysres.json
index 69b0a9ca20..2b2e181f05 100644
--- a/js/data/locale/es/NI/sysres.json
+++ b/js/data/locale/es/NI/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -44,6 +43,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/NI/unitfmt.json b/js/data/locale/es/NI/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/NI/unitfmt.json
+++ b/js/data/locale/es/NI/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/PA/ctrynames.json b/js/data/locale/es/PA/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/PA/ctrynames.json
+++ b/js/data/locale/es/PA/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/PA/ctryreverse.json b/js/data/locale/es/PA/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/PA/ctryreverse.json
+++ b/js/data/locale/es/PA/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/PA/delimiters.jf b/js/data/locale/es/PA/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/PA/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/PA/numfmt.jf b/js/data/locale/es/PA/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/PA/numfmt.jf
+++ b/js/data/locale/es/PA/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/PA/sysres.json b/js/data/locale/es/PA/sysres.json
index 1d51632dee..3262cebc2e 100644
--- a/js/data/locale/es/PA/sysres.json
+++ b/js/data/locale/es/PA/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -45,6 +44,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/PA/unitfmt.json b/js/data/locale/es/PA/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/PA/unitfmt.json
+++ b/js/data/locale/es/PA/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/PE/clock.jf b/js/data/locale/es/PE/clock.jf
deleted file mode 100644
index 5399494fdb..0000000000
--- a/js/data/locale/es/PE/clock.jf
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "clock": "24",
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/PE/ctrynames.json b/js/data/locale/es/PE/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/PE/ctrynames.json
+++ b/js/data/locale/es/PE/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/PE/ctryreverse.json b/js/data/locale/es/PE/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/PE/ctryreverse.json
+++ b/js/data/locale/es/PE/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/PE/dateformats.json b/js/data/locale/es/PE/dateformats.json
index b0ea303f19..7a13c8ccb3 100644
--- a/js/data/locale/es/PE/dateformats.json
+++ b/js/data/locale/es/PE/dateformats.json
@@ -33,6 +33,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/PE/delimiters.jf b/js/data/locale/es/PE/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/PE/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/PE/numfmt.jf b/js/data/locale/es/PE/numfmt.jf
index 6cbb1b79ed..594685c893 100644
--- a/js/data/locale/es/PE/numfmt.jf
+++ b/js/data/locale/es/PE/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s} {n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/PE/sysres.json b/js/data/locale/es/PE/sysres.json
index c9ebc64d5d..e68e47df09 100644
--- a/js/data/locale/es/PE/sysres.json
+++ b/js/data/locale/es/PE/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -105,6 +104,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/PE/unitfmt.json b/js/data/locale/es/PE/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/PE/unitfmt.json
+++ b/js/data/locale/es/PE/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/PR/ctrynames.json b/js/data/locale/es/PR/ctrynames.json
index ac89246e39..31b6a9b380 100644
--- a/js/data/locale/es/PR/ctrynames.json
+++ b/js/data/locale/es/PR/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
@@ -271,12 +271,12 @@
     "Territorio Británico del Océano Índico": "IO",
     "Territorios Australes Franceses": "TF",
     "Territorios Palestinos": "PS",
-    "Timor-Leste": "TL",
+    "Timor Oriental": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
     "Trinidad y Tobago": "TT",
-    "Tristán da Cunha": "TA",
+    "Tristán de Acuña": "TA",
     "Túnez": "TN",
     "Turkmenistán": "TM",
     "Turquía": "TR",
diff --git a/js/data/locale/es/PR/ctryreverse.json b/js/data/locale/es/PR/ctryreverse.json
index 49656e1173..8ac4dc4835 100644
--- a/js/data/locale/es/PR/ctryreverse.json
+++ b/js/data/locale/es/PR/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
@@ -252,7 +252,7 @@
     "SX": "Sint Maarten",
     "SY": "Siria",
     "SZ": "Esuatini",
-    "TA": "Tristán da Cunha",
+    "TA": "Tristán de Acuña",
     "TC": "Islas Turcas y Caicos",
     "TD": "Chad",
     "TF": "Territorios Australes Franceses",
@@ -260,7 +260,7 @@
     "TH": "Tailandia",
     "TJ": "Tayikistán",
     "TK": "Tokelau",
-    "TL": "Timor-Leste",
+    "TL": "Timor Oriental",
     "TM": "Turkmenistán",
     "TN": "Túnez",
     "TO": "Tonga",
diff --git a/js/data/locale/es/PR/delimiters.jf b/js/data/locale/es/PR/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/PR/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/PR/numfmt.jf b/js/data/locale/es/PR/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/PR/numfmt.jf
+++ b/js/data/locale/es/PR/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/PR/sysres.json b/js/data/locale/es/PR/sysres.json
index 69b0a9ca20..2b2e181f05 100644
--- a/js/data/locale/es/PR/sysres.json
+++ b/js/data/locale/es/PR/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -44,6 +43,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/PR/unitfmt.json b/js/data/locale/es/PR/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/PR/unitfmt.json
+++ b/js/data/locale/es/PR/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/PY/ctrynames.json b/js/data/locale/es/PY/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/PY/ctrynames.json
+++ b/js/data/locale/es/PY/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/PY/ctryreverse.json b/js/data/locale/es/PY/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/PY/ctryreverse.json
+++ b/js/data/locale/es/PY/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/PY/dateformats.json b/js/data/locale/es/PY/dateformats.json
index 5d3b07ead1..2dfbc44878 100644
--- a/js/data/locale/es/PY/dateformats.json
+++ b/js/data/locale/es/PY/dateformats.json
@@ -9,6 +9,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/PY/delimiters.jf b/js/data/locale/es/PY/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/PY/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/PY/numfmt.jf b/js/data/locale/es/PY/numfmt.jf
index 33a394f07d..3081b7c9a7 100644
--- a/js/data/locale/es/PY/numfmt.jf
+++ b/js/data/locale/es/PY/numfmt.jf
@@ -4,6 +4,8 @@
         "currencyFormats": {
             "common": "{s} {n}",
             "commonNegative": "{s} -{n}"
-        }
+        },
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/PY/sysres.json b/js/data/locale/es/PY/sysres.json
index e7f43c559c..0ce42a1be4 100644
--- a/js/data/locale/es/PY/sysres.json
+++ b/js/data/locale/es/PY/sysres.json
@@ -7,7 +7,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} mes|#{num} meses",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 sec|#{num} sec": "one#{num} seg.|#{num} seg.",
@@ -66,7 +65,6 @@
     "durationLongDays": "one#{num} día|#{num} días",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
     "finalSeparatorLong": " y ",
     "finalSeparatorMedium": " y "
diff --git a/js/data/locale/es/PY/unitfmt.json b/js/data/locale/es/PY/unitfmt.json
index c137cdbb60..561a231050 100644
--- a/js/data/locale/es/PY/unitfmt.json
+++ b/js/data/locale/es/PY/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/seg.",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/seg.",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/seg.",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/seg.",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/SV/ctrynames.json b/js/data/locale/es/SV/ctrynames.json
index ac89246e39..31b6a9b380 100644
--- a/js/data/locale/es/SV/ctrynames.json
+++ b/js/data/locale/es/SV/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
@@ -271,12 +271,12 @@
     "Territorio Británico del Océano Índico": "IO",
     "Territorios Australes Franceses": "TF",
     "Territorios Palestinos": "PS",
-    "Timor-Leste": "TL",
+    "Timor Oriental": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
     "Trinidad y Tobago": "TT",
-    "Tristán da Cunha": "TA",
+    "Tristán de Acuña": "TA",
     "Túnez": "TN",
     "Turkmenistán": "TM",
     "Turquía": "TR",
diff --git a/js/data/locale/es/SV/ctryreverse.json b/js/data/locale/es/SV/ctryreverse.json
index 49656e1173..8ac4dc4835 100644
--- a/js/data/locale/es/SV/ctryreverse.json
+++ b/js/data/locale/es/SV/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
@@ -252,7 +252,7 @@
     "SX": "Sint Maarten",
     "SY": "Siria",
     "SZ": "Esuatini",
-    "TA": "Tristán da Cunha",
+    "TA": "Tristán de Acuña",
     "TC": "Islas Turcas y Caicos",
     "TD": "Chad",
     "TF": "Territorios Australes Franceses",
@@ -260,7 +260,7 @@
     "TH": "Tailandia",
     "TJ": "Tayikistán",
     "TK": "Tokelau",
-    "TL": "Timor-Leste",
+    "TL": "Timor Oriental",
     "TM": "Turkmenistán",
     "TN": "Túnez",
     "TO": "Tonga",
diff --git a/js/data/locale/es/SV/dateformats.json b/js/data/locale/es/SV/dateformats.json
index 5d3b07ead1..2dfbc44878 100644
--- a/js/data/locale/es/SV/dateformats.json
+++ b/js/data/locale/es/SV/dateformats.json
@@ -9,6 +9,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/SV/delimiters.jf b/js/data/locale/es/SV/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/SV/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/SV/numfmt.jf b/js/data/locale/es/SV/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/SV/numfmt.jf
+++ b/js/data/locale/es/SV/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/SV/sysres.json b/js/data/locale/es/SV/sysres.json
index 69b0a9ca20..2b2e181f05 100644
--- a/js/data/locale/es/SV/sysres.json
+++ b/js/data/locale/es/SV/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -44,6 +43,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/SV/unitfmt.json b/js/data/locale/es/SV/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/SV/unitfmt.json
+++ b/js/data/locale/es/SV/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/US/ctrynames.json b/js/data/locale/es/US/ctrynames.json
index 4e5ba36c8a..33f4d65ada 100644
--- a/js/data/locale/es/US/ctrynames.json
+++ b/js/data/locale/es/US/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -135,7 +135,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -189,7 +189,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -230,7 +230,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sahara Occidental": "EH",
     "Samoa": "WS",
@@ -271,7 +271,7 @@
     "Territorios alejados de Oceanía": "QO",
     "Territorios Australes Franceses": "TF",
     "Territorios Palestinos": "PS",
-    "Timor-Leste": "TL",
+    "Timor Oriental": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
diff --git a/js/data/locale/es/US/ctryreverse.json b/js/data/locale/es/US/ctryreverse.json
index 26ff07bfbc..44d0b75bbf 100644
--- a/js/data/locale/es/US/ctryreverse.json
+++ b/js/data/locale/es/US/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Territorios alejados de Oceanía",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
@@ -260,7 +260,7 @@
     "TH": "Tailandia",
     "TJ": "Tayikistán",
     "TK": "Tokelau",
-    "TL": "Timor-Leste",
+    "TL": "Timor Oriental",
     "TM": "Turkmenistán",
     "TN": "Túnez",
     "TO": "Tonga",
diff --git a/js/data/locale/es/US/delimiters.jf b/js/data/locale/es/US/delimiters.jf
new file mode 100644
index 0000000000..ff6bc9f4e5
--- /dev/null
+++ b/js/data/locale/es/US/delimiters.jf
@@ -0,0 +1,9 @@
+{
+    "delimiter": {
+        "alternateQuotationEnd": "”",
+        "alternateQuotationStart": "“",
+        "quotationEnd": "»",
+        "quotationStart": "«"
+    },
+    "generated": true
+}
\ No newline at end of file
diff --git a/js/data/locale/es/US/numfmt.jf b/js/data/locale/es/US/numfmt.jf
index 07aa9a3cab..17a9c28f7c 100644
--- a/js/data/locale/es/US/numfmt.jf
+++ b/js/data/locale/es/US/numfmt.jf
@@ -6,6 +6,8 @@
             "commonNegative": "-{s}{n}"
         },
         "decimalChar": ".",
-        "groupChar": ","
+        "groupChar": ",",
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/US/sysres.json b/js/data/locale/es/US/sysres.json
index 2225522048..c9e2c9657b 100644
--- a/js/data/locale/es/US/sysres.json
+++ b/js/data/locale/es/US/sysres.json
@@ -2,16 +2,18 @@
     "#in {num}d": "one#dentro de {num} día|#dentro de {num} días",
     "#{num}d ago": "one#hace {num} día|#hace {num} días",
     "#{num}w": "one#{num}sem.|#{num}sems.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m|#{num} mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 yr|#{num} yrs": "one#{num} a|#{num} aa.",
+    "B1": "a.m.",
+    "B5": "p.m.",
     "E3": "M",
     "G-1": "a.e.c.",
     "G1": "e.c.",
+    "a0": "a.m.",
+    "a1": "p.m.",
     "durationLongDays": "one#{num} día|#{num} días",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "finalSeparatorLong": " y ",
     "finalSeparatorMedium": " y "
 }
\ No newline at end of file
diff --git a/js/data/locale/es/US/unitfmt.json b/js/data/locale/es/US/unitfmt.json
index 198afd20b5..d6f330fa76 100644
--- a/js/data/locale/es/US/unitfmt.json
+++ b/js/data/locale/es/US/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Escala Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bsh",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -239,7 +241,7 @@
             "cubic-meter": "#{n} m³",
             "cubic-mile": "#{n} mi³",
             "cubic-yard": "#{n} yd³",
-            "cup": "one#{n} tza.|#{n} tzas.",
+            "cup": "#{n} tzas.",
             "cup-metric": "#{n} tza m",
             "dalton": "#{n} Da",
             "day": "one#{n} día|#{n} días",
@@ -249,7 +251,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} cdapostre",
             "dessert-spoon-imperial": "one#{n} cdapostre imp.|#{n} cdaspostre imp.",
-            "dot": "#{n} px",
+            "dot": "#{n} p",
             "dot-per-centimeter": "#{n} ppcm",
             "dot-per-inch": "#{n} ppp",
             "dram": "one#{n} fl dracma|#{n} fl dracmas",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/UY/ctrynames.json b/js/data/locale/es/UY/ctrynames.json
index ac730288f0..89ece596a0 100644
--- a/js/data/locale/es/UY/ctrynames.json
+++ b/js/data/locale/es/UY/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
@@ -271,12 +271,12 @@
     "Territorio Británico del Océano Índico": "IO",
     "Territorios Australes Franceses": "TF",
     "Territorios Palestinos": "PS",
-    "Timor-Leste": "TL",
+    "Timor Oriental": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
     "Trinidad y Tobago": "TT",
-    "Tristán da Cunha": "TA",
+    "Tristán de Acuña": "TA",
     "Túnez": "TN",
     "Turkmenistán": "TM",
     "Turquía": "TR",
diff --git a/js/data/locale/es/UY/ctryreverse.json b/js/data/locale/es/UY/ctryreverse.json
index 26b7346f45..a9bd3540f8 100644
--- a/js/data/locale/es/UY/ctryreverse.json
+++ b/js/data/locale/es/UY/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
@@ -252,7 +252,7 @@
     "SX": "Sint Maarten",
     "SY": "Siria",
     "SZ": "Esuatini",
-    "TA": "Tristán da Cunha",
+    "TA": "Tristán de Acuña",
     "TC": "Islas Turcas y Caicos",
     "TD": "Chad",
     "TF": "Territorios Australes Franceses",
@@ -260,7 +260,7 @@
     "TH": "Tailandia",
     "TJ": "Tayikistán",
     "TK": "Tokelau",
-    "TL": "Timor-Leste",
+    "TL": "Timor Oriental",
     "TM": "Turkmenistán",
     "TN": "Túnez",
     "TO": "Tonga",
diff --git a/js/data/locale/es/UY/dateformats.json b/js/data/locale/es/UY/dateformats.json
index 571a397662..15105597d1 100644
--- a/js/data/locale/es/UY/dateformats.json
+++ b/js/data/locale/es/UY/dateformats.json
@@ -15,6 +15,12 @@
             }
         },
         "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
             "24": {
                 "ah": "HH",
                 "ahm": "HH:mm",
diff --git a/js/data/locale/es/UY/delimiters.jf b/js/data/locale/es/UY/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/UY/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/UY/numfmt.jf b/js/data/locale/es/UY/numfmt.jf
index 9e587faf8b..f25c08bb36 100644
--- a/js/data/locale/es/UY/numfmt.jf
+++ b/js/data/locale/es/UY/numfmt.jf
@@ -4,6 +4,8 @@
         "currencyFormats": {
             "common": "{s} {n}",
             "commonNegative": "-{s} {n}"
-        }
+        },
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/UY/sysres.json b/js/data/locale/es/UY/sysres.json
index c9ebc64d5d..e68e47df09 100644
--- a/js/data/locale/es/UY/sysres.json
+++ b/js/data/locale/es/UY/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -105,6 +104,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/UY/unitfmt.json b/js/data/locale/es/UY/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/UY/unitfmt.json
+++ b/js/data/locale/es/UY/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/VE/ctrynames.json b/js/data/locale/es/VE/ctrynames.json
index 0af05f458c..cf9ceae9d4 100644
--- a/js/data/locale/es/VE/ctrynames.json
+++ b/js/data/locale/es/VE/ctrynames.json
@@ -16,7 +16,7 @@
     "Anguila": "AI",
     "Antártida": "AQ",
     "Antigua y Barbuda": "AG",
-    "Arabia Saudí": "SA",
+    "Arabia Saudita": "SA",
     "Argelia": "DZ",
     "Argentina": "AR",
     "Armenia": "AM",
@@ -136,7 +136,7 @@
     "Islas Cocos": "CC",
     "Islas Cook": "CK",
     "Islas Feroe": "FO",
-    "Islas Georgia del Sur y Sandwich del Sur": "GS",
+    "Islas Georgia del Sur y Sándwich del Sur": "GS",
     "Islas Heard y McDonald": "HM",
     "Islas Malvinas": "FK",
     "Islas Marianas del Norte": "MP",
@@ -191,7 +191,7 @@
     "Montenegro": "ME",
     "Montserrat": "MS",
     "Mozambique": "MZ",
-    "Mundo": "001",
+    "mundo": "001",
     "Myanmar (Birmania)": "MM",
     "Naciones Unidas": "UN",
     "Namibia": "NA",
@@ -232,7 +232,7 @@
     "República Dominicana": "DO",
     "Reunión": "RE",
     "Ruanda": "RW",
-    "Rumanía": "RO",
+    "Rumania": "RO",
     "Rusia": "RU",
     "Sáhara Occidental": "EH",
     "Samoa": "WS",
diff --git a/js/data/locale/es/VE/ctryreverse.json b/js/data/locale/es/VE/ctryreverse.json
index 1f6ed98efb..1364c2c762 100644
--- a/js/data/locale/es/VE/ctryreverse.json
+++ b/js/data/locale/es/VE/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "Mundo",
+    "001": "mundo",
     "002": "África",
     "003": "América del Norte",
     "005": "Sudamérica",
@@ -126,7 +126,7 @@
     "GP": "Guadalupe",
     "GQ": "Guinea Ecuatorial",
     "GR": "Grecia",
-    "GS": "Islas Georgia del Sur y Sandwich del Sur",
+    "GS": "Islas Georgia del Sur y Sándwich del Sur",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Guinea-Bisáu",
@@ -227,11 +227,11 @@
     "QA": "Catar",
     "QO": "Islas Ultramarinas",
     "RE": "Reunión",
-    "RO": "Rumanía",
+    "RO": "Rumania",
     "RS": "Serbia",
     "RU": "Rusia",
     "RW": "Ruanda",
-    "SA": "Arabia Saudí",
+    "SA": "Arabia Saudita",
     "SB": "Islas Salomón",
     "SC": "Seychelles",
     "SD": "Sudán",
diff --git a/js/data/locale/es/VE/delimiters.jf b/js/data/locale/es/VE/delimiters.jf
deleted file mode 100644
index b894a1618d..0000000000
--- a/js/data/locale/es/VE/delimiters.jf
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "delimiter": {
-        "alternateQuotationEnd": "’",
-        "alternateQuotationStart": "‘",
-        "quotationEnd": "”",
-        "quotationStart": "“"
-    },
-    "generated": true
-}
\ No newline at end of file
diff --git a/js/data/locale/es/VE/numfmt.jf b/js/data/locale/es/VE/numfmt.jf
index 7db6b1fe14..e3ded0a122 100644
--- a/js/data/locale/es/VE/numfmt.jf
+++ b/js/data/locale/es/VE/numfmt.jf
@@ -4,6 +4,8 @@
         "currencyFormats": {
             "common": "{s}{n}",
             "commonNegative": "{s}-{n}"
-        }
+        },
+        "negativepctFmt": "-{n}%",
+        "pctFmt": "{n}%"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/es/VE/sysres.json b/js/data/locale/es/VE/sysres.json
index 261d0cf8cc..16b5fad2b5 100644
--- a/js/data/locale/es/VE/sysres.json
+++ b/js/data/locale/es/VE/sysres.json
@@ -5,7 +5,6 @@
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "#{num}y": "one#{num}a.|#{num}aa.",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
@@ -63,6 +62,5 @@
     "durationLongDays": "one#{num} d.|#{num} dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num}m.|#{num}mm."
 }
\ No newline at end of file
diff --git a/js/data/locale/es/VE/unitfmt.json b/js/data/locale/es/VE/unitfmt.json
index d97faa730c..fba4077c40 100644
--- a/js/data/locale/es/VE/unitfmt.json
+++ b/js/data/locale/es/VE/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,13 +218,14 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
             "bushel": "#{n} bu",
-            "byte": "#{n} B",
-            "byte-per-hour": "#{n} B/h",
-            "byte-per-second": "#{n} B/s",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} ct",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/es/sysres.json b/js/data/locale/es/sysres.json
index aca5304201..133b5877ff 100644
--- a/js/data/locale/es/sysres.json
+++ b/js/data/locale/es/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#dentro de {num} s|#dentro de {num} s",
     "#in {num}w": "one#dentro de {num} sem.|#dentro de {num} sem.",
     "#in {num}y": "one#dentro de {num} a|#dentro de {num} a",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}d|#{num}d",
     "#{num}d ago": "one#hace {num} d|#hace {num} d",
     "#{num}h": "one#{num}h|#{num}h",
@@ -26,12 +26,12 @@
     "1#1 hour ago|#{num} hours ago": "one#hace {num} hora|#hace {num} horas",
     "1#1 hour|#{num} hours": "one#{num} hora|#{num} horas",
     "1#1 hr ago|#{num} hrs ago": "one#hace {num} hora|#hace {num} horas",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisegundo|#{num} milisegundos",
     "1#1 min ago|#{num} min ago": "one#hace {num} minuto|#hace {num} minutos",
     "1#1 minute ago|#{num} minutes ago": "one#hace {num} minuto|#hace {num} minutos",
     "1#1 minute|#{num} minutes": "one#{num} minuto|#{num} minutos",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}min|#{num}min",
     "1#1 mon ago|#{num} mons ago": "one#hace {num} mes|#hace {num} meses",
     "1#1 month ago|#{num} months ago": "one#hace {num} mes|#hace {num} meses",
@@ -41,7 +41,7 @@
     "1#1 sec ago|#{num} sec ago": "one#hace {num} segundo|#hace {num} segundos",
     "1#1 second ago|#{num} seconds ago": "one#hace {num} segundo|#hace {num} segundos",
     "1#1 second|#{num} seconds": "one#{num} segundo|#{num} segundos",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
     "1#1 se|#{num} sec": "one#{num}s|#{num}s",
     "1#1 week ago|#{num} weeks ago": "one#hace {num} semana|#hace {num} semanas",
     "1#1 week|#{num} weeks": "one#{num} semana|#{num} semanas",
@@ -151,7 +151,7 @@
     "NN9": "se",
     "a0": "a. m.",
     "a1": "p. m.",
-    "durationLongDays": "one#{num} d|#{num} d",
+    "durationLongDays": "#{num} d",
     "durationMediumHours": "one#{num}h|#{num}h",
     "durationMediumMillis": "one#{num}ms|#{num}ms",
     "durationMediumWeeks": "one#{num}sem|#{num}sem",
diff --git a/js/data/locale/es/unitfmt.json b/js/data/locale/es/unitfmt.json
index 62f1e134c7..034884245f 100644
--- a/js/data/locale/es/unitfmt.json
+++ b/js/data/locale/es/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmósfera|#{n} atmósferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barriles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidad térmica británica|#{n} unidades térmicas británicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
@@ -263,7 +265,6 @@
             "fathom": "#{n} ftm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/et/ctrynames.json b/js/data/locale/et/ctrynames.json
index bc5d6dc976..b5d9aea269 100644
--- a/js/data/locale/et/ctrynames.json
+++ b/js/data/locale/et/ctrynames.json
@@ -49,7 +49,6 @@
     "Colombia": "CO",
     "Cooki saared": "CK",
     "Costa Rica": "CR",
-    "Côte d’Ivoire": "CI",
     "Curaçao": "CW",
     "Diego Garcia": "DG",
     "Djibouti": "DJ",
@@ -60,6 +59,7 @@
     "Egiptus": "EG",
     "Ekvatoriaal-Guinea": "GQ",
     "El Salvador": "SV",
+    "Elevandiluurannik": "CI",
     "Eritrea": "ER",
     "Etioopia": "ET",
     "euroala": "EZ",
@@ -88,7 +88,6 @@
     "Hiina": "CN",
     "Hispaania": "ES",
     "Holland": "NL",
-    "Hollandi Kariibi mere saared": "BQ",
     "Honduras": "HN",
     "Hongkongi erihalduspiirkond": "HK",
     "Horvaatia": "HR",
@@ -116,6 +115,7 @@
     "Kamerun": "CM",
     "Kanaari saared": "IC",
     "Kanada": "CA",
+    "Kariibi Madalmaad": "BQ",
     "Kariibi piirkond": "029",
     "Kasahstan": "KZ",
     "Katar": "QA",
diff --git a/js/data/locale/et/ctryreverse.json b/js/data/locale/et/ctryreverse.json
index e2559bd0b7..8c8dc1b903 100644
--- a/js/data/locale/et/ctryreverse.json
+++ b/js/data/locale/et/ctryreverse.json
@@ -60,7 +60,7 @@
     "BM": "Bermuda",
     "BN": "Brunei",
     "BO": "Boliivia",
-    "BQ": "Hollandi Kariibi mere saared",
+    "BQ": "Kariibi Madalmaad",
     "BR": "Brasiilia",
     "BS": "Bahama",
     "BT": "Bhutan",
@@ -74,7 +74,7 @@
     "CF": "Kesk-Aafrika Vabariik",
     "CG": "Kongo Vabariik",
     "CH": "Šveits",
-    "CI": "Côte d’Ivoire",
+    "CI": "Elevandiluurannik",
     "CK": "Cooki saared",
     "CL": "Tšiili",
     "CM": "Kamerun",
diff --git a/js/data/locale/et/sysres.json b/js/data/locale/et/sysres.json
index 1e8a81a79d..d22cba2abc 100644
--- a/js/data/locale/et/sysres.json
+++ b/js/data/locale/et/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#{num} sek pärast|#{num} sek pärast",
     "#in {num}w": "one#{num} näd pärast|#{num} näd pärast",
     "#in {num}y": "one#{num} a pärast|#{num} a pärast",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} p|#{num} p",
     "#{num}d ago": "one#{num} p eest|#{num} p eest",
     "#{num}h": "one#{num} t|#{num} t",
@@ -31,8 +31,8 @@
     "1#1 min ago|#{num} min ago": "one#{num} minuti eest|#{num} minuti eest",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minuti eest|#{num} minuti eest",
     "1#1 minute|#{num} minutes": "one#{num} minut|#{num} minutit",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "one#{num} kuu eest|#{num} kuu eest",
     "1#1 month ago|#{num} months ago": "one#{num} kuu eest|#{num} kuu eest",
     "1#1 month|#{num} months": "one#{num} kuu|#{num} kuud",
@@ -152,11 +152,11 @@
     "NN9": "se",
     "durationLongDays": "one#{num} päev|#{num} päeva",
     "durationMediumHours": "one#{num} t|#{num} t",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} n|#{num} n",
     "durationMediumYears": "one#{num} a|#{num} a",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|#{num} min",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
     "durationShortMonths": "one#{num} k|#{num} k",
     "finalSeparatorFull": ", ",
     "finalSeparatorLong": ", ",
diff --git a/js/data/locale/et/unitfmt.json b/js/data/locale/et/unitfmt.json
index fb9f0b9fba..02799333df 100644
--- a/js/data/locale/et/unitfmt.json
+++ b/js/data/locale/et/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfäär|#{n} atmosfääri",
             "bar": "one#{n} baar|#{n} baari",
             "barrel": "one#{n} barrel|#{n} barrelit",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bitt|#{n} bitti",
             "bit-per-second": "#{n} bitti sekundis",
             "british-thermal-unit": "one#{n} Briti soojusühik|#{n} Briti soojusühikut",
@@ -56,7 +57,7 @@
             "fathom": "one#{n} süld|#{n} sülda",
             "fluid-ounce": "one#{n} vedelikuunts|#{n} vedelikuuntsi",
             "fluid-ounce-imperial": "#{n} inglise vedelikuuntsi",
-            "foodcalorie": "one#{n} toidukalor|#{n} toidukalorit",
+            "foodcalorie": "one#{n} kalor|#{n} kalorit",
             "foot": "one#{n} jalg|#{n} jalga",
             "foot-per-second": "#{n} jalga sekundis",
             "furlong": "one#{n} furlong|#{n} furlongi",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} baar|#{n} baari",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/sek",
             "british-thermal-unit": "#{n} Btu",
@@ -262,7 +264,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Cal",
+            "foodcalorie": "#{n} cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/sek",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/eu/dateformats.json b/js/data/locale/eu/dateformats.json
index 884f175eaf..f2c77022f1 100644
--- a/js/data/locale/eu/dateformats.json
+++ b/js/data/locale/eu/dateformats.json
@@ -91,36 +91,31 @@
                 "s": "yy/M"
             }
         },
-        "order": {
-            "f": "{date} ({time})",
-            "l": "{date} ({time})",
-            "m": "{date}, {time}",
-            "s": "{date}, {time}"
-        },
+        "order": "{date} ({time})",
         "range": {
             "c00": {
                 "f": "{sy}(e)ko {sm}ren {sd}(a) ({st}) – ({et})",
                 "l": "{sy}(e)ko {sm}ren {sd}(a) ({st}) – ({et})",
-                "m": "{sy}(e)ko {sm} {sd}(a), {st} – {et}",
-                "s": "{sy}/{sm}/{sd}, {st} – {et}"
+                "m": "{sy}(e)ko {sm} {sd}(a) ({st}) – ({et})",
+                "s": "{sy}/{sm}/{sd} ({st}) – ({et})"
             },
             "c01": {
                 "f": "{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})",
                 "l": "{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})",
-                "m": "{sy}(e)ko {sm} {sd}(a), {st} – {ey}(e)ko {em} {ed}(a), {et}",
-                "s": "{sy}/{sm}/{sd}, {st} – {ey}/{em}/{ed}, {et}"
+                "m": "{sy}(e)ko {sm} {sd}(a) ({st}) – {ey}(e)ko {em} {ed}(a) ({et})",
+                "s": "{sy}/{sm}/{sd} ({st}) – {ey}/{em}/{ed} ({et})"
             },
             "c02": {
                 "f": "{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})",
                 "l": "{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})",
-                "m": "{sy}(e)ko {sm} {sd}(a), {st} – {ey}(e)ko {em} {ed}(a), {et}",
-                "s": "{sy}/{sm}/{sd}, {st} – {ey}/{em}/{ed}, {et}"
+                "m": "{sy}(e)ko {sm} {sd}(a) ({st}) – {ey}(e)ko {em} {ed}(a) ({et})",
+                "s": "{sy}/{sm}/{sd} ({st}) – {ey}/{em}/{ed} ({et})"
             },
             "c03": {
                 "f": "{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})",
                 "l": "{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})",
-                "m": "{sy}(e)ko {sm} {sd}(a), {st} – {ey}(e)ko {em} {ed}(a), {et}",
-                "s": "{sy}/{sm}/{sd}, {st} – {ey}/{em}/{ed}, {et}"
+                "m": "{sy}(e)ko {sm} {sd}(a) ({st}) – {ey}(e)ko {em} {ed}(a) ({et})",
+                "s": "{sy}/{sm}/{sd} ({st}) – {ey}/{em}/{ed} ({et})"
             },
             "c10": {
                 "f": "{sy}(e)ko {sm}ren {sd}(a) – {ed}",
@@ -175,4 +170,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/eu/sysres.json b/js/data/locale/eu/sysres.json
index f524484ab4..18228124f5 100644
--- a/js/data/locale/eu/sysres.json
+++ b/js/data/locale/eu/sysres.json
@@ -6,50 +6,50 @@
     "#in {num}s": "one#{num} segundo barru|#{num} segundo barru",
     "#in {num}w": "one#{num} aste barru|#{num} aste barru",
     "#in {num}y": "one#{num} urte barru|#{num} urte barru",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} e.|#{num} e.",
-    "#{num}d ago": "one#Duela {num} egun|#Duela {num} egun",
-    "#{num}h": "one#{num} h|#{num} h",
-    "#{num}h ago": "one#Duela {num} ordu|#Duela {num} ordu",
-    "#{num}mi ago": "one#Duela {num} minutu|#Duela {num} minutu",
-    "#{num}mo ago": "one#Duela {num} hilabete|#Duela {num} hilabete",
-    "#{num}s": "one#{num} s|#{num} s",
-    "#{num}s ago": "one#Duela {num} segundo|#Duela {num} segundo",
+    "#{num}d ago": "one#duela {num} egun|#duela {num} egun",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "one#duela {num} ordu|#duela {num} ordu",
+    "#{num}mi ago": "one#duela {num} minutu|#duela {num} minutu",
+    "#{num}mo ago": "one#duela {num} hilabete|#duela {num} hilabete",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "one#duela {num} segundo|#duela {num} segundo",
     "#{num}w": "one#{num} aste|#{num} aste",
-    "#{num}w ago": "one#Duela {num} aste|#Duela {num} aste",
+    "#{num}w ago": "one#duela {num} aste|#duela {num} aste",
     "#{num}y": "one#{num} u.|#{num} u.",
-    "#{num}y ago": "one#Duela {num} urte|#Duela {num} urte",
-    "1#1 day ago|#{num} days ago": "one#Duela {num} egun|#Duela {num} egun",
+    "#{num}y ago": "one#duela {num} urte|#duela {num} urte",
+    "1#1 day ago|#{num} days ago": "one#duela {num} egun|#duela {num} egun",
     "1#1 day|#{num} days": "one#{num} egun|#{num} egun",
-    "1#1 dy ago|#{num} dys ago": "one#Duela {num} egun|#Duela {num} egun",
+    "1#1 dy ago|#{num} dys ago": "one#duela {num} egun|#duela {num} egun",
     "1#1 dy|#{num} dys": "one#{num} e.|#{num} e.",
-    "1#1 hour ago|#{num} hours ago": "one#Duela {num} ordu|#Duela {num} ordu",
+    "1#1 hour ago|#{num} hours ago": "one#duela {num} ordu|#duela {num} ordu",
     "1#1 hour|#{num} hours": "one#{num} ordu|#{num} ordu",
-    "1#1 hr ago|#{num} hrs ago": "one#Duela {num} ordu|#Duela {num} ordu",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "one#duela {num} ordu|#duela {num} ordu",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisegundo|#{num} milisegundo",
-    "1#1 min ago|#{num} min ago": "one#Duela {num} minutu|#Duela {num} minutu",
-    "1#1 minute ago|#{num} minutes ago": "one#Duela {num} minutu|#Duela {num} minutu",
+    "1#1 min ago|#{num} min ago": "one#duela {num} minutu|#duela {num} minutu",
+    "1#1 minute ago|#{num} minutes ago": "one#duela {num} minutu|#duela {num} minutu",
     "1#1 minute|#{num} minutes": "one#{num} minutu|#{num} minutu",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mon ago|#{num} mons ago": "one#Duela {num} hilabete|#Duela {num} hilabete",
-    "1#1 month ago|#{num} months ago": "one#Duela {num} hilabete|#Duela {num} hilabete",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "one#duela {num} hilabete|#duela {num} hilabete",
+    "1#1 month ago|#{num} months ago": "one#duela {num} hilabete|#duela {num} hilabete",
     "1#1 month|#{num} months": "one#{num} hilabete|#{num} hilabete",
     "1#1 mon|#{num} mons": "one#{num} hilabete|#{num} hilabete",
     "1#1 mo|#{num} mos": "one#{num} hil|#{num} hil",
-    "1#1 sec ago|#{num} sec ago": "one#Duela {num} segundo|#Duela {num} segundo",
-    "1#1 second ago|#{num} seconds ago": "one#Duela {num} segundo|#Duela {num} segundo",
+    "1#1 sec ago|#{num} sec ago": "one#duela {num} segundo|#duela {num} segundo",
+    "1#1 second ago|#{num} seconds ago": "one#duela {num} segundo|#duela {num} segundo",
     "1#1 second|#{num} seconds": "one#{num} segundo|#{num} segundo",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 se|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 week ago|#{num} weeks ago": "one#Duela {num} aste|#Duela {num} aste",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "one#duela {num} aste|#duela {num} aste",
     "1#1 week|#{num} weeks": "one#{num} aste|#{num} aste",
-    "1#1 wk ago|#{num} wks ago": "one#Duela {num} aste|#Duela {num} aste",
+    "1#1 wk ago|#{num} wks ago": "one#duela {num} aste|#duela {num} aste",
     "1#1 wk|#{num} wks": "one#{num} aste|#{num} aste",
-    "1#1 year ago|#{num} years ago": "one#Duela {num} urte|#Duela {num} urte",
+    "1#1 year ago|#{num} years ago": "one#duela {num} urte|#duela {num} urte",
     "1#1 year|#{num} years": "one#{num} urte|#{num} urte",
-    "1#1 yr ago|#{num} yrs ago": "one#Duela {num} urte|#Duela {num} urte",
+    "1#1 yr ago|#{num} yrs ago": "one#duela {num} urte|#duela {num} urte",
     "1#1 yr|#{num} yrs": "one#{num} urte|#{num} urte",
     "1#in 1 day|#in {num} days": "one#{num} egun barru|#{num} egun barru",
     "1#in 1 dy|#in {num} dys": "one#{num} egun barru|#{num} egun barru",
@@ -201,12 +201,12 @@
     "NN8": "ab",
     "NN9": "ir",
     "durationLongDays": "one#{num} egun|#{num} egun",
-    "durationMediumHours": "one#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} aste|#{num} aste",
     "durationMediumYears": "one#{num} u.|#{num} u.",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|#{num} min",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
     "durationShortMonths": "one#{num} hil|#{num} hil",
     "finalSeparatorFull": " eta ",
     "finalSeparatorLong": " eta ",
diff --git a/js/data/locale/eu/unitfmt.json b/js/data/locale/eu/unitfmt.json
index 78ecf975fa..39ccf9429f 100644
--- a/js/data/locale/eu/unitfmt.json
+++ b/js/data/locale/eu/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfera",
             "bar": "#{n} bar",
             "barrel": "#{n} upel",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit segundo bakoitzeko",
             "british-thermal-unit": "#{n} Btu",
@@ -63,7 +64,7 @@
             "g-force": "#{n} grabitate-indar",
             "gallon": "#{n} galoi",
             "gallon-imperial": "#{n} galoi brit.",
-            "generic": "#{n}°",
+            "generic": "one#{n} °|#{n} °",
             "gigabit": "#{n} gigabit",
             "gigabit-per-second": "#{n} gigabit segundo bakoitzeko",
             "gigabyte": "#{n} gigabyte",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atmosfera",
             "bar": "#{n} bar",
             "barrel": "#{n} upel",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} postre-koilar.",
             "dessert-spoon-imperial": "#{n} postre-koilar. inp.",
-            "dot": "one#{n} puntu|#{n} ptu",
+            "dot": "#{n} puntu",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
@@ -262,14 +264,13 @@
             "fathom": "#{n} fm",
             "fluid-ounce": "#{n} likido-ontza",
             "fluid-ounce-imperial": "#{n} likido-ontza inperial",
-            "foodcalorie": "#{n} cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} galoi",
             "gallon-imperial": "#{n} gal brit.",
-            "generic": "#{n}°",
+            "generic": "#{n} °",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
             "gigabyte": "#{n} GB",
@@ -324,7 +325,7 @@
             "megahertz": "#{n} MHz",
             "megaliter": "#{n} Ml",
             "megapascal": "#{n} MPa",
-            "megapixel": "#{n} Mp",
+            "megapixel": "#{n} MP",
             "megawatt": "#{n} MW",
             "meter": "#{n} m",
             "meter-per-second": "#{n} m/s",
@@ -370,8 +371,8 @@
             "pinch": "#{n} pinch",
             "pint": "#{n} pinta",
             "pint-metric": "#{n} pinta metriko",
-            "pixel": "#{n} p",
-            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "one#{n} px/cm|#{n} px/cm",
             "pixel-per-inch": "#{n} ppi",
             "point": "#{n} pt",
             "pound": "#{n} lb",
diff --git a/js/data/locale/ewo/ctrynames.json b/js/data/locale/ewo/ctrynames.json
index 8e8b77419c..77e20cc64a 100644
--- a/js/data/locale/ewo/ctrynames.json
+++ b/js/data/locale/ewo/ctrynames.json
@@ -36,6 +36,7 @@
     "Bosəní ai ɛrəzegovín": "BA",
     "Botswaná": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Buləgarí": "BG",
     "Buləkiná Fasó": "BF",
     "Buluné": "BN",
@@ -187,7 +188,6 @@
     "Ǹkpámɛn Zeláŋ": "NZ",
     "Ǹnam Amɛrəkə": "US",
     "Ǹnam Engəlis": "GB",
-    "ǹnam ɛngəlís yá Máŋ mə́ ɛ́ndə": "IO",
     "ǹnam Kongó Demokəlatíg": "CD",
     "ńnam Minlán ɛ́ngəlís": "VG",
     "Ǹnam Palɛsətín": "PS",
diff --git a/js/data/locale/ewo/ctryreverse.json b/js/data/locale/ewo/ctryreverse.json
index 030bc4932d..4b1471d908 100644
--- a/js/data/locale/ewo/ctryreverse.json
+++ b/js/data/locale/ewo/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isəraɛ́l",
     "IM": "Isle of Man",
     "IN": "ɛ́ndə",
-    "IO": "ǹnam ɛngəlís yá Máŋ mə́ ɛ́ndə",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irág",
     "IR": "Irán",
     "IS": "Isəlándə",
diff --git a/js/data/locale/ewo/unitfmt.json b/js/data/locale/ewo/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ewo/unitfmt.json
+++ b/js/data/locale/ewo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/fa/AF/sysres.json b/js/data/locale/fa/AF/sysres.json
index b7bbe31d69..faa09cbb30 100644
--- a/js/data/locale/fa/AF/sysres.json
+++ b/js/data/locale/fa/AF/sysres.json
@@ -85,17 +85,29 @@
     "LLLL9": "سپتمبر",
     "LLLL9-persian": "آذر",
     "MMM1": "جنو",
+    "MMM1-persian": "حمل",
     "MMM10": "اکتوبر",
+    "MMM10-persian": "جدی",
     "MMM11": "نومبر",
+    "MMM11-persian": "دلو",
     "MMM12": "دسم",
+    "MMM12-persian": "حوت",
     "MMM2": "فبروری",
+    "MMM2-persian": "ثور",
     "MMM3": "مارچ",
+    "MMM3-persian": "جوزا",
     "MMM4": "اپریل",
+    "MMM4-persian": "سرطان",
     "MMM5": "می",
+    "MMM5-persian": "اسد",
     "MMM6": "جون",
+    "MMM6-persian": "سنبلهٔ",
     "MMM7": "جول",
+    "MMM7-persian": "میزان",
     "MMM8": "اگست",
+    "MMM8-persian": "عقرب",
     "MMM9": "سپتمبر",
+    "MMM9-persian": "قوس",
     "MMMM1": "جنوری",
     "MMMM1-persian": "حمل",
     "MMMM10": "اکتوبر",
@@ -121,14 +133,37 @@
     "MMMM9": "سپتمبر",
     "MMMM9-persian": "قوس",
     "N1": "ج",
+    "N1-persian": "ح",
+    "N10-persian": "ج",
+    "N11-persian": "د",
+    "N12-persian": "ح",
+    "N2-persian": "ث",
+    "N3-persian": "ج",
     "N4": "ا",
+    "N4-persian": "س",
+    "N5-persian": "ا",
     "N6": "ج",
+    "N6-persian": "س",
     "N7": "ج",
+    "N8-persian": "ع",
+    "N9-persian": "ق",
     "NN1": "جن",
+    "NN1-persian": "حم",
+    "NN10-persian": "جد",
+    "NN11-persian": "دل",
+    "NN12-persian": "حو",
     "NN2": "فب",
+    "NN2-persian": "ثو",
+    "NN3-persian": "جو",
     "NN4": "اپ",
+    "NN4-persian": "سر",
     "NN5": "می",
+    "NN5-persian": "اس",
     "NN6": "جو",
+    "NN6-persian": "سن",
     "NN7": "جو",
-    "NN8": "اگ"
+    "NN7-persian": "می",
+    "NN8": "اگ",
+    "NN8-persian": "عق",
+    "NN9-persian": "قو"
 }
\ No newline at end of file
diff --git a/js/data/locale/fa/unitfmt.json b/js/data/locale/fa/unitfmt.json
index 6cb192f1d4..3ed10991bc 100644
--- a/js/data/locale/fa/unitfmt.json
+++ b/js/data/locale/fa/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} اتمسفر",
             "bar": "#{n} بار",
             "barrel": "#{n} بشکه",
+            "beaufort": "#{n} بوفورت",
             "bit": "#{n} بیت",
             "bit-per-second": "#{n} بیت در ثانیه",
             "british-thermal-unit": "#{n} بی‌تی‌یو",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} اتمسفر",
             "bar": "#{n} بار",
             "barrel": "#{n} بشکه",
+            "beaufort": "#{n} بوفورت",
             "bit": "#{n} بیت",
             "bit-per-second": "#{n} بیت در ثانیه",
             "british-thermal-unit": "#{n} بی‌تی‌یو",
@@ -228,7 +230,7 @@
             "carat": "#{n} قیراط",
             "celsius": "#{n}°C",
             "centiliter": "#{n}cL",
-            "centimeter": "#{n} س.م",
+            "centimeter": "#{n} سانتی‌متر",
             "century": "#{n} سده",
             "coordinateUnit": "",
             "cubic-centimeter": "#{n}‎ cm³",
@@ -244,7 +246,7 @@
             "day": "#{n} روز",
             "decade": "#{n} دهه",
             "deciliter": "#{n}dL",
-            "decimeter": "#{n} دس.م",
+            "decimeter": "#{n} دسی‌متر",
             "degree": "#{n} درجه",
             "dessert-spoon": "#{n} ق.دس.خ.",
             "dessert-spoon-imperial": "#{n} ق.دس. انگلیسی",
@@ -301,10 +303,10 @@
             "kilogram": "#{n} کیلوگرم",
             "kilohertz": "#{n} ک.هرتز",
             "kilojoule": "#{n} ک.ژول",
-            "kilometer": "#{n} km",
+            "kilometer": "#{n} کیلومتر",
             "kilometer-per-hour": "#{n}‎ km/h",
-            "kilometer-per-liter": "#{n} km‎/L",
-            "kilometer-per-second": "#{n} km در ثانیه",
+            "kilometer-per-liter": "#{n} کیلومتر‎/L",
+            "kilometer-per-second": "#{n} کیلومتر در ثانیه",
             "kilopascal": "#{n} ک.پاسکال",
             "kilowatt": "#{n} ک.وات",
             "kilowatt-hour": "#{n} ک.و.ساعت",
@@ -326,11 +328,11 @@
             "megapascal": "#{n} مگاپاسکال",
             "megapixel": "#{n} MP",
             "megawatt": "#{n} مگاوات",
-            "meter": "#{n} m",
+            "meter": "#{n}متر",
             "meter-per-second": "#{n} m/s",
             "meter-per-square-second": "#{n}‎ m/s²",
             "microgram": "#{n} میکروگرم",
-            "micrometer": "#{n} μm",
+            "micrometer": "#{n} میکرومتر",
             "microsecond": "#{n}μs",
             "mile": "#{n} مایل",
             "mile-per-gallon": "#{n} مایل در گالن",
@@ -343,7 +345,7 @@
             "milligram": "#{n} میلی‌گرم",
             "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
             "milliliter": "#{n} میلی‌لیتر",
-            "millimeter": "#{n} mm",
+            "millimeter": "#{n} میلی‌متر",
             "millimeter-ofhg": "#{n} م‌م جیوه",
             "millimole-per-liter": "#{n} mmol/L",
             "millisecond": "#{n} میلی‌ثانیه",
@@ -351,7 +353,7 @@
             "minute": "#{n} دقیقه",
             "mole": "#{n} مول",
             "month": "#{n} ماه",
-            "nanometer": "#{n} ن.م",
+            "nanometer": "#{n} نانومتر",
             "nanosecond": "#{n} نانوثانیه",
             "nautical-mile": "#{n} مایل دریایی",
             "newton": "#{n} نیوتن",
@@ -366,7 +368,7 @@
             "permillion": "#{n} ppm",
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
-            "picometer": "#{n} پ.م",
+            "picometer": "#{n} پیکومتر",
             "pinch": "#{n} سرانگشت",
             "pint": "#{n} پاینت",
             "pint-metric": "#{n} پاینت متریک",
@@ -380,7 +382,7 @@
             "pound-force-per-square-inch": "#{n}‎ psi",
             "quart": "#{n} کوارت",
             "quart-imperial": "#{n} کوارت انگلیسی",
-            "quarter": "#{n} سه‌ماهه",
+            "quarter": "#{n} فصل",
             "radian": "#{n} رادیان",
             "revolution": "#{n} دور",
             "second": "#{n} ثانیه",
diff --git a/js/data/locale/ff/Adlm/BF/ctrynames.json b/js/data/locale/ff/Adlm/BF/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/BF/ctrynames.json
+++ b/js/data/locale/ff/Adlm/BF/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/BF/ctryreverse.json b/js/data/locale/ff/Adlm/BF/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/BF/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/BF/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/BF/unitfmt.json b/js/data/locale/ff/Adlm/BF/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/BF/unitfmt.json
+++ b/js/data/locale/ff/Adlm/BF/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/CM/ctrynames.json b/js/data/locale/ff/Adlm/CM/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/CM/ctrynames.json
+++ b/js/data/locale/ff/Adlm/CM/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/CM/ctryreverse.json b/js/data/locale/ff/Adlm/CM/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/CM/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/CM/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/CM/unitfmt.json b/js/data/locale/ff/Adlm/CM/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/CM/unitfmt.json
+++ b/js/data/locale/ff/Adlm/CM/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/GH/ctrynames.json b/js/data/locale/ff/Adlm/GH/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/GH/ctrynames.json
+++ b/js/data/locale/ff/Adlm/GH/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/GH/ctryreverse.json b/js/data/locale/ff/Adlm/GH/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/GH/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/GH/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/GH/unitfmt.json b/js/data/locale/ff/Adlm/GH/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/GH/unitfmt.json
+++ b/js/data/locale/ff/Adlm/GH/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/GM/ctrynames.json b/js/data/locale/ff/Adlm/GM/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/GM/ctrynames.json
+++ b/js/data/locale/ff/Adlm/GM/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/GM/ctryreverse.json b/js/data/locale/ff/Adlm/GM/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/GM/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/GM/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/GM/unitfmt.json b/js/data/locale/ff/Adlm/GM/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/GM/unitfmt.json
+++ b/js/data/locale/ff/Adlm/GM/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/GW/ctrynames.json b/js/data/locale/ff/Adlm/GW/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/GW/ctrynames.json
+++ b/js/data/locale/ff/Adlm/GW/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/GW/ctryreverse.json b/js/data/locale/ff/Adlm/GW/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/GW/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/GW/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/GW/unitfmt.json b/js/data/locale/ff/Adlm/GW/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/GW/unitfmt.json
+++ b/js/data/locale/ff/Adlm/GW/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/LR/ctrynames.json b/js/data/locale/ff/Adlm/LR/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/LR/ctrynames.json
+++ b/js/data/locale/ff/Adlm/LR/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/LR/ctryreverse.json b/js/data/locale/ff/Adlm/LR/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/LR/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/LR/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/LR/unitfmt.json b/js/data/locale/ff/Adlm/LR/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/LR/unitfmt.json
+++ b/js/data/locale/ff/Adlm/LR/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/MR/ctrynames.json b/js/data/locale/ff/Adlm/MR/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/MR/ctrynames.json
+++ b/js/data/locale/ff/Adlm/MR/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/MR/ctryreverse.json b/js/data/locale/ff/Adlm/MR/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/MR/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/MR/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/MR/unitfmt.json b/js/data/locale/ff/Adlm/MR/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/MR/unitfmt.json
+++ b/js/data/locale/ff/Adlm/MR/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/NE/ctrynames.json b/js/data/locale/ff/Adlm/NE/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/NE/ctrynames.json
+++ b/js/data/locale/ff/Adlm/NE/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/NE/ctryreverse.json b/js/data/locale/ff/Adlm/NE/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/NE/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/NE/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/NE/unitfmt.json b/js/data/locale/ff/Adlm/NE/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/NE/unitfmt.json
+++ b/js/data/locale/ff/Adlm/NE/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/NG/ctrynames.json b/js/data/locale/ff/Adlm/NG/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/NG/ctrynames.json
+++ b/js/data/locale/ff/Adlm/NG/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/NG/ctryreverse.json b/js/data/locale/ff/Adlm/NG/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/NG/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/NG/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/NG/unitfmt.json b/js/data/locale/ff/Adlm/NG/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/NG/unitfmt.json
+++ b/js/data/locale/ff/Adlm/NG/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/SL/ctrynames.json b/js/data/locale/ff/Adlm/SL/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/SL/ctrynames.json
+++ b/js/data/locale/ff/Adlm/SL/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/SL/ctryreverse.json b/js/data/locale/ff/Adlm/SL/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/SL/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/SL/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/SL/unitfmt.json b/js/data/locale/ff/Adlm/SL/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/SL/unitfmt.json
+++ b/js/data/locale/ff/Adlm/SL/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/SN/ctrynames.json b/js/data/locale/ff/Adlm/SN/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/SN/ctrynames.json
+++ b/js/data/locale/ff/Adlm/SN/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/SN/ctryreverse.json b/js/data/locale/ff/Adlm/SN/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/SN/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/SN/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/SN/unitfmt.json b/js/data/locale/ff/Adlm/SN/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/SN/unitfmt.json
+++ b/js/data/locale/ff/Adlm/SN/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Adlm/ctrynames.json b/js/data/locale/ff/Adlm/ctrynames.json
index e15d78ccc4..f1a8590a11 100644
--- a/js/data/locale/ff/Adlm/ctrynames.json
+++ b/js/data/locale/ff/Adlm/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "𞤀𞤣𞤵𞤲𞤢": "001",
     "𞤀𞤤𞤦𞤢𞤲𞤭𞤴𞤢𞥄": "AL",
@@ -279,7 +280,6 @@
     "𞤚𞤮𞤺𞤮": "TG",
     "𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵": "TK",
     "𞤚𞤵𞤥𞤦𞤫 𞤂𞤫𞤧𞤤𞤫𞤴𞤶𞤫 𞤊𞤪𞤢𞤲𞤧𞤭": "TF",
-    "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭": "IO",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄": "013",
     "𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄": "017",
     "𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢": "143",
diff --git a/js/data/locale/ff/Adlm/ctryreverse.json b/js/data/locale/ff/Adlm/ctryreverse.json
index 8be462c949..99601b93f1 100644
--- a/js/data/locale/ff/Adlm/ctryreverse.json
+++ b/js/data/locale/ff/Adlm/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "𞤋𞤧𞤪𞤢𞥄𞤴𞤭𞥅𞤤",
     "IM": "𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤫𞥅𞤲",
     "IN": "𞤋𞤲𞤣𞤭𞤴𞤢",
-    "IO": "𞤚𞤵𞤥𞤦𞤫𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭",
+    "IO": "British Indian Ocean Territory",
     "IQ": "𞤋𞤪𞤢𞥄𞤳",
     "IR": "𞤋𞤪𞤢𞥄𞤲",
     "IS": "𞤀𞤴𞤧𞤵𞤤𞤢𞤲𞤣",
diff --git a/js/data/locale/ff/Adlm/unitfmt.json b/js/data/locale/ff/Adlm/unitfmt.json
index e6548cbacd..412b4b8e90 100644
--- a/js/data/locale/ff/Adlm/unitfmt.json
+++ b/js/data/locale/ff/Adlm/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭|#{n} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭",
             "bar": "one#{n} 𞤦𞤢𞤪𞤤𞤵|#{n} 𞤦𞤢𞤪𞤤𞤭",
             "barrel": "one#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵|#{n} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭",
+            "beaufort": "#B {n}",
             "bit": "one#{n} 𞤦𞤭𞥅𞤼𞥆𞤵|#{n} 𞤦𞤭𞥅𞤼𞥆𞤭",
             "bit-per-second": "#{n} 𞤦𞤭𞥅𞤼𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "british-thermal-unit": "one#{n} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮|#{n} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮",
@@ -42,9 +43,6 @@
             "degree": "one#{n} 𞤶𞤫𞤩𞤫𞤪𞤫|#{n} 𞤶𞤫𞤩𞤫",
             "dessert-spoon": "#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭",
             "dessert-spoon-imperial": "one#{n} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.|#{n} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤",
-            "dot-per-inch": "one#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵|#{n} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵",
             "dram": "#{n} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵",
             "drop": "one#{n} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫|#{n} 𞤷𞤭𞤲𞤼𞤫",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤣𞤫|#{n} 𞤶𞤮𞤤𞥆𞤢𞤲𞤯𞤫",
             "fluid-ounce": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲",
             "fluid-ounce-imperial": "one#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤣𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵|#{n} 𞤱𞤢𞤺𞤭𞤴𞤢𞤲𞤯𞤫 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵",
-            "foodcalorie": "one#{n} 𞤐𞤺𞤵𞤤𞤵|#{n} 𞤐𞤺𞤵𞤤𞤭",
             "foot": "one#{n} 𞤼𞤫𞤨𞥆𞤵|#{n} 𞤼𞤫𞤨𞥆𞤭",
             "foot-per-second": "#{n} 𞤼𞤫𞤨𞥆𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫",
             "furlong": "one#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤵|#{n} 𞤬𞤵𞤪𞤤𞤮𞤲𞤺𞤭",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} 𞤦𞤫𞤧",
             "bar": "#{n} 𞤦𞤢𞤪",
             "barrel": "#{n} 𞤺𞤮𞤺",
+            "beaufort": "#B {n}",
             "bit": "#{n} 𞤦",
             "bit-per-second": "#{n} 𞤦/𞤳𞤭𞤲",
             "british-thermal-unit": "#{n} 𞤑𞤺𞤦",
@@ -248,9 +246,6 @@
             "degree": "#{n} 𞤶𞤫𞤩",
             "dessert-spoon": "#{n} 𞤳𞤤𞤤",
             "dessert-spoon-imperial": "#{n} 𞤳𞤤𞤤 𞤚𞤭𞤤.",
-            "dot": "#{n} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫",
-            "dot-per-centimeter": "#{n} 𞤼𞤩𞤧𞤥",
-            "dot-per-inch": "#{n} 𞤼𞤩𞤺𞤰",
             "dram": "#{n} 𞤣𞤪 𞤧𞤫𞤤",
             "drop": "one#{n} 𞤧𞤭𞤲|#{n} 𞤷𞤭𞤲",
             "dunam": "one#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵|#{n} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭",
@@ -262,7 +257,6 @@
             "fathom": "#{n} 𞤶𞤮𞤤",
             "fluid-ounce": "#{n} 𞤱𞤺 𞤧𞤫𞤤",
             "fluid-ounce-imperial": "#{n} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤.",
-            "foodcalorie": "#{n} 𞤘𞤵𞤤",
             "foot": "#{n} 𞤼𞤨",
             "foot-per-second": "#{n} 𞤼𞤨/𞤳𞤭𞤲",
             "furlong": "#{n} 𞤬𞤵𞤪",
diff --git a/js/data/locale/ff/Latn/BF/ctrynames.json b/js/data/locale/ff/Latn/BF/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/BF/ctrynames.json
+++ b/js/data/locale/ff/Latn/BF/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/BF/ctryreverse.json b/js/data/locale/ff/Latn/BF/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/BF/ctryreverse.json
+++ b/js/data/locale/ff/Latn/BF/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/CM/ctrynames.json b/js/data/locale/ff/Latn/CM/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/CM/ctrynames.json
+++ b/js/data/locale/ff/Latn/CM/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/CM/ctryreverse.json b/js/data/locale/ff/Latn/CM/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/CM/ctryreverse.json
+++ b/js/data/locale/ff/Latn/CM/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/GH/ctrynames.json b/js/data/locale/ff/Latn/GH/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/GH/ctrynames.json
+++ b/js/data/locale/ff/Latn/GH/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/GH/ctryreverse.json b/js/data/locale/ff/Latn/GH/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/GH/ctryreverse.json
+++ b/js/data/locale/ff/Latn/GH/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/GM/ctrynames.json b/js/data/locale/ff/Latn/GM/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/GM/ctrynames.json
+++ b/js/data/locale/ff/Latn/GM/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/GM/ctryreverse.json b/js/data/locale/ff/Latn/GM/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/GM/ctryreverse.json
+++ b/js/data/locale/ff/Latn/GM/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/GN/ctrynames.json b/js/data/locale/ff/Latn/GN/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/GN/ctrynames.json
+++ b/js/data/locale/ff/Latn/GN/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/GN/ctryreverse.json b/js/data/locale/ff/Latn/GN/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/GN/ctryreverse.json
+++ b/js/data/locale/ff/Latn/GN/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/GW/ctrynames.json b/js/data/locale/ff/Latn/GW/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/GW/ctrynames.json
+++ b/js/data/locale/ff/Latn/GW/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/GW/ctryreverse.json b/js/data/locale/ff/Latn/GW/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/GW/ctryreverse.json
+++ b/js/data/locale/ff/Latn/GW/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/LR/ctrynames.json b/js/data/locale/ff/Latn/LR/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/LR/ctrynames.json
+++ b/js/data/locale/ff/Latn/LR/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/LR/ctryreverse.json b/js/data/locale/ff/Latn/LR/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/LR/ctryreverse.json
+++ b/js/data/locale/ff/Latn/LR/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/MR/ctrynames.json b/js/data/locale/ff/Latn/MR/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/MR/ctrynames.json
+++ b/js/data/locale/ff/Latn/MR/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/MR/ctryreverse.json b/js/data/locale/ff/Latn/MR/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/MR/ctryreverse.json
+++ b/js/data/locale/ff/Latn/MR/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/NE/ctrynames.json b/js/data/locale/ff/Latn/NE/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/NE/ctrynames.json
+++ b/js/data/locale/ff/Latn/NE/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/NE/ctryreverse.json b/js/data/locale/ff/Latn/NE/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/NE/ctryreverse.json
+++ b/js/data/locale/ff/Latn/NE/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/NG/ctrynames.json b/js/data/locale/ff/Latn/NG/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/NG/ctrynames.json
+++ b/js/data/locale/ff/Latn/NG/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/NG/ctryreverse.json b/js/data/locale/ff/Latn/NG/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/NG/ctryreverse.json
+++ b/js/data/locale/ff/Latn/NG/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/SL/ctrynames.json b/js/data/locale/ff/Latn/SL/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/SL/ctrynames.json
+++ b/js/data/locale/ff/Latn/SL/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/SL/ctryreverse.json b/js/data/locale/ff/Latn/SL/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/SL/ctryreverse.json
+++ b/js/data/locale/ff/Latn/SL/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/Latn/ctrynames.json b/js/data/locale/ff/Latn/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/Latn/ctrynames.json
+++ b/js/data/locale/ff/Latn/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/Latn/ctryreverse.json b/js/data/locale/ff/Latn/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/Latn/ctryreverse.json
+++ b/js/data/locale/ff/Latn/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/ctrynames.json b/js/data/locale/ff/ctrynames.json
index c506b2a702..0f209c9fcc 100644
--- a/js/data/locale/ff/ctrynames.json
+++ b/js/data/locale/ff/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosnii Hersegowiin": "BA",
     "Botswaana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulgarii": "BG",
     "Burkibaa Faaso": "BF",
     "Burnaay": "BN",
@@ -125,7 +126,6 @@
     "Kanadaa": "CA",
     "Kasakstaan": "KZ",
     "Kataar": "QA",
-    "Keeriindi britaani to maayo enndo": "IO",
     "Keñaa": "KE",
     "Kirgistaan": "KG",
     "Kiribari": "KI",
diff --git a/js/data/locale/ff/ctryreverse.json b/js/data/locale/ff/ctryreverse.json
index f7183de741..640f1f7cc8 100644
--- a/js/data/locale/ff/ctryreverse.json
+++ b/js/data/locale/ff/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israa’iila",
     "IM": "Isle of Man",
     "IN": "Enndo",
-    "IO": "Keeriindi britaani to maayo enndo",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Islannda",
diff --git a/js/data/locale/ff/unitfmt.json b/js/data/locale/ff/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ff/unitfmt.json
+++ b/js/data/locale/ff/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/fi/ctrynames.json b/js/data/locale/fi/ctrynames.json
index 5a644d617e..9db926b8d1 100644
--- a/js/data/locale/fi/ctrynames.json
+++ b/js/data/locale/fi/ctrynames.json
@@ -92,6 +92,7 @@
     "Heard ja McDonaldinsaaret": "HM",
     "Honduras": "HN",
     "Hongkong – Kiinan erityishallintoalue": "HK",
+    "Huippuvuoret ja Jan Mayen": "SJ",
     "Indonesia": "ID",
     "Intia": "IN",
     "Irak": "IQ",
@@ -252,7 +253,6 @@
     "Sudan": "SD",
     "Suomi": "FI",
     "Suriname": "SR",
-    "Svalbard ja Jan Mayen": "SJ",
     "Sveitsi": "CH",
     "Syyria": "SY",
     "Tadžikistan": "TJ",
diff --git a/js/data/locale/fi/ctryreverse.json b/js/data/locale/fi/ctryreverse.json
index dbd228e462..936af42f34 100644
--- a/js/data/locale/fi/ctryreverse.json
+++ b/js/data/locale/fi/ctryreverse.json
@@ -239,7 +239,7 @@
     "SG": "Singapore",
     "SH": "Saint Helena",
     "SI": "Slovenia",
-    "SJ": "Svalbard ja Jan Mayen",
+    "SJ": "Huippuvuoret ja Jan Mayen",
     "SK": "Slovakia",
     "SL": "Sierra Leone",
     "SM": "San Marino",
diff --git a/js/data/locale/fi/dateformats.json b/js/data/locale/fi/dateformats.json
index cf2521e4f9..d0b935cbc0 100644
--- a/js/data/locale/fi/dateformats.json
+++ b/js/data/locale/fi/dateformats.json
@@ -110,36 +110,31 @@
                 "s": "yyyy"
             }
         },
-        "order": {
-            "f": "{date} 'klo' {time}",
-            "l": "{date} 'klo' {time}",
-            "m": "{date} 'klo' {time}",
-            "s": "{date} {time}"
-        },
+        "order": "{date} 'klo' {time}",
         "range": {
             "c00": {
                 "f": "{sd}. {sm} {sy} klo {st} – {et}",
                 "l": "{sd}. {sm} {sy} klo {st} – {et}",
                 "m": "{sd}.{sm}.{sy} klo {st} – {et}",
-                "s": "{sd}.{sm}.{sy} {st} – {et}"
+                "s": "{sd}.{sm}.{sy} klo {st} – {et}"
             },
             "c01": {
                 "f": "{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}",
                 "l": "{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}",
                 "m": "{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}",
-                "s": "{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}"
+                "s": "{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}"
             },
             "c02": {
                 "f": "{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}",
                 "l": "{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}",
                 "m": "{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}",
-                "s": "{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}"
+                "s": "{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}"
             },
             "c03": {
                 "f": "{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}",
                 "l": "{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}",
                 "m": "{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}",
-                "s": "{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}"
+                "s": "{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}"
             },
             "c10": {
                 "f": "{sd} – {ed}. {em} {ey}",
diff --git a/js/data/locale/fi/sysres.json b/js/data/locale/fi/sysres.json
index ed1d301a4e..55f085f267 100644
--- a/js/data/locale/fi/sysres.json
+++ b/js/data/locale/fi/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#{num} s päästä|#{num} s päästä",
     "#in {num}w": "one#{num} vk päästä|#{num} vk päästä",
     "#in {num}y": "one#{num} v päästä|#{num} v päästä",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}pv|#{num}pv",
     "#{num}d ago": "one#{num} pv sitten|#{num} pv sitten",
     "#{num}h": "one#{num}t|#{num}t",
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#{num} minuutti sitten|#{num} minuuttia sitten",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minuutti sitten|#{num} minuuttia sitten",
     "1#1 minute|#{num} minutes": "one#{num} minuutti|#{num} minuuttia",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}min|#{num}min",
     "1#1 mon ago|#{num} mons ago": "one#{num} kuukausi sitten|#{num} kuukautta sitten",
     "1#1 month ago|#{num} months ago": "one#{num} kuukausi sitten|#{num} kuukautta sitten",
@@ -41,7 +41,7 @@
     "1#1 sec ago|#{num} sec ago": "one#{num} sekunti sitten|#{num} sekuntia sitten",
     "1#1 second ago|#{num} seconds ago": "one#{num} sekunti sitten|#{num} sekuntia sitten",
     "1#1 second|#{num} seconds": "one#{num} sekunti|#{num} sekuntia",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
     "1#1 se|#{num} sec": "one#{num}s|#{num}s",
     "1#1 week ago|#{num} weeks ago": "one#{num} viikko sitten|#{num} viikkoa sitten",
     "1#1 week|#{num} weeks": "one#{num} viikko|#{num} viikkoa",
diff --git a/js/data/locale/fi/unitfmt.json b/js/data/locale/fi/unitfmt.json
index 3b99e744b7..0ce25172c3 100644
--- a/js/data/locale/fi/unitfmt.json
+++ b/js/data/locale/fi/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} normaali-ilmakehä|#{n} normaali-ilmakehää",
             "bar": "one#{n} baari|#{n} baaria",
             "barrel": "one#{n} barreli|#{n} barrelia",
+            "beaufort": "one#{n} bofori|#{n} boforia",
             "bit": "one#{n} bitti|#{n} bittiä",
             "bit-per-second": "#{n} bittiä / sekunti",
             "british-thermal-unit": "one#{n} brittiläinen terminen yksikkö|#{n} brittiläistä termistä yksikköä",
@@ -43,8 +44,8 @@
             "dessert-spoon": "one#{n} jälkiruokalusikka|#{n} jälkiruokalusikkaa",
             "dessert-spoon-imperial": "one#{n} br. jälkiruokalusikka|#{n} br. jälkiruokalusikkaa",
             "dot": "one#{n} piste|#{n} pistettä",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} dpi",
+            "dot-per-centimeter": "one#{n} piste senttimetrillä|#{n} pistettä senttimetrillä",
+            "dot-per-inch": "one#{n} piste tuumalla|#{n} pistettä tuumalla",
             "dram": "one#{n} dram|#{n} dramia",
             "drop": "one#{n} tippa|#{n} tippaa",
             "dunam": "one#{n} dunam|#{n} dunamia",
@@ -166,7 +167,7 @@
             "pint-metric": "one#{n} tuoppi|#{n} tuoppia",
             "pixel": "one#{n} pikseli|#{n} pikseliä",
             "pixel-per-centimeter": "one#{n} pikseli / senttimetri|#{n} pikseliä / senttimetri",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-inch": "one#{n} pikseli tuumalla|#{n} pikseliä tuumalla",
             "point": "#{n} pt",
             "pound": "one#{n} pauna|#{n} paunaa",
             "pound-force": "one#{n} pauna-voima|#{n} pauna-voimaa",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,7 @@
             "dessert-spoon": "#{n} jrkl",
             "dessert-spoon-imperial": "#{n} br. jrkl",
             "dot": "one#{n} piste|#{n} pistettä",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-inch": "#{n} dpi",
             "dram": "one#{n} dram|#{n} dramia",
             "drop": "one#{n} tippa|#{n} tippaa",
             "dunam": "one#{n} dunam|#{n} dunamia",
@@ -262,7 +263,6 @@
             "fathom": "one#{n} fm|#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz br.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/fil/ctrynames.json b/js/data/locale/fil/ctrynames.json
index 517ad99a29..142f1c75aa 100644
--- a/js/data/locale/fil/ctrynames.json
+++ b/js/data/locale/fil/ctrynames.json
@@ -35,7 +35,6 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazil": "BR",
-    "British Indian Ocean Territory": "IO",
     "British Virgin Islands": "VG",
     "Brunei": "BN",
     "Bulgaria": "BG",
@@ -261,6 +260,7 @@
     "Taiwan": "TW",
     "Tajikistan": "TJ",
     "Tanzania": "TZ",
+    "Teritoryo sa Karagatan ng British Indian": "IO",
     "Thailand": "TH",
     "Timog Amerika": "005",
     "Timog Korea": "KR",
diff --git a/js/data/locale/fil/ctryreverse.json b/js/data/locale/fil/ctryreverse.json
index ff4c369f82..0223b2e4da 100644
--- a/js/data/locale/fil/ctryreverse.json
+++ b/js/data/locale/fil/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "British Indian Ocean Territory",
+    "IO": "Teritoryo sa Karagatan ng British Indian",
     "IQ": "Iraq",
     "IR": "Iran",
     "IS": "Iceland",
diff --git a/js/data/locale/fil/sysres.json b/js/data/locale/fil/sysres.json
index e119d2941c..13e2811bdc 100644
--- a/js/data/locale/fil/sysres.json
+++ b/js/data/locale/fil/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#sa {num} seg.|#sa {num} seg.",
     "#in {num}w": "one#sa {num} linggo|#sa {num} linggo",
     "#in {num}y": "one#sa {num} taon|#sa {num} taon",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} araw|#{num} na araw",
     "#{num}d ago": "one#{num} araw ang nakalipas|#{num} (na) araw ang nakalipas",
     "#{num}h": "one#{num} oras|#{num} oras",
diff --git a/js/data/locale/fil/unitfmt.json b/js/data/locale/fil/unitfmt.json
index 48d2dc7a38..7f4122ba4e 100644
--- a/js/data/locale/fil/unitfmt.json
+++ b/js/data/locale/fil/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosphere|#{n} atmospheres",
             "bar": "#{n} bar",
             "barrel": "#{n} bariles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} na bit",
             "bit-per-second": "#{n} na bit kada segundo",
             "british-thermal-unit": "#{n} British thermal unit",
@@ -56,7 +57,7 @@
             "fathom": "one#{n} fathom|#{n} na fathom",
             "fluid-ounce": "one#{n} fluid ounce|#{n} na fluid ounce",
             "fluid-ounce-imperial": "#{n} Imp. fluid ounce",
-            "foodcalorie": "one#{n} Calorie|#{n} na Calories",
+            "foodcalorie": "#{n} Calorie",
             "foot": "one#{n} talampakan|#{n} na talampakan",
             "foot-per-second": "#{n} na talampakan kada segundo",
             "furlong": "one#{n} furlong|#{n} na furlong",
@@ -138,7 +139,7 @@
             "milligram-ofglucose-per-deciliter": "one#{n} milligram per deciliter|#{n} milligrams per deciliter",
             "milliliter": "#{n} mililitro",
             "millimeter": "one#{n} milimetro|#{n} na milimetro",
-            "millimeter-ofhg": "one#{n} millimetro ng mercury|#{n} na milimetro ng asoge",
+            "millimeter-ofhg": "one#{n} milimetro ng asoge|#{n} na milimetro ng asoge",
             "millimole-per-liter": "one#{n} millimole per liter|#{n} millimoles per liter",
             "millisecond": "#{n} milisegundo",
             "milliwatt": "one#{n} milliwatt|#{n} na milliwatt",
@@ -161,7 +162,7 @@
             "permyriad": "#{n} permyriad",
             "petabyte": "one#{n} petabyte|#{n} petabytes",
             "picometer": "#{n} picometer",
-            "pinch": "#{n} karampot",
+            "pinch": "#{n} kurot",
             "pint": "one#{n} pint|#{n} pints",
             "pint-metric": "one#{n} metric pint|#{n} na metric pint",
             "pixel": "#{n} pixel",
@@ -190,8 +191,8 @@
             "square-mile": "one#{n} milya kwadrado|#{n} na milya kwadrado",
             "square-yard": "one#{n} yardang parisukat|#{n} na yardang parisukat",
             "stone": "one#{n} stone|#{n} stones",
-            "tablespoon": "one#{n} kutsara|#{n} na kutsara",
-            "teaspoon": "one#{n} kutsarita|#{n} na kutsarita",
+            "tablespoon": "#{n} kutsara",
+            "teaspoon": "#{n} kutsarita",
             "terabit": "one#{n} terabit|#{n} na terabit",
             "terabit-per-second": "#{n} na terabit kada segundo",
             "terabyte": "one#{n} terabyte|#{n} na terabyte",
@@ -199,7 +200,7 @@
             "terabyte-per-second": "#{n} na terabyte kada segundo",
             "therm-us": "#{n} US therm",
             "ton": "#{n} tonelada",
-            "tonne": "one#{n} toneladang metriko|#{n} na toneladang metriko",
+            "tonne": "#{n} metriko tonelada",
             "volt": "one#{n} volt|#{n} na volt",
             "watt": "one#{n} watt|#{n} na watt",
             "week": "one#{n} linggo|#{n} na linggo",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -367,7 +369,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "one#{n} pm|#{n} na pm",
-            "pinch": "#{n} karampot",
+            "pinch": "#{n} kurot",
             "pint": "#{n} pt",
             "pint-metric": "#{n} na mpt",
             "pixel": "#{n} px",
diff --git a/js/data/locale/fo/list.json b/js/data/locale/fo/list.json
index d1d027d67b..f73b8428fc 100644
--- a/js/data/locale/fo/list.json
+++ b/js/data/locale/fo/list.json
@@ -20,19 +20,15 @@
     "standard": {
         "full": {
             "2": "{0} og {1}",
-            "end": "{0} og {1}"
+            "end": "{0}, og {1}"
         },
         "long": {
             "2": "{0} og {1}",
-            "end": "{0} og {1}"
+            "end": "{0}, og {1}"
         },
         "medium": {
-            "2": "{0} og {1}",
-            "end": "{0} og {1}"
-        },
-        "short": {
-            "2": "{0} og {1}",
-            "end": "{0} og {1}"
+            "2": "{0} & {1}",
+            "end": "{0}, & {1}"
         }
     },
     "unit": {
diff --git a/js/data/locale/fo/unitfmt.json b/js/data/locale/fo/unitfmt.json
index f38658012c..dc2dd7576d 100644
--- a/js/data/locale/fo/unitfmt.json
+++ b/js/data/locale/fo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} lufttrýst",
             "bar": "#{n} bar",
             "barrel": "one#{n} tunna|#{n} tunnur",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit um sekundi",
             "british-thermal-unit": "one#{n} bretsk hitaeind|#{n} bretskar hitaeindir",
@@ -42,9 +43,6 @@
             "degree": "#{n} stig",
             "dessert-spoon": "one#{n} dessertskeið|#{n} dessertskeiðir",
             "dessert-spoon-imperial": "one#{n} bretsk dessertskeið|#{n} bretskar dessertskeiðir",
-            "dot": "#{n} punkt",
-            "dot-per-centimeter": "#{n} punkt fyri hvønn sentimetur",
-            "dot-per-inch": "#{n} punkt fyri hvønn tumma",
             "dram": "one#{n} drammur|#{n} drammar",
             "drop": "one#{n} dropi|#{n} dropar",
             "dunam": "#{n} dunam",
@@ -56,7 +54,6 @@
             "fathom": "one#{n} favnur|#{n} favnar",
             "fluid-ounce": "one#{n} flótandi unsa|#{n} flótandi unsur",
             "fluid-ounce-imperial": "one#{n} bretsk flótandi unsa|#{n} bretskar flótandi unsur",
-            "foodcalorie": "one#{n} kostkaloria|#{n} kostkaloriur",
             "foot": "one#{n} fótur|#{n} føtur",
             "foot-per-second": "#{n} føtur um sekundi",
             "furlong": "one#{n} furlongur|#{n} furlongrar",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} lufttrýst",
             "bar": "#{n} bar",
             "barrel": "one#{n} tunna|#{n} tunnur",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/sek.",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +246,6 @@
             "degree": "#{n} stig",
             "dessert-spoon": "#{n} dessertsk.",
             "dessert-spoon-imperial": "one#{n} bretsk dessertsk.|#{n} bretskar dessertsk.",
-            "dot": "#{n} punkt",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "one#{n} drammur|#{n} drammar",
             "drop": "one#{n} dropi|#{n} dropar",
             "dunam": "#{n} dunam",
@@ -262,7 +257,6 @@
             "fathom": "one#{n} favnur|#{n} favnar",
             "fluid-ounce": "one#{n} flótandi unsa|#{n} flótandi unsur",
             "fluid-ounce-imperial": "one#{n} bretsk flótandi unsa|#{n} bretskar flót. unsur",
-            "foodcalorie": "one#{n} kostkaloria|#{n} kostkaloriur",
             "foot": "one#{n} fótur|#{n} føtur",
             "foot-per-second": "#{n} føtur/sek.",
             "furlong": "one#{n} furlongur|#{n} furlongrar",
diff --git a/js/data/locale/fr/CA/ctrynames.json b/js/data/locale/fr/CA/ctrynames.json
index d0b1daac49..7fd6af5803 100644
--- a/js/data/locale/fr/CA/ctrynames.json
+++ b/js/data/locale/fr/CA/ctrynames.json
@@ -42,7 +42,7 @@
     "Barbade": "BB",
     "Bélarus": "BY",
     "Belgique": "BE",
-    "Belize": "BZ",
+    "Bélize": "BZ",
     "Bénin": "BJ",
     "Bermudes": "BM",
     "Bhoutan": "BT",
@@ -50,7 +50,7 @@
     "Bosnie-Herzégovine": "BA",
     "Botswana": "BW",
     "Brésil": "BR",
-    "Brunei": "BN",
+    "Brunéi": "BN",
     "Bulgarie": "BG",
     "Burkina Faso": "BF",
     "Burundi": "BI",
@@ -235,12 +235,12 @@
     "Rwanda": "RW",
     "Sahara occidental": "EH",
     "Saint-Barthélemy": "BL",
-    "Saint-Christophe-et-Niévès": "KN",
     "Saint-Marin": "SM",
     "Saint-Martin (France)": "MF",
     "Saint-Martin (Pays-Bas)": "SX",
     "Saint-Pierre-et-Miquelon": "PM",
     "Saint-Vincent-et-les Grenadines": "VC",
+    "Saint‑Kitts‑et‑Nevis": "KN",
     "Sainte-Hélène": "SH",
     "Sainte-Lucie": "LC",
     "Salvador": "SV",
@@ -270,7 +270,7 @@
     "Tchad": "TD",
     "Tchéquie": "CZ",
     "Terres australes françaises": "TF",
-    "territoire britannique de l’océan Indien": "IO",
+    "Territoire britannique de l’océan Indien": "IO",
     "Territoires palestiniens": "PS",
     "Thaïlande": "TH",
     "Timor-Leste": "TL",
@@ -287,7 +287,7 @@
     "Union européenne": "EU",
     "Uruguay": "UY",
     "Vanuatu": "VU",
-    "Venezuela": "VE",
+    "Vénézuéla": "VE",
     "Vietnam": "VN",
     "Wallis-et-Futuna": "WF",
     "Yémen": "YE",
diff --git a/js/data/locale/fr/CA/ctryreverse.json b/js/data/locale/fr/CA/ctryreverse.json
index 1fd0bae578..7bf40efb1d 100644
--- a/js/data/locale/fr/CA/ctryreverse.json
+++ b/js/data/locale/fr/CA/ctryreverse.json
@@ -58,7 +58,7 @@
     "BJ": "Bénin",
     "BL": "Saint-Barthélemy",
     "BM": "Bermudes",
-    "BN": "Brunei",
+    "BN": "Brunéi",
     "BO": "Bolivie",
     "BQ": "Pays-Bas caribéens",
     "BR": "Brésil",
@@ -67,7 +67,7 @@
     "BV": "île Bouvet",
     "BW": "Botswana",
     "BY": "Bélarus",
-    "BZ": "Belize",
+    "BZ": "Bélize",
     "CA": "Canada",
     "CC": "îles Cocos (Keeling)",
     "CD": "Congo-Kinshasa",
@@ -143,7 +143,7 @@
     "IL": "Israël",
     "IM": "île de Man",
     "IN": "Inde",
-    "IO": "territoire britannique de l’océan Indien",
+    "IO": "Territoire britannique de l’océan Indien",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Islande",
@@ -157,7 +157,7 @@
     "KH": "Cambodge",
     "KI": "Kiribati",
     "KM": "Comores",
-    "KN": "Saint-Christophe-et-Niévès",
+    "KN": "Saint‑Kitts‑et‑Nevis",
     "KP": "Corée du Nord",
     "KR": "Corée du Sud",
     "KW": "Koweït",
@@ -278,7 +278,7 @@
     "UZ": "Ouzbékistan",
     "VA": "Cité du Vatican",
     "VC": "Saint-Vincent-et-les Grenadines",
-    "VE": "Venezuela",
+    "VE": "Vénézuéla",
     "VG": "îles Vierges britanniques",
     "VI": "îles Vierges américaines",
     "VN": "Vietnam",
diff --git a/js/data/locale/fr/CA/sysres.json b/js/data/locale/fr/CA/sysres.json
index 016ca1230f..d77f6fb70e 100644
--- a/js/data/locale/fr/CA/sysres.json
+++ b/js/data/locale/fr/CA/sysres.json
@@ -14,7 +14,6 @@
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
     "1#1 week|#{num} weeks": "one#{num} semaine|#{num} semaines",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sem.",
-    "1#1 year|#{num} years": "one#{num} an|#{num} ans",
     "1#1 yr|#{num} yrs": "one#{num} an|#{num} ans",
     "B2": "a.m.",
     "B6": "p.m.",
diff --git a/js/data/locale/fr/CA/unitfmt.json b/js/data/locale/fr/CA/unitfmt.json
index 1be34eb1f8..9460641662 100644
--- a/js/data/locale/fr/CA/unitfmt.json
+++ b/js/data/locale/fr/CA/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosphère|#{n} atmosphères",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} baril|#{n} barils",
+            "beaufort": "one#{n} degré Beaufort|#{n} degrés Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits à la seconde",
             "british-thermal-unit": "one#{n} unité thermique britannique|#{n} unités thermiques britanniques",
@@ -200,12 +201,12 @@
             "terabyte-per-second": "#{n} téraoctets à la seconde",
             "therm-us": "one#{n} therm américain|#{n} therms américains",
             "ton": "one#{n} tonne courte|#{n} tonnes courtes",
-            "tonne": "one#{n} tonne|#{n} tonnes",
+            "tonne": "one#{n} tonne|#{n} tonnes",
             "volt": "one#{n} volt|#{n} volts",
             "watt": "one#{n} watt|#{n} watts",
             "week": "one#{n} semaine|#{n} semaines",
             "yard": "one#{n} verge|#{n} verges",
-            "year": "one#{n} an|#{n} ans"
+            "year": "one#{n} an|#{n} ans"
         },
         "short": {
             "acre": "#{n} ac",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} Bf",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -249,9 +251,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} cuill. à d.",
             "dessert-spoon-imperial": "#{n} cuill. à d. imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppp",
+            "dot": "one#{n} pt|#{n} pt",
+            "dot-per-centimeter": "#{n} pt/cm",
+            "dot-per-inch": "#{n} pt/po",
             "dram": "#{n} dram liq",
             "drop": "one#{n} goutte|#{n} gouttes",
             "dunam": "#{n} dounam",
@@ -335,7 +337,7 @@
             "microsecond": "#{n} μs",
             "mile": "#{n} mi",
             "mile-per-gallon": "#{n} mi/gal",
-            "mile-per-gallon-imperial": "#{n} mi/gal Imp",
+            "mile-per-gallon-imperial": "#{n} mi/gal imp.",
             "mile-per-hour": "#{n} mi/h",
             "mile-per-second": "#{n} mi/s",
             "mile-scandinavian": "#{n} smi",
diff --git a/js/data/locale/fr/HT/unitfmt.json b/js/data/locale/fr/HT/unitfmt.json
index 67d6258555..916abb4a30 100644
--- a/js/data/locale/fr/HT/unitfmt.json
+++ b/js/data/locale/fr/HT/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosphère|#{n} atmosphères",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} baril|#{n} barils",
+            "beaufort": "one#{n} degré Beaufort|#{n} degrés Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits par seconde",
             "british-thermal-unit": "one#{n} British Thermal Unit|#{n} British Thermal Units",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} Bft",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -263,7 +265,7 @@
             "fathom": "#{n} fm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
+            "foodcalorie": "#{n} kcal",
             "foot": "#{n} pi",
             "foot-per-second": "#{n} pi/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/fr/unitfmt.json b/js/data/locale/fr/unitfmt.json
index ceb9b55863..777f667ea7 100644
--- a/js/data/locale/fr/unitfmt.json
+++ b/js/data/locale/fr/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosphère|#{n} atmosphères",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} baril|#{n} barils",
+            "beaufort": "one#{n} degré Beaufort|#{n} degrés Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits par seconde",
             "british-thermal-unit": "one#{n} British Thermal Unit|#{n} British Thermal Units",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} Bft",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -263,7 +265,7 @@
             "fathom": "#{n} fm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
+            "foodcalorie": "#{n} kcal",
             "foot": "#{n} pi",
             "foot-per-second": "#{n} pi/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/frr/unitfmt.json b/js/data/locale/frr/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/frr/unitfmt.json
+++ b/js/data/locale/frr/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/fur/ctrynames.json b/js/data/locale/fur/ctrynames.json
index e50a23d02a..33beb7979e 100644
--- a/js/data/locale/fur/ctrynames.json
+++ b/js/data/locale/fur/ctrynames.json
@@ -49,6 +49,7 @@
     "Bosnie e Ercegovine": "BA",
     "Botswana": "BW",
     "Brasîl": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bulgarie": "BG",
     "Burkina Faso": "BF",
@@ -267,7 +268,6 @@
     "Taiwan": "TW",
     "Tanzanie": "TZ",
     "Tazikistan": "TJ",
-    "Teritori britanic dal Ocean Indian": "IO",
     "Teritoris meridionâi francês": "TF",
     "Teritoris palestinês": "PS",
     "Timor orientâl": "TL",
diff --git a/js/data/locale/fur/ctryreverse.json b/js/data/locale/fur/ctryreverse.json
index e6e7c8f481..5d356fc5ab 100644
--- a/js/data/locale/fur/ctryreverse.json
+++ b/js/data/locale/fur/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israêl",
     "IM": "Isule di Man",
     "IN": "India",
-    "IO": "Teritori britanic dal Ocean Indian",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraq",
     "IR": "Iran",
     "IS": "Islande",
diff --git a/js/data/locale/fur/unitfmt.json b/js/data/locale/fur/unitfmt.json
index 36a6b82e5a..61f15615ba 100644
--- a/js/data/locale/fur/unitfmt.json
+++ b/js/data/locale/fur/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/fy/ctrynames.json b/js/data/locale/fy/ctrynames.json
index 3d9e1debe1..9f8757246b 100644
--- a/js/data/locale/fy/ctrynames.json
+++ b/js/data/locale/fy/ctrynames.json
@@ -34,7 +34,7 @@
     "Botswana": "BW",
     "Bouveteilân": "BV",
     "Brazilië": "BR",
-    "Britse Gebieden yn de Indyske Oseaan": "IO",
+    "British Indian Ocean Territory": "IO",
     "Britse Maagdeneilannen": "VG",
     "Brunei": "BN",
     "Bulgarije": "BG",
diff --git a/js/data/locale/fy/ctryreverse.json b/js/data/locale/fy/ctryreverse.json
index 20a5f83c7b..f75c3f4392 100644
--- a/js/data/locale/fy/ctryreverse.json
+++ b/js/data/locale/fy/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israël",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Britse Gebieden yn de Indyske Oseaan",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Yslân",
diff --git a/js/data/locale/fy/sysres.json b/js/data/locale/fy/sysres.json
index fbd5fe1b5a..7d0d259804 100644
--- a/js/data/locale/fy/sysres.json
+++ b/js/data/locale/fy/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#Oer {num} sekonde|#Oer {num} sekonden",
     "#in {num}w": "one#Oer {num} wike|#Oer {num} wiken",
     "#in {num}y": "one#Oer {num} jier|#Oer {num} jier",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d|#{num} d",
     "#{num}d ago": "one#{num} dei lyn|#{num} deien lyn",
     "#{num}h": "one#{num} u|#{num} u",
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#{num} minút lyn|#{num} minuten lyn",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minút lyn|#{num} minuten lyn",
     "1#1 minute|#{num} minutes": "one#{num} minút|#{num} minuten",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num} m|#{num} m",
     "1#1 mon ago|#{num} mons ago": "one#{num} moanne lyn|#{num} moannen lyn",
     "1#1 month ago|#{num} months ago": "one#{num} moanne lyn|#{num} moannen lyn",
@@ -106,10 +106,10 @@
     "NN3": "Mr",
     "durationLongDays": "one#{num} dei|#{num} deien",
     "durationMediumHours": "one#{num} u|#{num} u",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} w|#{num} w",
     "durationMediumYears": "one#{num} jr|#{num} jr",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} m|#{num} m",
     "durationShortMonths": "one#{num} m|#{num} m",
     "finalSeparatorFull": ", ",
diff --git a/js/data/locale/fy/unitfmt.json b/js/data/locale/fy/unitfmt.json
index 15b621a1e2..9e4374c083 100644
--- a/js/data/locale/fy/unitfmt.json
+++ b/js/data/locale/fy/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ga/GB/ctrynames.json b/js/data/locale/ga/GB/ctrynames.json
index e2401310b6..a9af38138a 100644
--- a/js/data/locale/ga/GB/ctrynames.json
+++ b/js/data/locale/ga/GB/ctrynames.json
@@ -7,7 +7,7 @@
     "an Afraic Theas": "ZA",
     "an Aigéine": "009",
     "an Aigéine Imeallach": "QO",
-    "an Ailgéir": "DZ",
+    "An Ailgéir": "DZ",
     "an Airgintín": "AR",
     "an Airméin": "AM",
     "an Áise": "142",
@@ -39,23 +39,23 @@
     "an Cholóim": "CO",
     "an Chosaiv": "XK",
     "an Chróit": "HR",
-    "an Cósta Eabhair": "CI",
+    "An Cósta Eabhair": "CI",
     "an Danmhairg": "DK",
     "an Domhan": "001",
     "an Eastóin": "EE",
-    "an Éigipt": "EG",
+    "An Éigipt": "EG",
     "an Eilvéis": "CH",
     "an Eiritré": "ER",
     "an Eoraip": "150",
     "an Fhionlainn": "FI",
     "an Fhrainc": "FR",
     "an Ghabúin": "GA",
-    "an Ghaimbia": "GM",
+    "An Ghaimbia": "GM",
     "an Ghearmáin": "DE",
     "an Ghraonlainn": "GL",
     "an Ghréig": "GR",
-    "an Ghuáin": "GY",
-    "an Ghuine": "GN",
+    "An Ghuáin": "GY",
+    "An Ghuine": "GN",
     "an Ghuine Mheánchiorclach": "GQ",
     "an Iaráic": "IQ",
     "an Iaráin": "IR",
@@ -68,22 +68,22 @@
     "an Ísiltír": "NL",
     "an Ísiltír Chairibeach": "BQ",
     "an Laitvia": "LV",
-    "an Libéir": "LR",
-    "an Libia": "LY",
+    "An Libéir": "LR",
+    "An Libia": "LY",
     "an Liobáin": "LB",
     "an Liotuáin": "LT",
     "an Mhacadóin Thuaidh": "MK",
     "an Mhalaeisia": "MY",
     "an Mhaláiv": "MW",
-    "an Mháratáin": "MR",
+    "An Mháratái": "MR",
     "an Mheilinéis": "054",
     "an Mhicrinéis": "FM",
     "an Mholdóiv": "MD",
     "an Mhongóil": "MN",
     "an Mhuir Chairib": "029",
     "an Namaib": "NA",
-    "an Nigéir": "NG",
-    "an Nígir": "NE",
+    "An Nigéir": "NG",
+    "An Nígir": "NE",
     "an Nua-Chaladóin": "NC",
     "an Nua-Shéalainn": "NZ",
     "an Ostair": "AT",
@@ -96,7 +96,7 @@
     "an Ríocht Aontaithe": "GB",
     "an Rómáin": "RO",
     "an Rúis": "RU",
-    "an Sahára Thiar": "EH",
+    "An Sahára Thiar": "EH",
     "an Spáinn": "ES",
     "an Táidsíceastáin": "TJ",
     "an Tansáin": "TZ",
@@ -104,13 +104,13 @@
     "an Téalainn": "TH",
     "an Téaváin": "TW",
     "an tSaimbia": "ZM",
-    "an tSalvadóir": "SV",
+    "An tSalvadóir": "SV",
     "an tSeapáin": "JP",
     "an tSeicia": "CZ",
-    "an tSeineagáil": "SN",
+    "An tSeineagáil": "SN",
     "an tSeirbia": "RS",
     "an tSeoirsia": "GE",
-    "an tSeoirsia Theas agus Oileáin Sandwich Theas": "GS",
+    "An tSeoirsia Theas agus Oileáin Sandwich Theas": "GS",
     "an tSile": "CL",
     "an tSín": "CN",
     "an tSiombáib": "ZW",
@@ -119,9 +119,9 @@
     "an tSlóvaic": "SK",
     "an tSomáil": "SO",
     "an tSualainn": "SE",
-    "an tSúdáin": "SD",
+    "An tSúdáin": "SD",
     "an tSúdáin Theas": "SS",
-    "an Túinéis": "TN",
+    "An Tuinéis": "TN",
     "an Tuirc": "TR",
     "an Tuircméanastáin": "TM",
     "an Úcráin": "UA",
@@ -208,9 +208,9 @@
     "Mósaimbíc": "MZ",
     "na Bahámaí": "BS",
     "na Críocha Palaistíneacha": "PS",
-    "na hOileáin Chanáracha": "IC",
-    "na hOileáin Fhilipíneacha": "PH",
-    "na hOileáin Mháirianacha Thuaidh": "MP",
+    "Na hOileáin Chanáracha": "IC",
+    "Na hOileáin Fhilipíneacha": "PH",
+    "Na hOileáin Mháirianacha Thuaidh": "MP",
     "na Náisiúin Aontaithe": "UN",
     "na Séiséil": "SC",
     "Nárú": "NR",
diff --git a/js/data/locale/ga/GB/ctryreverse.json b/js/data/locale/ga/GB/ctryreverse.json
index 2c911df64b..857720d3be 100644
--- a/js/data/locale/ga/GB/ctryreverse.json
+++ b/js/data/locale/ga/GB/ctryreverse.json
@@ -74,7 +74,7 @@
     "CF": "Poblacht na hAfraice Láir",
     "CG": "Congó-Brazzaville",
     "CH": "an Eilvéis",
-    "CI": "an Cósta Eabhair",
+    "CI": "An Cósta Eabhair",
     "CK": "Oileáin Cook",
     "CL": "an tSile",
     "CM": "Camarún",
@@ -95,12 +95,12 @@
     "DK": "an Danmhairg",
     "DM": "Doiminice",
     "DO": "an Phoblacht Dhoiminiceach",
-    "DZ": "an Ailgéir",
+    "DZ": "An Ailgéir",
     "EA": "Ceuta agus Melilla",
     "EC": "Eacuadór",
     "EE": "an Eastóin",
-    "EG": "an Éigipt",
-    "EH": "an Sahára Thiar",
+    "EG": "An Éigipt",
+    "EH": "An Sahára Thiar",
     "ER": "an Eiritré",
     "ES": "an Spáinn",
     "ET": "an Aetóip",
@@ -121,23 +121,23 @@
     "GH": "Gána",
     "GI": "Giobráltar",
     "GL": "an Ghraonlainn",
-    "GM": "an Ghaimbia",
-    "GN": "an Ghuine",
+    "GM": "An Ghaimbia",
+    "GN": "An Ghuine",
     "GP": "Guadalúip",
     "GQ": "an Ghuine Mheánchiorclach",
     "GR": "an Ghréig",
-    "GS": "an tSeoirsia Theas agus Oileáin Sandwich Theas",
+    "GS": "An tSeoirsia Theas agus Oileáin Sandwich Theas",
     "GT": "Guatamala",
     "GU": "Guam",
     "GW": "Guine Bissau",
-    "GY": "an Ghuáin",
+    "GY": "An Ghuáin",
     "HK": "Sainréigiún Riaracháin Hong Cong, Daonphoblacht na Síne",
     "HM": "Oileán Heard agus Oileáin McDonald",
     "HN": "Hondúras",
     "HR": "an Chróit",
     "HT": "Háítí",
     "HU": "an Ungáir",
-    "IC": "na hOileáin Chanáracha",
+    "IC": "Na hOileáin Chanáracha",
     "ID": "an Indinéis",
     "IE": "Éire",
     "IL": "Iosrael",
@@ -168,12 +168,12 @@
     "LC": "Saint Lucia",
     "LI": "Lichtinstéin",
     "LK": "Srí Lanca",
-    "LR": "an Libéir",
+    "LR": "An Libéir",
     "LS": "Leosóta",
     "LT": "an Liotuáin",
     "LU": "Lucsamburg",
     "LV": "an Laitvia",
-    "LY": "an Libia",
+    "LY": "An Libia",
     "MA": "Maracó",
     "MC": "Monacó",
     "MD": "an Mholdóiv",
@@ -186,9 +186,9 @@
     "MM": "Maenmar (Burma)",
     "MN": "an Mhongóil",
     "MO": "Sainréigiún Riaracháin Macao, Daonphoblacht na Síne",
-    "MP": "na hOileáin Mháirianacha Thuaidh",
+    "MP": "Na hOileáin Mháirianacha Thuaidh",
     "MQ": "Martinique",
-    "MR": "an Mháratáin",
+    "MR": "An Mháratái",
     "MS": "Montsarat",
     "MT": "Málta",
     "MU": "Oileán Mhuirís",
@@ -199,9 +199,9 @@
     "MZ": "Mósaimbíc",
     "NA": "an Namaib",
     "NC": "an Nua-Chaladóin",
-    "NE": "an Nígir",
+    "NE": "An Nígir",
     "NF": "Oileán Norfolk",
-    "NG": "an Nigéir",
+    "NG": "An Nigéir",
     "NI": "Nicearagua",
     "NL": "an Ísiltír",
     "NO": "an Iorua",
@@ -214,7 +214,7 @@
     "PE": "Peiriú",
     "PF": "Polainéis na Fraince",
     "PG": "Nua-Ghuine Phapua",
-    "PH": "na hOileáin Fhilipíneacha",
+    "PH": "Na hOileáin Fhilipíneacha",
     "PK": "an Phacastáin",
     "PL": "an Pholainn",
     "PM": "San Pierre agus Miquelon",
@@ -234,7 +234,7 @@
     "SA": "an Araib Shádach",
     "SB": "Oileáin Sholaimh",
     "SC": "na Séiséil",
-    "SD": "an tSúdáin",
+    "SD": "An tSúdáin",
     "SE": "an tSualainn",
     "SG": "Singeapór",
     "SH": "San Héilin",
@@ -243,12 +243,12 @@
     "SK": "an tSlóvaic",
     "SL": "Siarra Leon",
     "SM": "San Mairíne",
-    "SN": "an tSeineagáil",
+    "SN": "An tSeineagáil",
     "SO": "an tSomáil",
     "SR": "Suranam",
     "SS": "an tSúdáin Theas",
     "ST": "São Tomé agus Príncipe",
-    "SV": "an tSalvadóir",
+    "SV": "An tSalvadóir",
     "SX": "Sint Maarten",
     "SY": "an tSiria",
     "SZ": "eSuaitíní",
@@ -262,7 +262,7 @@
     "TK": "Tócalá",
     "TL": "Tíomór Thoir",
     "TM": "an Tuircméanastáin",
-    "TN": "an Túinéis",
+    "TN": "An Tuinéis",
     "TO": "Tonga",
     "TR": "an Tuirc",
     "TT": "Oileán na Tríonóide agus Tobága",
diff --git a/js/data/locale/ga/ctrynames.json b/js/data/locale/ga/ctrynames.json
index e2401310b6..a9af38138a 100644
--- a/js/data/locale/ga/ctrynames.json
+++ b/js/data/locale/ga/ctrynames.json
@@ -7,7 +7,7 @@
     "an Afraic Theas": "ZA",
     "an Aigéine": "009",
     "an Aigéine Imeallach": "QO",
-    "an Ailgéir": "DZ",
+    "An Ailgéir": "DZ",
     "an Airgintín": "AR",
     "an Airméin": "AM",
     "an Áise": "142",
@@ -39,23 +39,23 @@
     "an Cholóim": "CO",
     "an Chosaiv": "XK",
     "an Chróit": "HR",
-    "an Cósta Eabhair": "CI",
+    "An Cósta Eabhair": "CI",
     "an Danmhairg": "DK",
     "an Domhan": "001",
     "an Eastóin": "EE",
-    "an Éigipt": "EG",
+    "An Éigipt": "EG",
     "an Eilvéis": "CH",
     "an Eiritré": "ER",
     "an Eoraip": "150",
     "an Fhionlainn": "FI",
     "an Fhrainc": "FR",
     "an Ghabúin": "GA",
-    "an Ghaimbia": "GM",
+    "An Ghaimbia": "GM",
     "an Ghearmáin": "DE",
     "an Ghraonlainn": "GL",
     "an Ghréig": "GR",
-    "an Ghuáin": "GY",
-    "an Ghuine": "GN",
+    "An Ghuáin": "GY",
+    "An Ghuine": "GN",
     "an Ghuine Mheánchiorclach": "GQ",
     "an Iaráic": "IQ",
     "an Iaráin": "IR",
@@ -68,22 +68,22 @@
     "an Ísiltír": "NL",
     "an Ísiltír Chairibeach": "BQ",
     "an Laitvia": "LV",
-    "an Libéir": "LR",
-    "an Libia": "LY",
+    "An Libéir": "LR",
+    "An Libia": "LY",
     "an Liobáin": "LB",
     "an Liotuáin": "LT",
     "an Mhacadóin Thuaidh": "MK",
     "an Mhalaeisia": "MY",
     "an Mhaláiv": "MW",
-    "an Mháratáin": "MR",
+    "An Mháratái": "MR",
     "an Mheilinéis": "054",
     "an Mhicrinéis": "FM",
     "an Mholdóiv": "MD",
     "an Mhongóil": "MN",
     "an Mhuir Chairib": "029",
     "an Namaib": "NA",
-    "an Nigéir": "NG",
-    "an Nígir": "NE",
+    "An Nigéir": "NG",
+    "An Nígir": "NE",
     "an Nua-Chaladóin": "NC",
     "an Nua-Shéalainn": "NZ",
     "an Ostair": "AT",
@@ -96,7 +96,7 @@
     "an Ríocht Aontaithe": "GB",
     "an Rómáin": "RO",
     "an Rúis": "RU",
-    "an Sahára Thiar": "EH",
+    "An Sahára Thiar": "EH",
     "an Spáinn": "ES",
     "an Táidsíceastáin": "TJ",
     "an Tansáin": "TZ",
@@ -104,13 +104,13 @@
     "an Téalainn": "TH",
     "an Téaváin": "TW",
     "an tSaimbia": "ZM",
-    "an tSalvadóir": "SV",
+    "An tSalvadóir": "SV",
     "an tSeapáin": "JP",
     "an tSeicia": "CZ",
-    "an tSeineagáil": "SN",
+    "An tSeineagáil": "SN",
     "an tSeirbia": "RS",
     "an tSeoirsia": "GE",
-    "an tSeoirsia Theas agus Oileáin Sandwich Theas": "GS",
+    "An tSeoirsia Theas agus Oileáin Sandwich Theas": "GS",
     "an tSile": "CL",
     "an tSín": "CN",
     "an tSiombáib": "ZW",
@@ -119,9 +119,9 @@
     "an tSlóvaic": "SK",
     "an tSomáil": "SO",
     "an tSualainn": "SE",
-    "an tSúdáin": "SD",
+    "An tSúdáin": "SD",
     "an tSúdáin Theas": "SS",
-    "an Túinéis": "TN",
+    "An Tuinéis": "TN",
     "an Tuirc": "TR",
     "an Tuircméanastáin": "TM",
     "an Úcráin": "UA",
@@ -208,9 +208,9 @@
     "Mósaimbíc": "MZ",
     "na Bahámaí": "BS",
     "na Críocha Palaistíneacha": "PS",
-    "na hOileáin Chanáracha": "IC",
-    "na hOileáin Fhilipíneacha": "PH",
-    "na hOileáin Mháirianacha Thuaidh": "MP",
+    "Na hOileáin Chanáracha": "IC",
+    "Na hOileáin Fhilipíneacha": "PH",
+    "Na hOileáin Mháirianacha Thuaidh": "MP",
     "na Náisiúin Aontaithe": "UN",
     "na Séiséil": "SC",
     "Nárú": "NR",
diff --git a/js/data/locale/ga/ctryreverse.json b/js/data/locale/ga/ctryreverse.json
index 2c911df64b..857720d3be 100644
--- a/js/data/locale/ga/ctryreverse.json
+++ b/js/data/locale/ga/ctryreverse.json
@@ -74,7 +74,7 @@
     "CF": "Poblacht na hAfraice Láir",
     "CG": "Congó-Brazzaville",
     "CH": "an Eilvéis",
-    "CI": "an Cósta Eabhair",
+    "CI": "An Cósta Eabhair",
     "CK": "Oileáin Cook",
     "CL": "an tSile",
     "CM": "Camarún",
@@ -95,12 +95,12 @@
     "DK": "an Danmhairg",
     "DM": "Doiminice",
     "DO": "an Phoblacht Dhoiminiceach",
-    "DZ": "an Ailgéir",
+    "DZ": "An Ailgéir",
     "EA": "Ceuta agus Melilla",
     "EC": "Eacuadór",
     "EE": "an Eastóin",
-    "EG": "an Éigipt",
-    "EH": "an Sahára Thiar",
+    "EG": "An Éigipt",
+    "EH": "An Sahára Thiar",
     "ER": "an Eiritré",
     "ES": "an Spáinn",
     "ET": "an Aetóip",
@@ -121,23 +121,23 @@
     "GH": "Gána",
     "GI": "Giobráltar",
     "GL": "an Ghraonlainn",
-    "GM": "an Ghaimbia",
-    "GN": "an Ghuine",
+    "GM": "An Ghaimbia",
+    "GN": "An Ghuine",
     "GP": "Guadalúip",
     "GQ": "an Ghuine Mheánchiorclach",
     "GR": "an Ghréig",
-    "GS": "an tSeoirsia Theas agus Oileáin Sandwich Theas",
+    "GS": "An tSeoirsia Theas agus Oileáin Sandwich Theas",
     "GT": "Guatamala",
     "GU": "Guam",
     "GW": "Guine Bissau",
-    "GY": "an Ghuáin",
+    "GY": "An Ghuáin",
     "HK": "Sainréigiún Riaracháin Hong Cong, Daonphoblacht na Síne",
     "HM": "Oileán Heard agus Oileáin McDonald",
     "HN": "Hondúras",
     "HR": "an Chróit",
     "HT": "Háítí",
     "HU": "an Ungáir",
-    "IC": "na hOileáin Chanáracha",
+    "IC": "Na hOileáin Chanáracha",
     "ID": "an Indinéis",
     "IE": "Éire",
     "IL": "Iosrael",
@@ -168,12 +168,12 @@
     "LC": "Saint Lucia",
     "LI": "Lichtinstéin",
     "LK": "Srí Lanca",
-    "LR": "an Libéir",
+    "LR": "An Libéir",
     "LS": "Leosóta",
     "LT": "an Liotuáin",
     "LU": "Lucsamburg",
     "LV": "an Laitvia",
-    "LY": "an Libia",
+    "LY": "An Libia",
     "MA": "Maracó",
     "MC": "Monacó",
     "MD": "an Mholdóiv",
@@ -186,9 +186,9 @@
     "MM": "Maenmar (Burma)",
     "MN": "an Mhongóil",
     "MO": "Sainréigiún Riaracháin Macao, Daonphoblacht na Síne",
-    "MP": "na hOileáin Mháirianacha Thuaidh",
+    "MP": "Na hOileáin Mháirianacha Thuaidh",
     "MQ": "Martinique",
-    "MR": "an Mháratáin",
+    "MR": "An Mháratái",
     "MS": "Montsarat",
     "MT": "Málta",
     "MU": "Oileán Mhuirís",
@@ -199,9 +199,9 @@
     "MZ": "Mósaimbíc",
     "NA": "an Namaib",
     "NC": "an Nua-Chaladóin",
-    "NE": "an Nígir",
+    "NE": "An Nígir",
     "NF": "Oileán Norfolk",
-    "NG": "an Nigéir",
+    "NG": "An Nigéir",
     "NI": "Nicearagua",
     "NL": "an Ísiltír",
     "NO": "an Iorua",
@@ -214,7 +214,7 @@
     "PE": "Peiriú",
     "PF": "Polainéis na Fraince",
     "PG": "Nua-Ghuine Phapua",
-    "PH": "na hOileáin Fhilipíneacha",
+    "PH": "Na hOileáin Fhilipíneacha",
     "PK": "an Phacastáin",
     "PL": "an Pholainn",
     "PM": "San Pierre agus Miquelon",
@@ -234,7 +234,7 @@
     "SA": "an Araib Shádach",
     "SB": "Oileáin Sholaimh",
     "SC": "na Séiséil",
-    "SD": "an tSúdáin",
+    "SD": "An tSúdáin",
     "SE": "an tSualainn",
     "SG": "Singeapór",
     "SH": "San Héilin",
@@ -243,12 +243,12 @@
     "SK": "an tSlóvaic",
     "SL": "Siarra Leon",
     "SM": "San Mairíne",
-    "SN": "an tSeineagáil",
+    "SN": "An tSeineagáil",
     "SO": "an tSomáil",
     "SR": "Suranam",
     "SS": "an tSúdáin Theas",
     "ST": "São Tomé agus Príncipe",
-    "SV": "an tSalvadóir",
+    "SV": "An tSalvadóir",
     "SX": "Sint Maarten",
     "SY": "an tSiria",
     "SZ": "eSuaitíní",
@@ -262,7 +262,7 @@
     "TK": "Tócalá",
     "TL": "Tíomór Thoir",
     "TM": "an Tuircméanastáin",
-    "TN": "an Túinéis",
+    "TN": "An Tuinéis",
     "TO": "Tonga",
     "TR": "an Tuirc",
     "TT": "Oileán na Tríonóide agus Tobága",
diff --git a/js/data/locale/ga/sysres.json b/js/data/locale/ga/sysres.json
index fd8ba0251a..3c88fd8551 100644
--- a/js/data/locale/ga/sysres.json
+++ b/js/data/locale/ga/sysres.json
@@ -6,51 +6,51 @@
     "#in {num}s": "one#i gceann {num} soic.|two#i gceann {num} shoic.|few#i gceann {num} shoic.|many#i gceann {num} soic.|#i gceann {num} soic.",
     "#in {num}w": "one#i gceann {num} scht.|two#i gceann {num} shcht.|few#i gceann {num} shcht.|many#i gceann {num} scht.|#i gceann {num} scht.",
     "#in {num}y": "one#i gceann {num} bl.|two#i gceann {num} bhl.|few#i gceann {num} bl.|many#i gceann {num} mbl.|#i gceann {num} bl.",
-    "#{num} ms": "one#{num} ms|two#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
-    "#{num}d": "one#{num}l|two#{num}l|few#{num}l|many#{num}l|#{num}l",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "one#{num} lá|two#{num} lá|few#{num} lá|many#{num} lá|#{num} lá",
     "#{num}d ago": "one#{num} lá ó shin|two#{num} lá ó shin|few#{num} lá ó shin|many#{num} lá ó shin|#{num} lá ó shin",
-    "#{num}h": "one#{num}u|two#{num}u|few#{num}u|many#{num}u|#{num}u",
+    "#{num}h": "one#{num} u|two#{num} u|few#{num} u|many#{num} u|#{num} u",
     "#{num}h ago": "one#{num} uair ó shin|two#{num} uair ó shin|few#{num} huaire ó shin|many#{num} n-uaire ó shin|#{num} uair ó shin",
     "#{num}mi ago": "one#{num} nóim. ó shin|two#{num} nóim. ó shin|few#{num} nóim. ó shin|many#{num} nóim. ó shin|#{num} nóim. ó shin",
     "#{num}mo ago": "one#{num} mhí ó shin|two#{num} mhí ó shin|few#{num} mhí ó shin|many#{num} mí ó shin|#{num} mí ó shin",
-    "#{num}s": "one#{num}s|two#{num}s|few#{num}s|many#{num}s|#{num}s",
+    "#{num}s": "one#{num} soic|two#{num} soic|few#{num} soic|many#{num} soic|#{num} soic",
     "#{num}s ago": "one#{num} soic. ó shin|two#{num} shoic. ó shin|few#{num} shoic. ó shin|many#{num} soic. ó shin|#{num} soic. ó shin",
-    "#{num}w": "one#{num}s|two#{num}s|few#{num}s|many#{num}s|#{num}s",
+    "#{num}w": "one#{num} scht|two#{num} scht|few#{num} scht|many#{num} scht|#{num} scht",
     "#{num}w ago": "one#{num} scht. ó shin|two#{num} shcht. ó shin|few#{num} shcht. ó shin|many#{num} scht. ó shin|#{num} scht. ó shin",
-    "#{num}y": "one#{num}b|two#{num}b|few#{num}b|many#{num}b|#{num}b",
+    "#{num}y": "one#{num} bl|two#{num} bl|few#{num} bl|many#{num} bl|#{num} bl",
     "#{num}y ago": "one#{num} bhl. ó shin|two#{num} bhl. ó shin|few#{num} bl. ó shin|many#{num} mbl. ó shin|#{num} bl. ó shin",
     "1#1 day ago|#{num} days ago": "one#{num} lá ó shin|two#{num} lá ó shin|few#{num} lá ó shin|many#{num} lá ó shin|#{num} lá ó shin",
     "1#1 day|#{num} days": "one#{num} lá|two#{num} lá|few#{num} lá|many#{num} lá|#{num} lá",
     "1#1 dy ago|#{num} dys ago": "one#{num} lá ó shin|two#{num} lá ó shin|few#{num} lá ó shin|many#{num} lá ó shin|#{num} lá ó shin",
-    "1#1 dy|#{num} dys": "one#{num}l|two#{num}l|few#{num}l|many#{num}l|#{num}l",
+    "1#1 dy|#{num} dys": "one#{num} lá|two#{num} lá|few#{num} lá|many#{num} lá|#{num} lá",
     "1#1 hour ago|#{num} hours ago": "one#{num} uair an chloig ó shin|two#{num} uair an chloig ó shin|few#{num} uair an chloig ó shin|many#{num} n-uair an chloig ó shin|#{num} uair an chloig ó shin",
-    "1#1 hour|#{num} hours": "one#{num} uair|two#{num} uair|few#{num} huaire|many#{num} n-uaire|#{num} uair",
+    "1#1 hour|#{num} hours": "one#{num} u|two#{num} u|few#{num} u|many#{num} u|#{num} u",
     "1#1 hr ago|#{num} hrs ago": "one#{num} uair an chloig ó shin|two#{num} uair an chloig ó shin|few#{num} uair an chloig ó shin|many#{num} n-uair an chloig ó shin|#{num} uair an chloig ó shin",
     "1#1 hr|#{num} hrs": "one#{num} u|two#{num} u|few#{num} u|many#{num} u|#{num} u",
-    "1#1 millisecond|#{num} milliseconds": "one#{num} mhilleasoicind|two#{num} mhilleasoicind|few#{num} mhilleasoicind|many#{num} milleasoicind|#{num} milleasoicind",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
     "1#1 min ago|#{num} min ago": "one#{num} nóiméad ó shin|two#{num} nóiméad ó shin|few#{num} nóiméad ó shin|many#{num} nóiméad ó shin|#{num} nóiméad ó shin",
     "1#1 minute ago|#{num} minutes ago": "one#{num} nóiméad ó shin|two#{num} nóiméad ó shin|few#{num} nóiméad ó shin|many#{num} nóiméad ó shin|#{num} nóiméad ó shin",
-    "1#1 minute|#{num} minutes": "one#{num} nóiméad|two#{num} nóiméad|few#{num} nóiméad|many#{num} nóiméad|#{num} nóiméad",
+    "1#1 minute|#{num} minutes": "one#{num} nóim|two#{num} nóim|few#{num} nóim|many#{num} nóim|#{num} nóim",
     "1#1 min|#{num} min": "one#{num} nóim|two#{num} nóim|few#{num} nóim|many#{num} nóim|#{num} nóim",
-    "1#1 mi|#{num} min": "one#{num}n|two#{num}n|few#{num}n|many#{num}n|#{num}n",
+    "1#1 mi|#{num} min": "one#{num} nóim|two#{num} nóim|few#{num} nóim|many#{num}n|#{num} nóim",
     "1#1 mon ago|#{num} mons ago": "one#{num} mhí ó shin|two#{num} mhí ó shin|few#{num} mhí ó shin|many#{num} mí ó shin|#{num} mí ó shin",
     "1#1 month ago|#{num} months ago": "one#{num} mhí ó shin|two#{num} mhí ó shin|few#{num} mhí ó shin|many#{num} mí ó shin|#{num} mí ó shin",
     "1#1 month|#{num} months": "one#{num} mhí|two#{num} mhí|few#{num} mhí|many#{num} mí|#{num} mí",
-    "1#1 mon|#{num} mons": "one#{num} mhí|two#{num} mhí|few#{num} mhí|many#{num} mí|#{num} mí",
-    "1#1 mo|#{num} mos": "one#{num}m|two#{num}m|few#{num}m|many#{num}m|#{num}m",
+    "1#1 mon|#{num} mons": "one#{num} mí|two#{num} mí|few#{num} mí|many#{num} mí|#{num} m",
+    "1#1 mo|#{num} mos": "one#{num}m|two#{num}m|few#{num}m|many#{num}m|#{num} m",
     "1#1 sec ago|#{num} sec ago": "one#{num} soicind ó shin|two#{num} shoicind ó shin|few#{num} shoicind ó shin|many#{num} soicind ó shin|#{num} soicind ó shin",
     "1#1 second ago|#{num} seconds ago": "one#{num} soicind ó shin|two#{num} shoicind ó shin|few#{num} shoicind ó shin|many#{num} soicind ó shin|#{num} soicind ó shin",
-    "1#1 second|#{num} seconds": "one#{num} soicind|two#{num} shoicind|few#{num} shoicind|many#{num} soicind|#{num} soicind",
-    "1#1 sec|#{num} sec": "one#{num} soic|two#{num} shoic|few#{num} shoic|many#{num} soic|#{num} soic",
-    "1#1 se|#{num} sec": "one#{num}s|two#{num}s|few#{num}s|many#{num}s|#{num}s",
+    "1#1 second|#{num} seconds": "one#{num} soic|two#{num} shoic|few#{num} shoic|many#{num} soic|#{num} soic",
+    "1#1 sec|#{num} sec": "one#{num} soic|two#{num} soic|few#{num} soic|many#{num} soic|#{num} soic",
+    "1#1 se|#{num} sec": "one#{num} soic|two#{num} soic|few#{num} soic|many#{num} soic|#{num} soic",
     "1#1 week ago|#{num} weeks ago": "one#{num} seachtain ó shin|two#{num} sheachtain ó shin|few#{num} seachtaine ó shin|many#{num} seachtaine ó shin|#{num} seachtain ó shin",
-    "1#1 week|#{num} weeks": "one#{num} seachtain|two#{num} sheachtain|few#{num} seachtaine|many#{num} seachtaine|#{num} seachtain",
+    "1#1 week|#{num} weeks": "one#{num} scht|two#{num} scht|few#{num} scht|many#{num} scht|#{num} scht",
     "1#1 wk ago|#{num} wks ago": "one#{num} seachtain ó shin|two#{num} sheachtain ó shin|few#{num} seachtaine ó shin|many#{num} seachtaine ó shin|#{num} seachtain ó shin",
     "1#1 wk|#{num} wks": "one#{num} scht|two#{num} scht|few#{num} scht|many#{num} scht|#{num} scht",
     "1#1 year ago|#{num} years ago": "one#{num} bhliain ó shin|two#{num} bhliain ó shin|few#{num} bliana ó shin|many#{num} mbliana ó shin|#{num} bliain ó shin",
-    "1#1 year|#{num} years": "one#{num} bhliain|two#{num} bhliain|few#{num} bliana|many#{num} mbliana|#{num} bliain",
+    "1#1 year|#{num} years": "one#{num} bhliain|two#{num} bhl|few#{num} bl|many#{num} mbl|#{num} bl",
     "1#1 yr ago|#{num} yrs ago": "one#{num} bhliain ó shin|two#{num} bhliain ó shin|few#{num} bliana ó shin|many#{num} mbliana ó shin|#{num} bliain ó shin",
-    "1#1 yr|#{num} yrs": "one#{num} bhl|two#{num} bhl|few#{num} bl|many#{num} mbl|#{num} bl",
+    "1#1 yr|#{num} yrs": "one#{num} bl|two#{num} bl|few#{num} bl|many#{num} bl|#{num} bl",
     "1#in 1 day|#in {num} days": "one#i gceann {num} lá|two#i gceann {num} lá|few#i gceann {num} lá|many#i gceann {num} lá|#i gceann {num} lá",
     "1#in 1 dy|#in {num} dys": "one#i gceann {num} lá|two#i gceann {num} lá|few#i gceann {num} lá|many#i gceann {num} lá|#i gceann {num} lá",
     "1#in 1 hour|#in {num} hours": "one#i gceann {num} uair an chloig|two#i gceann {num} uair an chloig|few#i gceann {num} uair an chloig|many#i gceann {num} n-uair an chloig|#i gceann {num} uair an chloig",
@@ -140,13 +140,13 @@
     "a0": "r.n.",
     "a1": "i.n.",
     "durationLongDays": "one#{num} lá|two#{num} lá|few#{num} lá|many#{num} lá|#{num} lá",
-    "durationMediumHours": "one#{num}u|two#{num}u|few#{num}u|many#{num}u|#{num}u",
-    "durationMediumMillis": "one#{num}ms|two#{num}ms|few#{num}ms|many#{num}ms|#{num}ms",
-    "durationMediumWeeks": "one#{num}s|two#{num}s|few#{num}s|many#{num}s|#{num}s",
-    "durationMediumYears": "one#{num}b|two#{num}b|few#{num}b|many#{num}b|#{num}b",
-    "durationShortMillis": "one#{num}ms|two#{num}ms|few#{num}ms|many#{num}ms|#{num}ms",
-    "durationShortMinutes": "one#{num}n|two#{num}n|few#{num}n|many#{num}n|#{num}n",
-    "durationShortMonths": "one#{num}m|two#{num}m|few#{num}m|many#{num}m|#{num}m",
+    "durationMediumHours": "one#{num} u|two#{num} u|few#{num} u|many#{num} u|#{num} u",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "one#{num} scht|two#{num} scht|few#{num} scht|many#{num} scht|#{num} scht",
+    "durationMediumYears": "one#{num} bl|two#{num} bl|few#{num} bl|many#{num} bl|#{num} bl",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "one#{num} nóim|two#{num} nóim|few#{num} nóim|many#{num}n|#{num} nóim",
+    "durationShortMonths": "one#{num}m|two#{num}m|few#{num}m|many#{num}m|#{num} m",
     "finalSeparatorFull": " agus ",
     "finalSeparatorLong": ", ",
     "finalSeparatorMedium": ", ",
diff --git a/js/data/locale/ga/unitfmt.json b/js/data/locale/ga/unitfmt.json
index bfe22a7034..c4a3b1b8f5 100644
--- a/js/data/locale/ga/unitfmt.json
+++ b/js/data/locale/ga/unitfmt.json
@@ -6,17 +6,18 @@
             "ampere": "many#{n} n-aimpéar|#{n} aimpéar",
             "arc-minute": "#{n} nóiméad stua",
             "arc-second": "two#{n} shoicind stua|few#{n} shoicind stua|#{n} soicind stua",
-            "astronomical-unit": "many#{n} n-aonad réalteolaíoch|#{n} aonad réalteolaíoch",
+            "astronomical-unit": "one#{n} aonad réalteolaíoch|two#{n} aonad réalteolaíoch|#{n} AR",
             "atmosphere": "many#{n} n-atmaisféar|#{n} atmaisféar",
             "bar": "one#{n} bharra|two#{n} bharra|few#{n} bharra|many#{n} mbarra|#{n} barra",
             "barrel": "one#{n} bairille|#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "one#{n} ghiotán|two#{n} ghiotán|few#{n} ghiotán|many#{n} ngiotán|#{n} giotán",
-            "bit-per-second": "#{n} giotán sa soicind",
+            "bit-per-second": "#{n} giotán/s",
             "british-thermal-unit": "one#{n} theas-aonad Briotanach|two#{n} Btu|few#{n} Btu|many#{n} Btu|#{n} aonad teirmeach Briotanach",
             "bushel": "one#{n} bhuiséal|two#{n} bhuiséal|few#{n} bhuiséal|many#{n} mbuiséal|#{n} buiséal",
             "byte": "one#{n} bheart|two#{n} bheart|few#{n} bheart|many#{n} mbeart|#{n} beart",
-            "byte-per-hour": "#{n} beart san uair",
-            "byte-per-second": "#{n} beart sa soicind",
+            "byte-per-hour": "#{n} beart/u",
+            "byte-per-second": "#{n} beart/s",
             "calorie": "one#{n} chalra|two#{n} chalra|few#{n} chalra|many#{n} gcalra|#{n} calra",
             "candela": "one#{n} chaindéile|two#{n} chaindéile|few#{n} chaindéile|many#{n} gcaindéile|#{n} caindéile",
             "carat": "one#{n} charat|two#{n} charat|few#{n} charat|many#{n} gcarat|#{n} carat",
@@ -32,7 +33,7 @@
             "cubic-meter": "one#{n} mhéadar ciúbach|two#{n} mhéadar chiúbacha|few#{n} mhéadar chiúbacha|many#{n} méadar chiúbacha|#{n} méadar ciúbach",
             "cubic-mile": "one#{n} mhíle ciúbach|two#{n} mhíle chiúbacha|few#{n} mhíle chiúbacha|many#{n} míle chiúbacha|#{n} míle ciúbach",
             "cubic-yard": "two#{n} shlat chiúbacha|few#{n} shlat chiúbacha|many#{n} slat chiúbacha|#{n} slat chiúbach",
-            "cup": "one#{n} chupán|two#{n} chupán|few#{n} chupán|many#{n} gcupán|#{n} cupán",
+            "cup": "one#{n} chupán|two#{n} c|few#{n} c|many#{n} c|#{n} cupán",
             "cup-metric": "one#{n} chupán méadrach|two#{n} chupán mhéadracha|few#{n} chupán mhéadracha|many#{n} gcupán mhéadracha|#{n} cupán méadrach",
             "dalton": "two#{n} dhaltún|few#{n} dhaltún|many#{n} ndaltún|#{n} daltún",
             "day": "#{n} lá",
@@ -43,8 +44,6 @@
             "dessert-spoon": "#{n} spúnóg mhilseoige",
             "dessert-spoon-imperial": "one#{n} spúnóg mhilseoige impiriúil|two#{n} spúnóg mhilseoige impiriúla|few#{n} spúnóg mhilseoige impiriúla|many#{n} spúnóg mhilseoige impiriúla|#{n} spúnóg mhilseoige impiriúol",
             "dot": "one#{n} phonc|two#{n} phonc|few#{n} phonc|many#{n} bponc|#{n} ponc",
-            "dot-per-centimeter": "one#{n} phonc sa cheintiméadar|two#{n} phonc sa cheintiméadar|few#{n} phonc sa cheintiméadar|many#{n} bponc sa cheintiméadar|#{n} ponc sa cheintiméadar",
-            "dot-per-inch": "one#{n} phonc san orlach|two#{n} phonc san orlach|few#{n} phonc san orlach|many#{n} bponc san orlach|#{n} ponc san orlach",
             "dram": "two#{n} dhram leachtacha|few#{n} dhram leachtacha|many#{n} ndram leachtacha|#{n} dram leachtach",
             "drop": "one#{n} bhraon|two#{n} bhraon|few#{n} bhraon|many#{n} mbraon|#{n} braon",
             "dunam": "two#{n} dhunam|few#{n} dhunam|many#{n} ndunam|#{n} dunam",
@@ -53,22 +52,22 @@
             "electronvolt": "one#{n} leictreavolta|two#{n} eV|few#{n} eV|many#{n} eV|#{n} leictreonvolta",
             "em": "many#{n} n-eim|#{n} eim",
             "fahrenheit": "one#{n} chéim Fahrenheit|two#{n} chéim Fahrenheit|few#{n} chéim Fahrenheit|many#{n} gcéim Fahrenheit|#{n} céim Fahrenheit",
-            "fathom": "one#{n} fheá|two#{n} fheá|few#{n} fheá|many#{n} bhfeá|#{n} feá",
+            "fathom": "#{n} fth",
             "fluid-ounce": "two#{n} unsa leachtacha|few#{n} unsa leachtacha|many#{n} n-unsa leachtacha|#{n} unsa leachtach",
             "fluid-ounce-imperial": "one#{n} unsa leachtach impiriúil|two#{n} unsa leachtacha impiriúla|#{n} fl oz Imp.",
             "foodcalorie": "one#{n} Chalra|two#{n} Chalra|few#{n} Chalra|many#{n} gCalra|#{n} Calra",
-            "foot": "two#{n} throigh|few#{n} throigh|many#{n} dtroigh|#{n} troigh",
-            "foot-per-second": "#{n} troigh sa soicind",
-            "furlong": "#{n} staid",
+            "foot": "one#{n} troigh|two#{n} thr.|few#{n} thr.|many#{n} dtr.|#{n} tr.",
+            "foot-per-second": "#{n} tr./s",
+            "furlong": "#{n} st",
             "g-force": "#{n} g-fhórsa",
             "gallon": "one#{n} ghalún|two#{n} ghalún|few#{n} ghalún|many#{n} ngalún|#{n} galún",
             "gallon-imperial": "one#{n} ghalún impiriúil|two#{n} ghalún impiriúla|few#{n} ghalún impiriúla|many#{n} ngalún impiriúla|#{n} galún impiriúil",
             "generic": "#{n}°",
             "gigabit": "one#{n} ghigighiotán|two#{n} ghigighiotán|few#{n} ghigighiotán|many#{n} ngigighiotán|#{n} gigighiotán",
-            "gigabit-per-second": "#{n} gigighiotán sa soicind",
+            "gigabit-per-second": "#{n} gigighiotán/s",
             "gigabyte": "one#{n} ghigibheart|two#{n} ghigibheart|few#{n} ghigibheart|many#{n} ngigibheart|#{n} gigibheart",
-            "gigabyte-per-hour": "#{n} gigibheart san uair",
-            "gigabyte-per-second": "#{n} gigibheart sa soicind",
+            "gigabyte-per-hour": "#{n} gigibheart/u",
+            "gigabyte-per-second": "#{n} gigibheart/s",
             "gigahertz": "one#{n} ghigiheirts|two#{n} ghigiheirts|few#{n} ghigiheirts|many#{n} ngigiheirts|#{n} gigiheirts",
             "gigawatt": "one#{n} ghigeavata|two#{n} ghigeavata|few#{n} ghigeavata|many#{n} ngigeavata|#{n} gigeavata",
             "grain": "one#{n} ghráinne|two#{n} ghráinne|few#{n} ghráinne|many#{n} ngráinne|#{n} gráinne",
@@ -78,8 +77,8 @@
             "hectopascal": "#{n} heicteapascal",
             "hertz": "#{n} heirts",
             "horsepower": "many#{n} n-each-chumhacht|#{n} each-chumhacht",
-            "hour": "few#{n} huaire|many#{n} n-uaire|#{n} uair",
-            "inch": "many#{n} n-orlach|#{n} orlach",
+            "hour": "#{n} u",
+            "inch": "many#{n} or.|#{n} orlach",
             "inch-ofhg": "many#{n} n-orlach mearcair|#{n} orlach mearcair",
             "item": "#{n} item",
             "jigger": "one#{n} mhiosúr|two#{n} mhiosúr|few#{n} mhiosúr|#{n} miosúr",
@@ -87,50 +86,50 @@
             "karat": "one#{n} charat óir|two#{n} charat óir|few#{n} charat|many#{n} gcarat óir|#{n} carat óir",
             "kelvin": "one#{n} chéim cheilvin|two#{n} chéim cheilvin|few#{n} chéim cheilvin|many#{n} gcéim cheilvin|#{n} céim cheilvin",
             "kilobit": "one#{n} chilighiotán|two#{n} chilighiotán|few#{n} chilighiotán|many#{n} gcilighiotán|#{n} cilighiotán",
-            "kilobit-per-second": "#{n} cilighiotán sa soicind",
+            "kilobit-per-second": "#{n} cilighiotán/s",
             "kilobyte": "one#{n} chilibheart|two#{n} chilibheart|few#{n} chilibheart|many#{n} gcilibheart|#{n} cilibheart",
-            "kilobyte-per-hour": "#{n} cilibheart san uair",
-            "kilobyte-per-second": "#{n} cilibheart sa soicind",
+            "kilobyte-per-hour": "#{n} cilibheart/u",
+            "kilobyte-per-second": "#{n} cilibheart/s",
             "kilocalorie": "one#{n} chileacalra|two#{n} chileacalra|few#{n} chileacalra|many#{n} gcileacalra|#{n} cileacalra",
             "kilogram": "one#{n} chileagram|two#{n} chileagram|few#{n} chileagram|many#{n} gcileagram|#{n} cileagram",
             "kilohertz": "one#{n} chiliheirts|two#{n} chiliheirts|few#{n} chiliheirts|many#{n} gciliheirts|#{n} ciliheirts",
             "kilojoule": "one#{n} chiligiúl|two#{n} chiligiúl|few#{n} chiligiúl|many#{n} gciligiúl|#{n} ciligiúl",
             "kilometer": "one#{n} chiliméadar|two#{n} chiliméadar|few#{n} chiliméadar|many#{n} gciliméadar|#{n} ciliméadar",
-            "kilometer-per-hour": "one#{n} chiliméadar san uair|two#{n} chiliméadar san uair|few#{n} chiliméadar san uair|many#{n} gciliméadar san uair|#{n} ciliméadar san uair",
+            "kilometer-per-hour": "#{n} km/u",
             "kilometer-per-liter": "#{n} ciliméadar sa lítear",
-            "kilometer-per-second": "#{n} ciliméadar sa soicind",
+            "kilometer-per-second": "#{n} ciliméadar/s",
             "kilopascal": "one#{n} chileapascal|#{n} kPa",
             "kilowatt": "one#{n} chileavata|two#{n} chileavata|few#{n} chileavata|many#{n} gcileavata|#{n} cileavata",
             "kilowatt-hour": "one#{n} chileavatuair|two#{n} chileavatuair|few#{n} chileavatuair|many#{n} gcileavatuair|#{n} cileavatuair",
             "kilowatt-hour-per-100-kilometer": "one#cileavatuair in aghaidh 100 ciliméadar|two#{n} cileavatuair in aghaidh 100 cilliméadar|few#{n} kWh/100km|many#{n} kWh/100km|#{n} cileavatuair in aghaidh 100 ciliméadar",
-            "knot": "one#{n} mhuirmhíle san uair|two#{n} mhuirmhíle san uair|few#{n} mhuirmhíle san uair|#{n} muirmhíle san uair",
-            "light-year": "two#{n} sholasbhliain|few#{n} sholasbhliain|#{n} solasbhliain",
+            "knot": "one#{n} mhuirmh/u|two#{n} muirmh/u|#{n} mrml/u",
+            "light-year": "one#{n} solasbhliain|#{n} sbh",
             "liter": "#{n} lítear",
             "liter-per-100-kilometer": "#{n} lítear sa 100 ciliméadar",
             "liter-per-kilometer": "#{n} lítear sa chiliméadar",
             "lumen": "#{n} lúman",
             "lux": "#{n} lucsa",
             "megabit": "one#{n} mheigighiotán|two#{n} mheigighiotán|few#{n} mheigighiotán|#{n} meigighiotán",
-            "megabit-per-second": "#{n} meigighiotán sa soicind",
+            "megabit-per-second": "#{n} meigighiotán/s",
             "megabyte": "one#{n} mheigibheart|two#{n} mheigibheart|few#{n} mheigibheart|#{n} meigibheart",
-            "megabyte-per-hour": "#{n} meigibheart san uair",
-            "megabyte-per-second": "#{n} meigibheart sa soicind",
+            "megabyte-per-hour": "#{n} meigibheart/u",
+            "megabyte-per-second": "#{n} meigibheart/s",
             "megahertz": "one#{n} mheigiheirts|two#{n} mheigiheirts|few#{n} mheigiheirts|#{n} meigiheirts",
             "megaliter": "one#{n} mheigilítear|two#{n} mheigilítear|few#{n} mheigilítear|#{n} meigilítear",
             "megapascal": "one#{n} mheigeapascal|two#{n} MPa|few#{n} MPa|many#{n} MPa|#{n} meigeapascal",
-            "megapixel": "one#{n} mheigiphicteilín|two#{n} mheigiphicteilín|few#{n} mheigiphicteilín|#{n} meigiphicteilín",
+            "megapixel": "one#{n} mheigiphicteilín|two#{n} MP|few#{n} MP|many#{n} MP|#{n} meigiphicteilín",
             "megawatt": "one#{n} mheigeavata|two#{n} mheigeavata|few#{n} mheigeavata|#{n} meigeavata",
             "meter": "one#{n} mhéadar|two#{n} mhéadar|few#{n} mhéadar|#{n} méadar",
-            "meter-per-second": "one#{n} mhéadar sa soicind|two#{n} mhéadar sa soicind|few#{n} mhéadar sa soicind|#{n} méadar sa soicind",
-            "meter-per-square-second": "one#{n} mhéadar sa soicind cearnaithe|two#{n} mhéadar sa soicind cearnaithe|few#{n} mhéadar sa soicind cearnaithe|#{n} méadar sa soicind cearnaithe",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
             "microgram": "one#{n} mhicreagram|two#{n} mhicreagram|few#{n} mhicreagram|#{n} micreagram",
             "micrometer": "one#{n} mhicriméadar|two#{n} mhicriméadar|few#{n} mhicriméadar|#{n} micriméadar",
-            "microsecond": "one#{n} mhicreashoicind|two#{n} mhicreashoicind|few#{n} mhicreashoicind|#{n} micreashoicind",
+            "microsecond": "#{n} μs",
             "mile": "one#{n} mhíle|two#{n} mhíle|few#{n} mhíle|#{n} míle",
             "mile-per-gallon": "one#{n} mhíle an galún|two#{n} mhíle an galún|few#{n} mhíle an galún|#{n} míle an galún",
             "mile-per-gallon-imperial": "one#{n} mhíle sa ghalún impiriúil|two#{n} mhíle sa ghalún impiriúil|few#{n} mhíle sa ghalún impiriúil|#{n} míle sa ghalún impiriúil",
-            "mile-per-hour": "one#{n} mhíle san uair|two#{n} mhíle san uair|few#{n} mhíle san uair|#{n} míle san uair",
-            "mile-per-second": "#{n} míle sa soicind",
+            "mile-per-hour": "#{n} msu",
+            "mile-per-second": "#{n} míle/s",
             "mile-scandinavian": "one#{n} mhíle Lochlannach|two#{n} mhíle Lochlannacha|few#{n} mhíle Lochlannacha|many#{n} míle Lochlannacha|#{n} míle Lochlannach",
             "milliampere": "one#{n} mhiollaimpéar|two#{n} mhiollaimpéar|few#{n} mhiollaimpéar|#{n} miollaimpéar",
             "millibar": "one#{n} mhilleabar|two#{n} mhilleabar|few#{n} mhilleabar|#{n} milleabar",
@@ -140,14 +139,14 @@
             "millimeter": "one#{n} mhilliméadar|two#{n} mhilliméadar|few#{n} mhilliméadar|#{n} milliméadar",
             "millimeter-ofhg": "one#{n} mhilliméadar mearcair|two#{n} mhilliméadar mearcair|few#{n} mhilliméadar mearcair|#{n} milliméadar mearcair",
             "millimole-per-liter": "one#{n} mhilleamól sa lítear|two#{n} mhilleamól sa lítear|few#{n} mhilleamól sa lítear|#{n} milleamól sa lítear",
-            "millisecond": "one#{n} mhilleasoicind|two#{n} mhilleasoicind|few#{n} mhilleasoicind|#{n} milleasoicind",
+            "millisecond": "#{n} ms",
             "milliwatt": "one#{n} mhilleavata|two#{n} mhilleavata|few#{n} mhilleavata|#{n} milleavata",
-            "minute": "#{n} nóiméad",
+            "minute": "#{n} nóim",
             "mole": "one#{n} mhól|two#{n} mhól|few#{n} mhól|#{n} mól",
             "month": "one#{n} mhí|two#{n} mhí|few#{n} mhí|#{n} mí",
             "nanometer": "#{n} nanaiméadar",
             "nanosecond": "#{n} nanashoicind",
-            "nautical-mile": "one#{n} mhuirmhíle|two#{n} mhuirmhíle|few#{n} mhuirmhíle|#{n} muirmhíle",
+            "nautical-mile": "one#{n} mhuirmhíle|#{n} muirmh.",
             "newton": "two#{n} N|few#{n} N|many#{n} N|#{n} niútan",
             "newton-meter": "one#{n} mhéadar niútain|two#{n} mhéadar niútain|few#{n} N⋅m|many#{n} N⋅m|#{n} méadar niútain",
             "ohm": "many#{n} n-óm|#{n} óm",
@@ -162,12 +161,12 @@
             "petabyte": "one#{n} peitibheart|two#{n} PB|few#{n} PB|many#{n} PB|#{n} petabytes",
             "picometer": "one#{n} phiciméadar|two#{n} phiciméadar|few#{n} phiciméadar|many#{n} bpiciméadar|#{n} piciméadar",
             "pinch": "one#{n} phinse|two#{n} phinse|few#{n} phinse|many#{n} bpinse|#{n} pinse",
-            "pint": "one#{n} phionta|two#{n} phionta|few#{n} phionta|many#{n} bpionta|#{n} pionta",
+            "pint": "one#{n} phionta|two#{n} pt|few#{n} pt|many#{n} pt|#{n} pionta",
             "pint-metric": "one#{n} phionta méadrach|two#{n} phionta mhéadracha|few#{n} phionta mhéadracha|many#{n} bpionta mhéadracha|#{n} pionta méadrach",
-            "pixel": "one#{n} phicteilín|two#{n} phicteilín|few#{n} phicteilín|many#{n} bpicteilín|#{n} picteilín",
-            "pixel-per-centimeter": "one#{n} phicteilín sa cheintiméadar|two#{n} phicteilín sa cheintiméadar|few#{n} phicteilín sa cheintiméadar|many#{n} bpicteilín sa cheintiméadar|#{n} picteilín sa cheintiméadar",
-            "pixel-per-inch": "one#{n} phicteilín san orlach|two#{n} phicteilín san orlach|few#{n} phicteilín san orlach|many#{n} bpicteilín san orlach|#{n} picteilín san orlach",
-            "point": "one#{n} phointe|two#{n} phointe|few#{n} phointe|many#{n} bpointe|#{n} pointe",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
             "pound": "one#{n} phunt|two#{n} phunt|few#{n} phunt|many#{n} bpunt|#{n} punt",
             "pound-force": "one#{n} punt fórsa|#{n} lbf",
             "pound-force-foot": "two#{n} lbf⋅ft|few#{n} lbf⋅ft|many#{n} lbf⋅ft|#{n} punt-troigh",
@@ -177,11 +176,11 @@
             "quarter": "one#{n} ceathrú|two#{n} cna|few#{n} cna|many#{n} cna|#{n} ceathrúna",
             "radian": "#{n} raidian",
             "revolution": "many#{n} n-imrothlú|#{n} imrothlú",
-            "second": "two#{n} shoicind|few#{n} shoicind|#{n} soicind",
+            "second": "two#{n} shoic|few#{n} shoic|#{n} soic",
             "short-ton": "two#{n} thonna ghearra|few#{n} thonna ghearra|many#{n} dtonna ghearra|#{n} tonna gearr",
             "solar-luminosity": "one#{n} ghrianlonrachas|two#{n} ghrianlonrachas|few#{n} L☉|many#{n} L☉|#{n} grianlonrachas",
             "solar-mass": "one#{n} mhais ghréine|two#{n} mhais ghréine|few#{n} mhais ghréine|#{n} mais ghréine",
-            "solar-radius": "one#{n} ghriangha|two#{n} ghriangha|few#{n} ghriangha|many#{n} ngriangha|#{n} griangha",
+            "solar-radius": "one#{n} ghriangha|two#{n} R☉|few#{n} ghriangha|many#{n} R☉|#{n} griangha",
             "square-centimeter": "one#{n} cheintiméadar cearnach|two#{n} cheintiméadar chearnacha|few#{n} cheintiméadar chearnacha|many#{n} gceintiméadar chearnacha|#{n} ceintiméadar cearnach",
             "square-foot": "two#{n} throigh chearnacha|few#{n} throigh chearnacha|many#{n} dtroigh chearnacha|#{n} troigh chearnach",
             "square-inch": "two#{n} orlach chearnacha|few#{n} orlach chearnacha|many#{n} orlach chearnacha|#{n} orlach cearnach",
@@ -190,21 +189,21 @@
             "square-mile": "one#{n} mhíle cearnach|two#{n} mhíle chearnacha|few#{n} mhíle chearnacha|many#{n} míle chearnacha|#{n} míle cearnach",
             "square-yard": "two#{n} shlat chearnacha|few#{n} shlat chearnacha|many#{n} slat chearnacha|#{n} slat chearnach",
             "stone": "one#{n} chloch|two#{n} chloch|few#{n} chloch|many#{n} gcloch|#{n} cloch",
-            "tablespoon": "#{n} spúnóg bhoird",
+            "tablespoon": "#{n} spbh",
             "teaspoon": "two#{n} thaespúnóg|few#{n} thaespúnóg|many#{n} dtaespúnóg|#{n} taespúnóg",
             "terabit": "two#{n} theirighiotán|few#{n} theirighiotán|many#{n} dteirighiotán|#{n} teirighiotán",
-            "terabit-per-second": "#{n} teirighiotán sa soicind",
+            "terabit-per-second": "#{n} teirighiotán/s",
             "terabyte": "two#{n} theiribheart|few#{n} theiribheart|many#{n} dteiribheart|#{n} teiribheart",
-            "terabyte-per-hour": "#{n} teiribheart san uair",
-            "terabyte-per-second": "#{n} teiribheart sa soicind",
+            "terabyte-per-hour": "#{n} teiribheart/u",
+            "terabyte-per-second": "#{n} teiribheart/s",
             "therm-us": "two#{n} theirm SAM|few#{n} theirm SAM|many#{n} dteirm SAM|#{n} teirm SAM",
             "ton": "two#{n} thonna ghearra|few#{n} thonna ghearra|many#{n} dtonna ghearra|#{n} tonna gearr",
             "tonne": "two#{n} thonna mhéadracha|few#{n} thonna mhéadracha|many#{n} dtonna mhéadracha|#{n} tonna méadrach",
             "volt": "#{n} volta",
             "watt": "#{n} vata",
-            "week": "two#{n} sheachtain|few#{n} seachtaine|many#{n} seachtaine|#{n} seachtain",
+            "week": "#{n} scht",
             "yard": "two#{n} shlat|few#{n} shlat|#{n} slat",
-            "year": "one#{n} bhliain|two#{n} bhliain|few#{n} bliana|many#{n} mbliana|#{n} bliain"
+            "year": "one#{n} bhliain|two#{n} bhl|many#{n} mbl|#{n} bl"
         },
         "short": {
             "acre": "#{n} ac",
@@ -216,6 +215,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bharra|two#{n} bharra|few#{n} bharra|many#{n} mbarra|#{n} barra",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "one#{n} ghiotán|two#{n} ghiotán|few#{n} ghiotán|many#{n} ngiotán|#{n} giotán",
             "bit-per-second": "#{n} giotán/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,21 +249,19 @@
             "dessert-spoon": "#{n} spmhil",
             "dessert-spoon-imperial": "#{n} spmhil imp",
             "dot": "one#{n} phonc|two#{n} phonc|few#{n} phonc|many#{n} bponc|#{n} ponc",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} dr l.",
             "drop": "one#{n} bhraon|two#{n} bhraon|few#{n} bhraon|many#{n} mbraon|#{n} braon",
             "dunam": "two#{n} dhunam|few#{n} dhunam|many#{n} ndunam|#{n} dunam",
             "earth-mass": "#{n} M⊕",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "#{n} eV",
-            "em": "many#{n} n-eim|#{n} eim",
+            "em": "one#{n} eim|two#{n} eim|few#{n} eim|many#{n} eim|#{n} em",
             "fahrenheit": "#{n}°F",
             "fathom": "#{n} fth",
             "fluid-ounce": "many#{n} n-unsa l.|#{n} unsa l.",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
             "foodcalorie": "#{n} Cal",
-            "foot": "two#{n} thr.|few#{n} thr.|many#{n} dtr.|#{n} tr.",
+            "foot": "#{n} tr.",
             "foot-per-second": "#{n} tr./s",
             "furlong": "#{n} st",
             "g-force": "#{n} G",
@@ -277,7 +275,7 @@
             "gigabyte-per-second": "#{n} GB/s",
             "gigahertz": "#{n} GHz",
             "gigawatt": "#{n} GW",
-            "grain": "one#{n} ghráinne|two#{n} ghráinne|few#{n} ghráinne|many#{n} ngráinne|#{n} gráinne",
+            "grain": "#{n} gráinne",
             "gram": "#{n} g",
             "hectare": "#{n} ha",
             "hectoliter": "#{n} hl",
@@ -285,7 +283,7 @@
             "hertz": "#{n} Hz",
             "horsepower": "#{n} ec",
             "hour": "#{n} u",
-            "inch": "many#{n} n-or.|#{n} or.",
+            "inch": "#{n} or.",
             "inch-ofhg": "many#{n} n-or. Hg|#{n} or. Hg",
             "item": "#{n} item",
             "jigger": "one#{n} mhiosúr|two#{n} mhiosúr|few#{n} mhiosúr|#{n} miosúr",
@@ -309,7 +307,7 @@
             "kilowatt": "#{n} kW",
             "kilowatt-hour": "#{n} kWh",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
-            "knot": "one#{n} mhuirmh/u|two#{n} muirmh/u|#{n} mrml/u",
+            "knot": "#{n} mrml/u",
             "light-year": "#{n} sbh",
             "liter": "#{n} l",
             "liter-per-100-kilometer": "#{n} l/100km",
@@ -350,10 +348,10 @@
             "milliwatt": "#{n} mW",
             "minute": "#{n} nóim",
             "mole": "one#{n} mhól|two#{n} mhól|few#{n} mhól|#{n} mól",
-            "month": "one#{n} mhí|two#{n} mhí|few#{n} mhí|#{n} mí",
+            "month": "one#{n} mí|two#{n} mí|few#{n} mí|many#{n} mí|#{n} m",
             "nanometer": "#{n} nm",
             "nanosecond": "#{n} ns",
-            "nautical-mile": "one#{n} mhuirmh.|two#{n} mhuirmh.|few#{n} mhuirmh.|#{n} muirmh.",
+            "nautical-mile": "#{n} muirmh.",
             "newton": "#{n} N",
             "newton-meter": "#{n} N⋅m",
             "ohm": "#{n} Ω",
@@ -383,7 +381,7 @@
             "quarter": "one#{n} ctú|#{n} cna",
             "radian": "#{n} raid",
             "revolution": "#{n} imr",
-            "second": "two#{n} shoic|few#{n} shoic|#{n} soic",
+            "second": "#{n} soic",
             "short-ton": "#{n} t.g.",
             "solar-luminosity": "#{n} L☉",
             "solar-mass": "#{n} M☉",
@@ -410,7 +408,7 @@
             "watt": "#{n} W",
             "week": "#{n} scht",
             "yard": "two#{n} shl.|few#{n} shl.|#{n} sl.",
-            "year": "one#{n} bhl|two#{n} bhl|many#{n} mbl|#{n} bl"
+            "year": "#{n} bl"
         }
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/gaa/unitfmt.json b/js/data/locale/gaa/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/gaa/unitfmt.json
+++ b/js/data/locale/gaa/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/gd/ctrynames.json b/js/data/locale/gd/ctrynames.json
index 6bf873b053..c074594ac6 100644
--- a/js/data/locale/gd/ctrynames.json
+++ b/js/data/locale/gd/ctrynames.json
@@ -261,7 +261,7 @@
     "Samotha na h-Aimeireaga": "AS",
     "San Marino": "SM",
     "São Tomé agus Príncipe": "ST",
-    "Sark": "CQ",
+    "Sarc": "CQ",
     "Sathara an Iar": "EH",
     "Sealainn Nuadh": "NZ",
     "Seanagal": "SN",
diff --git a/js/data/locale/gd/ctryreverse.json b/js/data/locale/gd/ctryreverse.json
index 9c79c2df6a..9fc9ce7fef 100644
--- a/js/data/locale/gd/ctryreverse.json
+++ b/js/data/locale/gd/ctryreverse.json
@@ -81,7 +81,7 @@
     "CN": "An t-Sìn",
     "CO": "Coloimbia",
     "CP": "Eilean Clipperton",
-    "CQ": "Sark",
+    "CQ": "Sarc",
     "CR": "Costa Rìcea",
     "CU": "Cùba",
     "CV": "An Ceap Uaine",
diff --git a/js/data/locale/gd/sysres.json b/js/data/locale/gd/sysres.json
index 53e759ae4c..4d544461b6 100644
--- a/js/data/locale/gd/sysres.json
+++ b/js/data/locale/gd/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#an {num} diog|two#an {num} dhiog|few#an {num} diog.|#an {num} diog",
     "#in {num}w": "one#an {num} sheachd.|two#an {num} sheachd.|few#an {num} seachd.|#an {num} seachd.",
     "#in {num}y": "one#an {num} bhlia.|two#an {num} bhlia.|few#an {num} blia.|#an {num} blia.",
-    "#{num} ms": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}là|two#{num}là|few#{num}là|#{num}là",
     "#{num}d ago": "one#o {num} là|two#o {num} là|few#o {num} là.|#o {num} là",
     "#{num}h": "one#{num}u|two#{num}u|few#{num}u|#{num}u",
diff --git a/js/data/locale/gd/unitfmt.json b/js/data/locale/gd/unitfmt.json
index 77e93cdda9..8dbeecd474 100644
--- a/js/data/locale/gd/unitfmt.json
+++ b/js/data/locale/gd/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} bhrùthadh-àile|two#{n} bhrùthadh-àile|#{n} brùthadh-àile",
             "bar": "one#{n} bhar|two#{n} bhàr|few#{n} bàraichean|#{n} bàr",
             "barrel": "one#{n} bharaill|two#{n} bharaill|few#{n} baraillean|#{n} baraill",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bhiod|two#{n} bhiod|few#{n} biodan|#{n} biod",
             "bit-per-second": "#{n} biod san diog",
             "british-thermal-unit": "few#{n} aonadan-teasa Breatannach|#{n} aonad-teasa Breatannach",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} àile",
             "bar": "one#{n} bhàr|two#{n} bhàr|#{n} bàr",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/d",
             "british-thermal-unit": "#{n} Btu",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "few#{n} spàin-mìl|#{n} spàin-mhìl",
             "dessert-spoon-imperial": "few#{n} spàin-mìl ìmp.|#{n} spàin-mhìl ìmp.",
-            "dot": "#{n} dot",
+            "dot": "two#{n} dhot|#{n} dot",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "two#{n} dhrama|#{n} drama",
diff --git a/js/data/locale/gez/unitfmt.json b/js/data/locale/gez/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/gez/unitfmt.json
+++ b/js/data/locale/gez/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/gl/ctrynames.json b/js/data/locale/gl/ctrynames.json
index 908654f1da..4c6aad1c96 100644
--- a/js/data/locale/gl/ctrynames.json
+++ b/js/data/locale/gl/ctrynames.json
@@ -177,7 +177,6 @@
     "Melanesia": "054",
     "México": "MX",
     "Micronesia": "FM",
-    "Moldavia": "MD",
     "Mónaco": "MC",
     "Mongolia": "MN",
     "Montenegro": "ME",
@@ -229,6 +228,7 @@
     "República Democrática do Congo": "CD",
     "República do Congo": "CG",
     "República Dominicana": "DO",
+    "República Moldova": "MD",
     "Reunión": "RE",
     "Rexión de Micronesia": "057",
     "Rexión descoñecida": "ZZ",
@@ -243,7 +243,7 @@
     "Samoa Americana": "AS",
     "San Marino": "SM",
     "San Tomé e Príncipe": "ST",
-    "San Vicente e As Granadinas": "VC",
+    "San Vicente e as Granadinas": "VC",
     "Santa Helena": "SH",
     "Santa Lucía": "LC",
     "Sark": "CQ",
diff --git a/js/data/locale/gl/ctryreverse.json b/js/data/locale/gl/ctryreverse.json
index 09392d1c16..c83499b810 100644
--- a/js/data/locale/gl/ctryreverse.json
+++ b/js/data/locale/gl/ctryreverse.json
@@ -176,7 +176,7 @@
     "LY": "Libia",
     "MA": "Marrocos",
     "MC": "Mónaco",
-    "MD": "Moldavia",
+    "MD": "República Moldova",
     "ME": "Montenegro",
     "MF": "Saint Martin",
     "MG": "Madagascar",
@@ -277,7 +277,7 @@
     "UY": "O Uruguai",
     "UZ": "Uzbekistán",
     "VA": "Cidade do Vaticano",
-    "VC": "San Vicente e As Granadinas",
+    "VC": "San Vicente e as Granadinas",
     "VE": "Venezuela",
     "VG": "Illas Virxes Británicas",
     "VI": "Illas Virxes Estadounidenses",
diff --git a/js/data/locale/gl/sysres.json b/js/data/locale/gl/sysres.json
index 0015011e04..30e5754e4b 100644
--- a/js/data/locale/gl/sysres.json
+++ b/js/data/locale/gl/sysres.json
@@ -6,14 +6,14 @@
     "#in {num}s": "one#en {num} s|#en {num} s",
     "#in {num}w": "one#en {num} sem.|#en {num} sem.",
     "#in {num}y": "one#en {num} ano|#en {num} anos",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d|#{num} d",
     "#{num}d ago": "one#hai {num} día|#hai {num} días",
-    "#{num}h": "one#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#hai {num} h|#hai {num} h",
     "#{num}mi ago": "one#hai {num} min|#hai {num} min",
     "#{num}mo ago": "one#hai {num} mes|#hai {num} meses",
-    "#{num}s": "one#{num} s|#{num} s",
+    "#{num}s": "#{num} s",
     "#{num}s ago": "one#hai {num} s|#hai {num} s",
     "#{num}w": "one#{num} sem.|#{num} sem.",
     "#{num}w ago": "one#hai {num} sem.|#hai {num} sem.",
@@ -26,13 +26,13 @@
     "1#1 hour ago|#{num} hours ago": "one#hai {num} hora|#hai {num} horas",
     "1#1 hour|#{num} hours": "one#{num} hora|#{num} horas",
     "1#1 hr ago|#{num} hrs ago": "one#hai {num} hora|#hai {num} horas",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisegundo|#{num} milisegundos",
     "1#1 min ago|#{num} min ago": "one#hai {num} minuto|#hai {num} minutos",
     "1#1 minute ago|#{num} minutes ago": "one#hai {num} minuto|#hai {num} minutos",
     "1#1 minute|#{num} minutes": "one#{num} minuto|#{num} minutos",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "one#hai {num} mes|#hai {num} meses",
     "1#1 month ago|#{num} months ago": "one#hai {num} mes|#hai {num} meses",
     "1#1 month|#{num} months": "one#{num} mes|#{num} meses",
@@ -41,8 +41,8 @@
     "1#1 sec ago|#{num} sec ago": "one#hai {num} segundo|#hai {num} segundos",
     "1#1 second ago|#{num} seconds ago": "one#hai {num} segundo|#hai {num} segundos",
     "1#1 second|#{num} seconds": "one#{num} segundo|#{num} segundos",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 se|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#hai {num} semana|#hai {num} semanas",
     "1#1 week|#{num} weeks": "one#{num} semana|#{num} semanas",
     "1#1 wk ago|#{num} wks ago": "one#hai {num} semana|#hai {num} semanas",
@@ -115,42 +115,42 @@
     "L7": "X",
     "L8": "A",
     "L9": "S",
-    "LL1": "Xa",
-    "LL10": "Ou",
-    "LL11": "No",
-    "LL12": "De",
-    "LL2": "Fe",
-    "LL3": "Ma",
-    "LL4": "Ab",
-    "LL5": "Ma",
-    "LL6": "Xu",
-    "LL7": "Xu",
-    "LL8": "Ag",
-    "LL9": "Se",
-    "LLL1": "Xan.",
-    "LLL10": "Out.",
-    "LLL11": "Nov.",
-    "LLL12": "Dec.",
-    "LLL2": "Feb.",
-    "LLL3": "Mar.",
-    "LLL4": "Abr.",
-    "LLL5": "Maio",
-    "LLL6": "Xuño",
-    "LLL7": "Xul.",
-    "LLL8": "Ago.",
-    "LLL9": "Set.",
-    "LLLL1": "Xaneiro",
-    "LLLL10": "Outubro",
-    "LLLL11": "Novembro",
-    "LLLL12": "Decembro",
-    "LLLL2": "Febreiro",
-    "LLLL3": "Marzo",
-    "LLLL4": "Abril",
-    "LLLL5": "Maio",
-    "LLLL6": "Xuño",
-    "LLLL7": "Xullo",
-    "LLLL8": "Agosto",
-    "LLLL9": "Setembro",
+    "LL1": "xa",
+    "LL10": "ou",
+    "LL11": "no",
+    "LL12": "de",
+    "LL2": "fe",
+    "LL3": "ma",
+    "LL4": "ab",
+    "LL5": "ma",
+    "LL6": "xu",
+    "LL7": "xu",
+    "LL8": "ag",
+    "LL9": "se",
+    "LLL1": "xan.",
+    "LLL10": "out.",
+    "LLL11": "nov.",
+    "LLL12": "dec.",
+    "LLL2": "feb.",
+    "LLL3": "mar.",
+    "LLL4": "abr.",
+    "LLL5": "maio",
+    "LLL6": "xuño",
+    "LLL7": "xul.",
+    "LLL8": "ago.",
+    "LLL9": "set.",
+    "LLLL1": "xaneiro",
+    "LLLL10": "outubro",
+    "LLLL11": "novembro",
+    "LLLL12": "decembro",
+    "LLLL2": "febreiro",
+    "LLLL3": "marzo",
+    "LLLL4": "abril",
+    "LLLL5": "maio",
+    "LLLL6": "xuño",
+    "LLLL7": "xullo",
+    "LLLL8": "agosto",
+    "LLLL9": "setembro",
     "MMM1": "xan.",
     "MMM10": "out.",
     "MMM11": "nov.",
@@ -208,34 +208,34 @@
     "c4": "X",
     "c5": "V",
     "c6": "S",
-    "cc0": "Do",
-    "cc1": "Lu",
-    "cc2": "Ma",
-    "cc3": "Mé",
-    "cc4": "Xo",
-    "cc5": "Ve",
-    "cc6": "Sá",
-    "ccc0": "Dom.",
-    "ccc1": "Luns",
-    "ccc2": "Mar.",
-    "ccc3": "Mér.",
-    "ccc4": "Xov.",
-    "ccc5": "Ven.",
-    "ccc6": "Sáb.",
-    "cccc0": "Domingo",
-    "cccc1": "Luns",
-    "cccc2": "Martes",
-    "cccc3": "Mércores",
-    "cccc4": "Xoves",
-    "cccc5": "Venres",
-    "cccc6": "Sábado",
+    "cc0": "do.",
+    "cc1": "lu.",
+    "cc2": "ma.",
+    "cc3": "mé.",
+    "cc4": "xo.",
+    "cc5": "ve.",
+    "cc6": "sá.",
+    "ccc0": "dom.",
+    "ccc1": "luns",
+    "ccc2": "mar.",
+    "ccc3": "mér.",
+    "ccc4": "xov.",
+    "ccc5": "ven.",
+    "ccc6": "sáb.",
+    "cccc0": "domingo",
+    "cccc1": "luns",
+    "cccc2": "martes",
+    "cccc3": "mércores",
+    "cccc4": "xoves",
+    "cccc5": "venres",
+    "cccc6": "sábado",
     "durationLongDays": "one#{num} día|#{num} días",
-    "durationMediumHours": "one#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} sem.|#{num} sem.",
     "durationMediumYears": "one#{num} a.|#{num} a.",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|#{num} min",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
     "durationShortMonths": "one#{num} m.|#{num} m.",
     "finalSeparatorFull": " e ",
     "finalSeparatorLong": ", ",
diff --git a/js/data/locale/gl/unitfmt.json b/js/data/locale/gl/unitfmt.json
index d4f34f704c..d852a79857 100644
--- a/js/data/locale/gl/unitfmt.json
+++ b/js/data/locale/gl/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bares",
             "barrel": "one#{n} barril|#{n} barrís",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidade térmica británica|#{n} unidades térmicas británicas",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#Bft {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} cull. sobr.",
             "dessert-spoon-imperial": "#{n} cull. sobr. imp.",
-            "dot": "#{n} ptos.",
+            "dot": "one#{n} pto.|#{n} ptos.",
             "dot-per-centimeter": "#{n} ppcm",
             "dot-per-inch": "#{n} ppp",
             "dram": "one#{n} dracma|#{n} dracmas",
@@ -262,7 +264,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/gn/unitfmt.json b/js/data/locale/gn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/gn/unitfmt.json
+++ b/js/data/locale/gn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/gsw/FR/ctrynames.json b/js/data/locale/gsw/FR/ctrynames.json
index e7381dd680..07ce35c2e1 100644
--- a/js/data/locale/gsw/FR/ctrynames.json
+++ b/js/data/locale/gsw/FR/ctrynames.json
@@ -39,7 +39,7 @@
     "Bouvet-Insle": "BV",
     "Brasilie": "BR",
     "Britischi Jungfere-Insle": "VG",
-    "Britischs Territoorium im Indische Oozean": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brunäi Tarussalam": "BN",
     "Bulgaarie": "BG",
     "Burkina Faaso": "BF",
diff --git a/js/data/locale/gsw/FR/ctryreverse.json b/js/data/locale/gsw/FR/ctryreverse.json
index ab3be4f16e..b2c2f10293 100644
--- a/js/data/locale/gsw/FR/ctryreverse.json
+++ b/js/data/locale/gsw/FR/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Insle vo Män",
     "IN": "Indie",
-    "IO": "Britischs Territoorium im Indische Oozean",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Iisland",
diff --git a/js/data/locale/gsw/LI/ctrynames.json b/js/data/locale/gsw/LI/ctrynames.json
index e7381dd680..07ce35c2e1 100644
--- a/js/data/locale/gsw/LI/ctrynames.json
+++ b/js/data/locale/gsw/LI/ctrynames.json
@@ -39,7 +39,7 @@
     "Bouvet-Insle": "BV",
     "Brasilie": "BR",
     "Britischi Jungfere-Insle": "VG",
-    "Britischs Territoorium im Indische Oozean": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brunäi Tarussalam": "BN",
     "Bulgaarie": "BG",
     "Burkina Faaso": "BF",
diff --git a/js/data/locale/gsw/LI/ctryreverse.json b/js/data/locale/gsw/LI/ctryreverse.json
index ab3be4f16e..b2c2f10293 100644
--- a/js/data/locale/gsw/LI/ctryreverse.json
+++ b/js/data/locale/gsw/LI/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Insle vo Män",
     "IN": "Indie",
-    "IO": "Britischs Territoorium im Indische Oozean",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Iisland",
diff --git a/js/data/locale/gsw/ctrynames.json b/js/data/locale/gsw/ctrynames.json
index e7381dd680..07ce35c2e1 100644
--- a/js/data/locale/gsw/ctrynames.json
+++ b/js/data/locale/gsw/ctrynames.json
@@ -39,7 +39,7 @@
     "Bouvet-Insle": "BV",
     "Brasilie": "BR",
     "Britischi Jungfere-Insle": "VG",
-    "Britischs Territoorium im Indische Oozean": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brunäi Tarussalam": "BN",
     "Bulgaarie": "BG",
     "Burkina Faaso": "BF",
diff --git a/js/data/locale/gsw/ctryreverse.json b/js/data/locale/gsw/ctryreverse.json
index ab3be4f16e..b2c2f10293 100644
--- a/js/data/locale/gsw/ctryreverse.json
+++ b/js/data/locale/gsw/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Insle vo Män",
     "IN": "Indie",
-    "IO": "Britischs Territoorium im Indische Oozean",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Iisland",
diff --git a/js/data/locale/gsw/unitfmt.json b/js/data/locale/gsw/unitfmt.json
index bbf787e1f9..1df83d5eec 100644
--- a/js/data/locale/gsw/unitfmt.json
+++ b/js/data/locale/gsw/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/gu/unitfmt.json b/js/data/locale/gu/unitfmt.json
index df880c471d..6c3678a508 100644
--- a/js/data/locale/gu/unitfmt.json
+++ b/js/data/locale/gu/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} વાતાવરણ",
             "bar": "#{n} બાર",
             "barrel": "#{n} બેરલ",
+            "beaufort": "#બોફર્ટ {n}",
             "bit": "#{n} બિટ",
             "bit-per-second": "#{n} બિટ પ્રતિ સેકંડ",
             "british-thermal-unit": "#{n} બ્રિટીશ થર્મલ યુનિટ",
@@ -36,23 +37,23 @@
             "cup-metric": "#{n} મેટ્રિક કપ",
             "dalton": "#{n} ડાલ્ટન",
             "day": "#{n} દિવસ",
-            "day-person": "#{n} દિવસ",
+            "day-person": "",
             "decade": "one#{n} દાયકો|#{n} દાયકા",
             "deciliter": "#{n} ડેસિલીટર",
             "decimeter": "#{n} ડેસિમીટર",
             "degree": "#{n} અંશ",
             "dessert-spoon": "#{n} ડેઝર્ટ સ્પૂન",
             "dessert-spoon-imperial": "#{n} ઇમ્પીરિયલ ડેઝર્ટ સ્પૂન",
-            "dot": "one#{n} px|#{n} ડૉટ",
-            "dot-per-centimeter": "one#{n} ડૉટ પ્રતિ સેન્ટિમીટર|#{n} ડૉટ્સ પ્રતિ સેન્ટિમીટર",
-            "dot-per-inch": "one#{n} ડૉટ પ્રતિ ઇંચ|#{n} ડૉટ્સ પ્રતિ ઇંચ",
+            "dot": "#{n} ડૉટ",
+            "dot-per-centimeter": "#{n} ડૉટ પ્રતિ સેન્ટિમીટર",
+            "dot-per-inch": "#{n} ડૉટ પ્રતિ ઇંચ",
             "dram": "#{n} ડ્રામ",
             "drop": "#{n} ડ્રોપ",
             "dunam": "#{n} ડનમ",
             "earth-mass": "#{n} પૃથ્વી ઘનતા",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "#{n} ઇલેક્ટ્રોનવૉલ્ટ",
-            "em": "#{n} em",
+            "em": "one#{n} em|#{n} ems",
             "fahrenheit": "#{n} ડિગ્રી ફેરનહીટ",
             "fathom": "#{n} ફૅધમ",
             "fluid-ounce": "#{n} પ્રવાહી ઔંસ",
@@ -119,7 +120,7 @@
             "megahertz": "#{n} મેગાહર્ટ્ઝ",
             "megaliter": "#{n} મેગાલીટર",
             "megapascal": "#{n} મેગાપાસ્કલ",
-            "megapixel": "#{n} MP",
+            "megapixel": "#{n} મેગાપિક્સેલ",
             "megawatt": "#{n} મેગાવૉટ",
             "meter": "#{n} મીટર",
             "meter-per-second": "#{n} મીટર પ્રતિ સેકન્ડ",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} બાર",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} બિટ",
             "bit-per-second": "#{n} બિટ પ્રતિ સેકંડ",
             "british-thermal-unit": "#{n} Btu",
@@ -249,9 +251,9 @@
             "degree": "#{n} અંશ",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "one#{n} px|#{n} ડૉટ",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "#{n} ડૉટ",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
             "drop": "#{n} ડ્રોપ",
             "dunam": "#{n} ડનમ",
@@ -263,7 +265,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} પ્રવાહી ઔંસ",
             "fluid-ounce-imperial": "#{n} પ્રવાહી ઔંસ ઇમ્પીરિયલ",
-            "foodcalorie": "#{n} Cal",
+            "foodcalorie": "#{n} કેલરી",
             "foot": "#{n} ફૂટ",
             "foot-per-second": "#{n} ફૂટ પ્રતિ સેકંડ",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/guz/ctrynames.json b/js/data/locale/guz/ctrynames.json
index f17a4fc647..2f48370426 100644
--- a/js/data/locale/guz/ctrynames.json
+++ b/js/data/locale/guz/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/guz/ctryreverse.json b/js/data/locale/guz/ctryreverse.json
index 3919b41208..894a6816e2 100644
--- a/js/data/locale/guz/ctryreverse.json
+++ b/js/data/locale/guz/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/guz/unitfmt.json b/js/data/locale/guz/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/guz/unitfmt.json
+++ b/js/data/locale/guz/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/gv/unitfmt.json b/js/data/locale/gv/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/gv/unitfmt.json
+++ b/js/data/locale/gv/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ha/Arab/SD/unitfmt.json b/js/data/locale/ha/Arab/SD/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ha/Arab/SD/unitfmt.json
+++ b/js/data/locale/ha/Arab/SD/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ha/Arab/unitfmt.json b/js/data/locale/ha/Arab/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ha/Arab/unitfmt.json
+++ b/js/data/locale/ha/Arab/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ha/GH/ctrynames.json b/js/data/locale/ha/GH/ctrynames.json
index ac891cd6f3..b6ad38a200 100644
--- a/js/data/locale/ha/GH/ctrynames.json
+++ b/js/data/locale/ha/GH/ctrynames.json
@@ -27,6 +27,7 @@
     "Aruba": "AW",
     "Asiya": "142",
     "Asiya ta Tsakiya": "143",
+    "Asturesiya": "053",
     "Ayalan": "IE",
     "Azarbaijan": "AZ",
     "Babban Yankin Mulkin Hong Kong na Ƙasar Sin": "HK",
@@ -123,6 +124,7 @@
     "Karebiyan": "029",
     "Kasar Jersey": "JE",
     "Kasar Kosovo": "XK",
+    "Kasar Polynesia": "061",
     "Katar": "QA",
     "Kazakistan": "KZ",
     "Kenya": "KE",
@@ -168,6 +170,7 @@
     "Maroko": "MA",
     "Martinik": "MQ",
     "Mayoti": "YT",
+    "Melanesia": "054",
     "Mesiko": "MX",
     "Mikuronesiya": "FM",
     "Misira": "EG",
@@ -253,11 +256,9 @@
     "Turkis Da Tsibiran Kaikwas": "TC",
     "Turkiyya": "TR",
     "Turkumenistan": "TM",
-    "Tsibarai na Austraila da New Zealand da maƙota": "053",
     "Tsibirai Cocos (Keeling)": "CC",
     "Tsibirai na Åland": "AX",
     "Tsibirai na Faroe": "FO",
-    "Tsibirai na New Guinea da Fiji da maƙota": "054",
     "Tsibiran Birjin Ta Amurka": "VI",
     "Tsibiran Canary": "IC",
     "Tsibiran Falkilan": "FK",
@@ -267,7 +268,6 @@
     "Tsibiran Mariyana Na Arewa": "MP",
     "Tsibiran Marshal": "MH",
     "Tsibiran Salaman": "SB",
-    "Tsibiri": "061",
     "Tsibirin Ascension": "AC",
     "Tsibirin Birjin Na Birtaniya": "VG",
     "Tsibirin Bouvet": "BV",
diff --git a/js/data/locale/ha/GH/ctryreverse.json b/js/data/locale/ha/GH/ctryreverse.json
index 8ce50d69d4..670bba0ae3 100644
--- a/js/data/locale/ha/GH/ctryreverse.json
+++ b/js/data/locale/ha/GH/ctryreverse.json
@@ -17,10 +17,10 @@
     "034": "Kudancin Asiya",
     "035": "Kudu Maso Gabashin Asiya",
     "039": "Kudancin Turai",
-    "053": "Tsibarai na Austraila da New Zealand da maƙota",
-    "054": "Tsibirai na New Guinea da Fiji da maƙota",
+    "053": "Asturesiya",
+    "054": "Melanesia",
     "057": "Yankin Micronesiya",
-    "061": "Tsibiri",
+    "061": "Kasar Polynesia",
     "142": "Asiya",
     "143": "Asiya ta Tsakiya",
     "145": "Yammacin Asiya",
diff --git a/js/data/locale/ha/NE/ctrynames.json b/js/data/locale/ha/NE/ctrynames.json
index ac891cd6f3..b6ad38a200 100644
--- a/js/data/locale/ha/NE/ctrynames.json
+++ b/js/data/locale/ha/NE/ctrynames.json
@@ -27,6 +27,7 @@
     "Aruba": "AW",
     "Asiya": "142",
     "Asiya ta Tsakiya": "143",
+    "Asturesiya": "053",
     "Ayalan": "IE",
     "Azarbaijan": "AZ",
     "Babban Yankin Mulkin Hong Kong na Ƙasar Sin": "HK",
@@ -123,6 +124,7 @@
     "Karebiyan": "029",
     "Kasar Jersey": "JE",
     "Kasar Kosovo": "XK",
+    "Kasar Polynesia": "061",
     "Katar": "QA",
     "Kazakistan": "KZ",
     "Kenya": "KE",
@@ -168,6 +170,7 @@
     "Maroko": "MA",
     "Martinik": "MQ",
     "Mayoti": "YT",
+    "Melanesia": "054",
     "Mesiko": "MX",
     "Mikuronesiya": "FM",
     "Misira": "EG",
@@ -253,11 +256,9 @@
     "Turkis Da Tsibiran Kaikwas": "TC",
     "Turkiyya": "TR",
     "Turkumenistan": "TM",
-    "Tsibarai na Austraila da New Zealand da maƙota": "053",
     "Tsibirai Cocos (Keeling)": "CC",
     "Tsibirai na Åland": "AX",
     "Tsibirai na Faroe": "FO",
-    "Tsibirai na New Guinea da Fiji da maƙota": "054",
     "Tsibiran Birjin Ta Amurka": "VI",
     "Tsibiran Canary": "IC",
     "Tsibiran Falkilan": "FK",
@@ -267,7 +268,6 @@
     "Tsibiran Mariyana Na Arewa": "MP",
     "Tsibiran Marshal": "MH",
     "Tsibiran Salaman": "SB",
-    "Tsibiri": "061",
     "Tsibirin Ascension": "AC",
     "Tsibirin Birjin Na Birtaniya": "VG",
     "Tsibirin Bouvet": "BV",
diff --git a/js/data/locale/ha/NE/ctryreverse.json b/js/data/locale/ha/NE/ctryreverse.json
index 8ce50d69d4..670bba0ae3 100644
--- a/js/data/locale/ha/NE/ctryreverse.json
+++ b/js/data/locale/ha/NE/ctryreverse.json
@@ -17,10 +17,10 @@
     "034": "Kudancin Asiya",
     "035": "Kudu Maso Gabashin Asiya",
     "039": "Kudancin Turai",
-    "053": "Tsibarai na Austraila da New Zealand da maƙota",
-    "054": "Tsibirai na New Guinea da Fiji da maƙota",
+    "053": "Asturesiya",
+    "054": "Melanesia",
     "057": "Yankin Micronesiya",
-    "061": "Tsibiri",
+    "061": "Kasar Polynesia",
     "142": "Asiya",
     "143": "Asiya ta Tsakiya",
     "145": "Yammacin Asiya",
diff --git a/js/data/locale/ha/ctrynames.json b/js/data/locale/ha/ctrynames.json
index ac891cd6f3..b6ad38a200 100644
--- a/js/data/locale/ha/ctrynames.json
+++ b/js/data/locale/ha/ctrynames.json
@@ -27,6 +27,7 @@
     "Aruba": "AW",
     "Asiya": "142",
     "Asiya ta Tsakiya": "143",
+    "Asturesiya": "053",
     "Ayalan": "IE",
     "Azarbaijan": "AZ",
     "Babban Yankin Mulkin Hong Kong na Ƙasar Sin": "HK",
@@ -123,6 +124,7 @@
     "Karebiyan": "029",
     "Kasar Jersey": "JE",
     "Kasar Kosovo": "XK",
+    "Kasar Polynesia": "061",
     "Katar": "QA",
     "Kazakistan": "KZ",
     "Kenya": "KE",
@@ -168,6 +170,7 @@
     "Maroko": "MA",
     "Martinik": "MQ",
     "Mayoti": "YT",
+    "Melanesia": "054",
     "Mesiko": "MX",
     "Mikuronesiya": "FM",
     "Misira": "EG",
@@ -253,11 +256,9 @@
     "Turkis Da Tsibiran Kaikwas": "TC",
     "Turkiyya": "TR",
     "Turkumenistan": "TM",
-    "Tsibarai na Austraila da New Zealand da maƙota": "053",
     "Tsibirai Cocos (Keeling)": "CC",
     "Tsibirai na Åland": "AX",
     "Tsibirai na Faroe": "FO",
-    "Tsibirai na New Guinea da Fiji da maƙota": "054",
     "Tsibiran Birjin Ta Amurka": "VI",
     "Tsibiran Canary": "IC",
     "Tsibiran Falkilan": "FK",
@@ -267,7 +268,6 @@
     "Tsibiran Mariyana Na Arewa": "MP",
     "Tsibiran Marshal": "MH",
     "Tsibiran Salaman": "SB",
-    "Tsibiri": "061",
     "Tsibirin Ascension": "AC",
     "Tsibirin Birjin Na Birtaniya": "VG",
     "Tsibirin Bouvet": "BV",
diff --git a/js/data/locale/ha/ctryreverse.json b/js/data/locale/ha/ctryreverse.json
index 8ce50d69d4..670bba0ae3 100644
--- a/js/data/locale/ha/ctryreverse.json
+++ b/js/data/locale/ha/ctryreverse.json
@@ -17,10 +17,10 @@
     "034": "Kudancin Asiya",
     "035": "Kudu Maso Gabashin Asiya",
     "039": "Kudancin Turai",
-    "053": "Tsibarai na Austraila da New Zealand da maƙota",
-    "054": "Tsibirai na New Guinea da Fiji da maƙota",
+    "053": "Asturesiya",
+    "054": "Melanesia",
     "057": "Yankin Micronesiya",
-    "061": "Tsibiri",
+    "061": "Kasar Polynesia",
     "142": "Asiya",
     "143": "Asiya ta Tsakiya",
     "145": "Yammacin Asiya",
diff --git a/js/data/locale/ha/regionnames.json b/js/data/locale/ha/regionnames.json
index 1855caf696..a809e44b3f 100644
--- a/js/data/locale/ha/regionnames.json
+++ b/js/data/locale/ha/regionnames.json
@@ -6594,10 +6594,6 @@
             "code": "ENF",
             "name": "Enfield"
         },
-        {
-            "code": "ENG",
-            "name": "England"
-        },
         {
             "code": "EAW",
             "name": "England and Wales"
@@ -6702,6 +6698,10 @@
             "code": "HNS",
             "name": "Hounslow"
         },
+        {
+            "code": "ENG",
+            "name": "Ingila"
+        },
         {
             "code": "IVC",
             "name": "Inverclyde"
diff --git a/js/data/locale/ha/unitfmt.json b/js/data/locale/ha/unitfmt.json
index ee0f697530..33e6ded441 100644
--- a/js/data/locale/ha/unitfmt.json
+++ b/js/data/locale/ha/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#Yanayi {n}|#yanaye-yanaye {n}",
             "bar": "one#sanda {n}|#anduna {n}",
             "barrel": "one#ganga {n}|#ganguna {n}",
+            "beaufort": "#B {n}",
             "bit": "one#bit {n}|#bits {n}",
             "bit-per-second": "#bits {n} a daƙiƙa",
             "british-thermal-unit": "one#British thermal unit {n}|#British thermal units {n}",
@@ -216,6 +217,7 @@
             "atmosphere": "#yny {n}",
             "bar": "#sanda {n}",
             "barrel": "#gang {n}",
+            "beaufort": "#B {n}",
             "bit": "#bit {n}",
             "bit-per-second": "#bit {n}/d",
             "british-thermal-unit": "#Btu {n}",
@@ -248,7 +250,7 @@
             "degree": "#deg {n}",
             "dessert-spoon": "#dstspn {n}",
             "dessert-spoon-imperial": "#dstspn Imp {n}",
-            "dot": "#px {n}",
+            "dot": "",
             "dot-per-centimeter": "#dpcm {n}",
             "dot-per-inch": "#dpi {n}",
             "dram": "#dram fl {n}",
diff --git a/js/data/locale/haw/unitfmt.json b/js/data/locale/haw/unitfmt.json
index 58bd97b6d9..fbb718356d 100644
--- a/js/data/locale/haw/unitfmt.json
+++ b/js/data/locale/haw/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/he/sysres.json b/js/data/locale/he/sysres.json
index c42eddc5a9..bfb4ae13cc 100644
--- a/js/data/locale/he/sysres.json
+++ b/js/data/locale/he/sysres.json
@@ -1,68 +1,68 @@
 {
-    "#in {num}d": "one#‏מחר|two#‏בעוד יומיים|many#‏בעוד {num} ימים|#‏בעוד {num} ימים",
+    "#in {num}d": "one#‏מחר|two#‏בעוד יומיים|#‏בעוד {num} ימים",
     "#in {num}h": "one#‏בעוד שעה|two#‏בעוד שעתיים|many#‏בעוד {num} שע׳|#‏בעוד {num} שע׳",
     "#in {num}mi": "one#‏בעוד דקה|two#‏בעוד שתי דק׳|many#‏בעוד {num} דק׳|#‏בעוד {num} דק׳",
-    "#in {num}mo": "one#‏בעוד חודש|two#‏בעוד חודשיים|many#‏בעוד {num} חודשים|#‏בעוד {num} חודשים",
+    "#in {num}mo": "one#‏בעוד חודש|two#‏בעוד חודשיים|#‏בעוד {num} חודשים",
     "#in {num}s": "one#‏בעוד שנ׳|two#‏בעוד שתי שנ׳|many#‏בעוד {num} שנ׳|#‏בעוד {num} שנ׳",
     "#in {num}w": "one#‏בעוד שב׳|two#‏בעוד שבועיים|many#‏בעוד {num} שב׳|#‏בעוד {num} שב׳",
     "#in {num}y": "one#‏בעוד שנה|two#‏בעוד שנתיים|many#‏בעוד {num} שנה|#‏בעוד {num} שנים",
-    "#{num} ms": "one#{num} ms|two#{num} ms|many#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#י׳|two#{num} י׳|many#{num} י׳|#{num} י׳",
-    "#{num}d ago": "one#‏אתמול|two#‏לפני יומיים|many#‏לפני {num} ימים|#‏לפני {num} ימים",
-    "#{num}h": "one#שעה {num}|two#{num} שע׳|many#{num} שע׳|#{num} שע׳",
+    "#{num}d ago": "one#‏אתמול|two#‏לפני יומיים|#‏לפני {num} ימים",
+    "#{num}h": "one#שעה {num}|two#{num} שע׳|#{num} שע׳",
     "#{num}h ago": "one#‏לפני שעה|two#‏לפני שעתיים|many#‏לפני {num} שע׳|#‏לפני {num} שע׳",
     "#{num}mi ago": "one#‏לפני דקה|two#‏לפני {num} דק׳|many#‏לפני {num} דק׳|#‏לפני {num} דק׳",
-    "#{num}mo ago": "one#‏לפני חודש|two#‏לפני חודשיים|many#‏לפני {num} חודשים|#‏לפני {num} חודשים",
-    "#{num}s": "one#שניה|two#שתי שנ׳|many#{num} שנ׳|#{num} שנ׳",
+    "#{num}mo ago": "one#‏לפני חודש|two#‏לפני חודשיים|#‏לפני {num} חודשים",
+    "#{num}s": "one#שניה|two#שתי שנ׳|#{num} שנ׳",
     "#{num}s ago": "one#‏לפני שנ׳|two#‏לפני שתי שנ׳|many#‏לפני {num} שנ׳|#‏לפני {num} שנ׳",
     "#{num}w": "one#ש′ {num}|two#{num} ש′|many#{num} ש′|#{num} ש′",
     "#{num}w ago": "one#‏לפני שב׳|two#‏לפני שבועיים|many#‏לפני {num} שב׳|#‏לפני {num} שב׳",
     "#{num}y": "one#ש′ {num}|two#{num} ש′|many#{num} ש′|#{num} ש′",
     "#{num}y ago": "one#‏לפני שנה|two#‏לפני שנתיים|many#‏לפני {num} שנה|#‏לפני {num} שנים",
-    "1#1 day ago|#{num} days ago": "one#‏לפני יום {num}|two#‏לפני יומיים|many#‏לפני {num} ימים|#‏לפני {num} ימים",
+    "1#1 day ago|#{num} days ago": "one#‏לפני יום {num}|two#‏לפני יומיים|#‏לפני {num} ימים",
     "1#1 day|#{num} days": "one#יום {num}|two#יומיים|many#{num} יום|#{num} ימים",
-    "1#1 dy ago|#{num} dys ago": "one#‏לפני יום {num}|two#‏לפני יומיים|many#‏לפני {num} ימים|#‏לפני {num} ימים",
+    "1#1 dy ago|#{num} dys ago": "one#‏לפני יום {num}|two#‏לפני יומיים|#‏לפני {num} ימים",
     "1#1 dy|#{num} dys": "one#י׳|two#{num} י׳|many#{num} י׳|#{num} י׳",
-    "1#1 hour ago|#{num} hours ago": "one#‏לפני שעה|two#‏לפני שעתיים|many#‏לפני {num} שעות|#‏לפני {num} שעות",
+    "1#1 hour ago|#{num} hours ago": "one#‏לפני שעה|two#‏לפני שעתיים|#‏לפני {num} שעות",
     "1#1 hour|#{num} hours": "one#שעה|two#שעתיים|many#{num} שעות|#{num} שעות",
-    "1#1 hr ago|#{num} hrs ago": "one#‏לפני שעה|two#‏לפני שעתיים|many#‏לפני {num} שעות|#‏לפני {num} שעות",
-    "1#1 hr|#{num} hrs": "one#שעה|two#שעתיים|many#{num} שע׳|#{num} שע׳",
+    "1#1 hr ago|#{num} hrs ago": "one#‏לפני שעה|two#‏לפני שעתיים|#‏לפני {num} שעות",
+    "1#1 hr|#{num} hrs": "one#שעה|two#שעתיים|#{num} שע׳",
     "1#1 millisecond|#{num} milliseconds": "one#אלפית שנייה {num}|two#{num} אלפיות שנייה|many#{num} אלפיות שנייה|#{num} אלפיות שנייה",
-    "1#1 min ago|#{num} min ago": "one#‏לפני דקה|two#‏לפני שתי דקות|many#‏לפני {num} דקות|#‏לפני {num} דקות",
-    "1#1 minute ago|#{num} minutes ago": "one#‏לפני דקה|two#‏לפני שתי דקות|many#‏לפני {num} דקות|#‏לפני {num} דקות",
+    "1#1 min ago|#{num} min ago": "one#‏לפני דקה|two#‏לפני שתי דקות|#‏לפני {num} דקות",
+    "1#1 minute ago|#{num} minutes ago": "one#‏לפני דקה|two#‏לפני שתי דקות|#‏לפני {num} דקות",
     "1#1 minute|#{num} minutes": "one#דקה|two#שתי דקות|many#{num} דקות|#{num} דקות",
-    "1#1 min|#{num} min": "one#דקה|two#שתי דק׳|many#{num} דק׳|#{num} דק׳",
-    "1#1 mi|#{num} min": "one#דקה|two#שתי דק׳|many#{num} דק׳|#{num} דק׳",
-    "1#1 mon ago|#{num} mons ago": "one#‏לפני חודש|two#‏לפני חודשיים|many#‏לפני {num} חודשים|#‏לפני {num} חודשים",
-    "1#1 month ago|#{num} months ago": "one#‏לפני חודש|two#‏לפני חודשיים|many#‏לפני {num} חודשים|#‏לפני {num} חודשים",
+    "1#1 min|#{num} min": "one#דקה|two#שתי דק׳|#{num} דק׳",
+    "1#1 mi|#{num} min": "one#דקה|two#שתי דק׳|#{num} דק׳",
+    "1#1 mon ago|#{num} mons ago": "one#‏לפני חודש|two#‏לפני חודשיים|#‏לפני {num} חודשים",
+    "1#1 month ago|#{num} months ago": "one#‏לפני חודש|two#‏לפני חודשיים|#‏לפני {num} חודשים",
     "1#1 month|#{num} months": "one#חודש|two#חודשיים|many#{num} חודשים|#{num} חודשים",
-    "1#1 mon|#{num} mons": "one#חודש|two#חודשיים|many#{num} ח׳|#{num} ח׳",
-    "1#1 mo|#{num} mos": "one#ח׳ {num}|two#{num} ח׳|many#{num} ח׳|#{num} ח׳",
-    "1#1 sec ago|#{num} sec ago": "one#‏לפני שנייה|two#‏לפני שתי שניות|many#‏לפני {num} שניות|#‏לפני {num} שניות",
-    "1#1 second ago|#{num} seconds ago": "one#‏לפני שנייה|two#‏לפני שתי שניות|many#‏לפני {num} שניות|#‏לפני {num} שניות",
+    "1#1 mon|#{num} mons": "one#חודש|two#חודשיים|#{num} ח׳",
+    "1#1 mo|#{num} mos": "one#ח׳ {num}|two#{num} ח׳|#{num} ח׳",
+    "1#1 sec ago|#{num} sec ago": "one#‏לפני שנייה|two#‏לפני שתי שניות|#‏לפני {num} שניות",
+    "1#1 second ago|#{num} seconds ago": "one#‏לפני שנייה|two#‏לפני שתי שניות|#‏לפני {num} שניות",
     "1#1 second|#{num} seconds": "one#שניה|two#שתי שניות|many#‏{num} שניות|#{num} שניות",
-    "1#1 sec|#{num} sec": "one#שנ׳|two#שתי שנ׳|many#{num} שנ׳|#{num} שנ׳",
-    "1#1 se|#{num} sec": "one#שניה|two#שתי שנ׳|many#{num} שנ׳|#{num} שנ׳",
-    "1#1 week ago|#{num} weeks ago": "one#‏לפני שבוע|two#‏לפני שבועיים|many#‏לפני {num} שבועות|#‏לפני {num} שבועות",
-    "1#1 week|#{num} weeks": "one#שבוע|two#שבועיים|many#{num} שבועות|#{num} שבועות",
-    "1#1 wk ago|#{num} wks ago": "one#‏לפני שבוע|two#‏לפני שבועיים|many#‏לפני {num} שבועות|#‏לפני {num} שבועות",
-    "1#1 wk|#{num} wks": "one#שבוע {num}|two#שבועיים|many#{num} שבועות|#{num} שבועות",
+    "1#1 sec|#{num} sec": "one#שנ׳|two#שתי שנ׳|#{num} שנ׳",
+    "1#1 se|#{num} sec": "one#שניה|two#שתי שנ׳|#{num} שנ׳",
+    "1#1 week ago|#{num} weeks ago": "one#‏לפני שבוע|two#‏לפני שבועיים|#‏לפני {num} שבועות",
+    "1#1 week|#{num} weeks": "one#שבוע|two#שבועיים|#{num} שבועות",
+    "1#1 wk ago|#{num} wks ago": "one#‏לפני שבוע|two#‏לפני שבועיים|#‏לפני {num} שבועות",
+    "1#1 wk|#{num} wks": "one#שבוע {num}|two#שבועיים|#{num} שבועות",
     "1#1 year ago|#{num} years ago": "one#‏לפני שנה|two#‏לפני שנתיים|many#‏לפני {num} שנה|#‏לפני {num} שנים",
-    "1#1 year|#{num} years": "one#שנה|two#שנתיים|many#{num} שנים|#{num} שנים",
+    "1#1 year|#{num} years": "one#שנה|two#שנתיים|#{num} שנים",
     "1#1 yr ago|#{num} yrs ago": "one#‏לפני שנה|two#‏לפני שנתיים|many#‏לפני {num} שנה|#‏לפני {num} שנים",
-    "1#1 yr|#{num} yrs": "one#שנה {num}|two#{num} שנים|many#{num} שנים|#{num} שנים",
-    "1#in 1 day|#in {num} days": "one#‏בעוד יום {num}|two#‏בעוד יומיים|many#‏בעוד {num} ימים|#‏בעוד {num} ימים",
-    "1#in 1 dy|#in {num} dys": "one#‏בעוד יום {num}|two#‏בעוד יומיים|many#‏בעוד {num} ימים|#‏בעוד {num} ימים",
-    "1#in 1 hour|#in {num} hours": "one#‏בעוד שעה|two#‏בעוד שעתיים|many#‏בעוד {num} שעות|#‏בעוד {num} שעות",
-    "1#in 1 hr|#in {num} hrs": "one#‏בעוד שעה|two#‏בעוד שעתיים|many#‏בעוד {num} שעות|#‏בעוד {num} שעות",
-    "1#in 1 minute|#in {num} minutes": "one#‏בעוד דקה|two#‏בעוד שתי דקות|many#‏בעוד {num} דקות|#‏בעוד {num} דקות",
-    "1#in 1 min|#in {num} min": "one#‏בעוד דקה|two#‏בעוד שתי דקות|many#‏בעוד {num} דקות|#‏בעוד {num} דקות",
-    "1#in 1 month|#in {num} months": "one#‏בעוד חודש|two#‏בעוד חודשיים|many#‏בעוד {num} חודשים|#‏בעוד {num} חודשים",
-    "1#in 1 mon|#in {num} mons": "one#‏בעוד חודש|two#‏בעוד חודשיים|many#‏בעוד {num} חודשים|#‏בעוד {num} חודשים",
-    "1#in 1 second|#in {num} seconds": "one#‏בעוד שנייה|two#‏בעוד שתי שניות|many#‏בעוד {num} שניות|#‏בעוד {num} שניות",
-    "1#in 1 sec|#in {num} sec": "one#‏בעוד שנייה|two#‏בעוד שתי שניות|many#‏בעוד {num} שניות|#‏בעוד {num} שניות",
-    "1#in 1 week|#in {num} weeks": "one#‏בעוד שבוע|two#‏בעוד שבועיים|many#‏בעוד {num} שבועות|#‏בעוד {num} שבועות",
-    "1#in 1 wk|#in {num} wks": "one#‏בעוד שבוע|two#‏בעוד שבועיים|many#‏בעוד {num} שבועות|#‏בעוד {num} שבועות",
+    "1#1 yr|#{num} yrs": "one#שנה {num}|two#{num} שנים|#{num} שנים",
+    "1#in 1 day|#in {num} days": "one#‏בעוד יום {num}|two#‏בעוד יומיים|#‏בעוד {num} ימים",
+    "1#in 1 dy|#in {num} dys": "one#‏בעוד יום {num}|two#‏בעוד יומיים|#‏בעוד {num} ימים",
+    "1#in 1 hour|#in {num} hours": "one#‏בעוד שעה|two#‏בעוד שעתיים|#‏בעוד {num} שעות",
+    "1#in 1 hr|#in {num} hrs": "one#‏בעוד שעה|two#‏בעוד שעתיים|#‏בעוד {num} שעות",
+    "1#in 1 minute|#in {num} minutes": "one#‏בעוד דקה|two#‏בעוד שתי דקות|#‏בעוד {num} דקות",
+    "1#in 1 min|#in {num} min": "one#‏בעוד דקה|two#‏בעוד שתי דקות|#‏בעוד {num} דקות",
+    "1#in 1 month|#in {num} months": "one#‏בעוד חודש|two#‏בעוד חודשיים|#‏בעוד {num} חודשים",
+    "1#in 1 mon|#in {num} mons": "one#‏בעוד חודש|two#‏בעוד חודשיים|#‏בעוד {num} חודשים",
+    "1#in 1 second|#in {num} seconds": "one#‏בעוד שנייה|two#‏בעוד שתי שניות|#‏בעוד {num} שניות",
+    "1#in 1 sec|#in {num} sec": "one#‏בעוד שנייה|two#‏בעוד שתי שניות|#‏בעוד {num} שניות",
+    "1#in 1 week|#in {num} weeks": "one#‏בעוד שבוע|two#‏בעוד שבועיים|#‏בעוד {num} שבועות",
+    "1#in 1 wk|#in {num} wks": "one#‏בעוד שבוע|two#‏בעוד שבועיים|#‏בעוד {num} שבועות",
     "1#in 1 year|#in {num} years": "one#‏בעוד שנה|two#‏בעוד שנתיים|many#‏בעוד {num} שנה|#‏בעוד {num} שנים",
     "1#in 1 yr|#in {num} yrs": "one#‏בעוד שנה|two#‏בעוד שנתיים|many#‏בעוד {num} שנה|#‏בעוד {num} שנים",
     "B0": "חצות",
@@ -152,14 +152,14 @@
     "NN9": "ספ",
     "a0": "לפנה״צ",
     "a1": "אחה״צ",
-    "durationLongDays": "one#יום|two#יומיים|many#{num} ימ׳|#{num} ימ׳",
-    "durationMediumHours": "one#שעה {num}|two#{num} שע׳|many#{num} שע׳|#{num} שע׳",
-    "durationMediumMillis": "one#{num} ms|two#{num} ms|many#{num} ms|#{num} ms",
+    "durationLongDays": "one#יום|two#יומיים|#{num} ימ׳",
+    "durationMediumHours": "one#שעה {num}|two#{num} שע׳|#{num} שע׳",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#ש′ {num}|two#{num} ש′|many#{num} ש′|#{num} ש′",
     "durationMediumYears": "one#ש′ {num}|two#{num} ש′|many#{num} ש′|#{num} ש′",
-    "durationShortMillis": "one#{num} ms|two#{num} ms|many#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#דקה|two#שתי דק׳|many#{num} דק׳|#{num} דק׳",
-    "durationShortMonths": "one#ח׳ {num}|two#{num} ח׳|many#{num} ח׳|#{num} ח׳",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "one#דקה|two#שתי דק׳|#{num} דק׳",
+    "durationShortMonths": "one#ח׳ {num}|two#{num} ח׳|#{num} ח׳",
     "finalSeparatorFull": " ו-",
     "finalSeparatorLong": ", ",
     "finalSeparatorMedium": ", ",
diff --git a/js/data/locale/he/unitfmt.json b/js/data/locale/he/unitfmt.json
index c753096ce0..69310a13e5 100644
--- a/js/data/locale/he/unitfmt.json
+++ b/js/data/locale/he/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} אטמוספרה|two#{n} אטמוספרה|many#{n} אטמוספרה|#{n} אטמוספרות",
             "bar": "#{n} בר",
             "barrel": "one#{n} חבית|#{n} חביות",
+            "beaufort": "two#B {n}|#בופורט {n}",
             "bit": "#{n} ביט",
             "bit-per-second": "#{n} ביט לשניה",
             "british-thermal-unit": "one#{n} יחידה תרמית בריטית|#{n} יחידות תרמיות בריטיות",
@@ -43,21 +44,21 @@
             "degree": "one#מעלה אחת|two#שתי מעלות|#{n} מעלות",
             "dessert-spoon": "one#כפית קינוחים|#{n} כפיות קינוחים",
             "dessert-spoon-imperial": "one#כפית קינוחים בארה״ב|#{n} כפיות קינוחים בארה\"ב",
-            "dot": "one#{n} נקודה|#{n} נקודות קטנות",
-            "dot-per-centimeter": "one#נקודה {n} לסנטימטר|two#‎{n} dpcm‎|many#‎{n} dpcm|#{n} נקודות לסנטימטר",
-            "dot-per-inch": "one#‎{n} dpi‎|two#‎{n} dpi‎|many#‎{n} dpi‎|#‎{n} dots per inch‎",
+            "dot": "one#{n} נקודה|#‎{n} px ‎",
+            "dot-per-centimeter": "one#נקודה {n} לסנטימטר|two#‎{n} נקודות לסנטימטר|many#‎{n} נקודות לסנטימטר|#{n} נקודות לסנטימטר",
+            "dot-per-inch": "one#נקודות לאינץ׳|two#{n} ppi|many#{n} ppi|#‎{n} dpi‎",
             "dram": "one#דראם אלכוהול {n}|#{n} דראם אלכוהול",
             "drop": "one#טיפה|#{n} טיפות",
             "dunam": "#{n} דונם",
             "earth-mass": "one#{n} מסת כדור הארץ|two#{n} מסות כדור הארץ|many#{n} מסות כדור הארץ|#{n} M⊕",
             "earth-radius": "one#רדיוס כדור-הארץ|#{n} רדיוס כדור-הארץ",
             "electronvolt": "#{n} אלקטרון וולט",
-            "em": "one#‎{n} em ‎|two#‎{n} em ‎|many#‎{n} em ‎|#‎{n} ems ‎",
+            "em": "one#‎{n} em ‎|two#‎{n} em ‎|#‎{n} ems ‎",
             "fahrenheit": "one#מעלת פרנהייט {n}|#{n} מעלות פרנהייט",
             "fathom": "#{n} פתום",
             "fluid-ounce": "one#אונקיית נוזלים {n}|#{n} אונקיות נוזלים",
             "fluid-ounce-imperial": "#{n} אונקיית נוזלים אימפריאלית",
-            "foodcalorie": "one#קלוריה {n}|#{n} קלוריות",
+            "foodcalorie": "one#קלוריה אחת|two#שתי קלוריות|#{n} קלוריות",
             "foot": "one#רגל {n}|#{n} רגל",
             "foot-per-second": "#{n} רגל לשניה",
             "furlong": "#{n} פורלונג",
@@ -167,8 +168,8 @@
             "pint-metric": "one#פינט מטרי {n}|#{n} פינט מטרי",
             "pixel": "#‎{n} px ‎",
             "pixel-per-centimeter": "#‎{n} ppcm‎",
-            "pixel-per-inch": "one#{n} פיקסל לאינץ'|two#‎{n} ppi‎|many#‎{n} ppi‎|#{n} פיקסלים לאינץ'",
-            "point": "one#נקודה|two#{n} נק'|many#{n} נק'|#{n} נקודות",
+            "pixel-per-inch": "one#{n} פיקסל לאינץ'|two#‎{n} ppi‎|#{n} פיקסלים לאינץ'",
+            "point": "one#נקודה|two#{n} נק'|#{n} נקודות",
             "pound": "one#פאונד אחד|two#שני פאונד|#{n} פאונד",
             "pound-force": "one#{n} ליברת-כוח|#{n} ליברות-כוח",
             "pound-force-foot": "#{n} רגל-פאונד",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} בר",
             "barrel": "#‎{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} ביט",
             "bit-per-second": "#{n} ביט/שנ׳",
             "british-thermal-unit": "#{n} Btu",
@@ -249,9 +251,8 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "one#{n} נק′ קטנה|#{n} נק′ קטנות",
-            "dot-per-centimeter": "#‎{n} dpcm",
-            "dot-per-inch": "#‎{n} dpi‎",
+            "dot": "",
+            "dot-per-inch": "one#{n} dpi|two#‎{n} ppi‎|#‎{n} dpi‎",
             "dram": "#{n} dram fl",
             "drop": "one#טיפה|#{n} טיפות",
             "dunam": "#{n} דונם",
@@ -263,7 +264,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#‎{n} fl oz",
             "fluid-ounce-imperial": "#‎{n} fl oz Imp.‎",
-            "foodcalorie": "#{n} Cal",
+            "foodcalorie": "one#קלו׳ אחת|two#שתי קלו׳|#{n} קלו׳",
             "foot": "#‎{n} ft",
             "foot-per-second": "#‎{n} ft/שנ׳",
             "furlong": "#{n} fur",
@@ -406,7 +407,7 @@
             "terabyte-per-second": "#{n} TB/שנ׳",
             "therm-us": "#{n} US therm",
             "ton": "one#ט׳ {n}|#{n} ט׳",
-            "tonne": "#{n} t",
+            "tonne": "#{n} טון מ׳",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "one#שבוע {n}|two#שבועיים|#{n} שבועות",
diff --git a/js/data/locale/hi/Latn/dateformats.json b/js/data/locale/hi/Latn/dateformats.json
index ce7328c95d..71d370df2b 100644
--- a/js/data/locale/hi/Latn/dateformats.json
+++ b/js/data/locale/hi/Latn/dateformats.json
@@ -10,14 +10,16 @@
                 "s": "dd/MM"
             },
             "dmw": {
-                "m": "EE, dd MMM",
-                "s": "E, dd/MM"
+                "f": "EEEE d MMMM",
+                "l": "EEE d MMMM",
+                "m": "EE dd MMM",
+                "s": "E dd/MM"
             },
             "dmwy": {
-                "f": "EEEE, d MMMM, yyyy",
-                "l": "EEE, d MMMM, yyyy",
-                "m": "EE, dd MMM, yyyy",
-                "s": "E, dd/MM/yyyy"
+                "f": "EEEE d MMMM, yyyy",
+                "l": "EEE d MMMM, yyyy",
+                "m": "EE dd MMM, yyyy",
+                "s": "E dd/MM/yyyy"
             },
             "dmy": {
                 "f": "d MMMM, yyyy",
@@ -26,8 +28,10 @@
                 "s": "dd/MM/yyyy"
             },
             "dw": {
-                "m": "EE, dd",
-                "s": "E, dd"
+                "f": "EEEE d",
+                "l": "EEE d",
+                "m": "EE dd",
+                "s": "E dd"
             },
             "e": {
                 "f": "cccc",
diff --git a/js/data/locale/hi/Latn/sysres.json b/js/data/locale/hi/Latn/sysres.json
index 2efa3dbf01..9233ad0f71 100644
--- a/js/data/locale/hi/Latn/sysres.json
+++ b/js/data/locale/hi/Latn/sysres.json
@@ -19,9 +19,9 @@
     "#{num}w ago": "one#{num} wk. pahle|#{num} wk. pahle",
     "#{num}y": "one#{num}y|#{num}y",
     "#{num}y ago": "one#{num} yr. pahle|#{num} yr. pahle",
-    "1#1 day ago|#{num} days ago": "one#{num} din pehle|#{num} din pehle",
+    "1#1 day ago|#{num} days ago": "one#{num} din pahle|#{num} din pahle",
     "1#1 day|#{num} days": "one#{num} din|#{num} din",
-    "1#1 dy ago|#{num} dys ago": "one#{num} din pehle|#{num} din pehle",
+    "1#1 dy ago|#{num} dys ago": "one#{num} din pahle|#{num} din pahle",
     "1#1 dy|#{num} dys": "one#{num}d|#{num}d",
     "1#1 hour ago|#{num} hours ago": "one#{num} ghante pahle|#{num} ghante pahle",
     "1#1 hour|#{num} hours": "one#{num} ghanta|#{num} ghante",
@@ -43,9 +43,9 @@
     "1#1 second|#{num} seconds": "one#{num} second|#{num} seconds",
     "1#1 sec|#{num} sec": "one#{num} sec|#{num} secs",
     "1#1 se|#{num} sec": "one#{num}s|#{num}s",
-    "1#1 week ago|#{num} weeks ago": "one#{num} hafte pehle|#{num} hafte pehle",
+    "1#1 week ago|#{num} weeks ago": "one#{num} hafte pahle|#{num} hafte pahle",
     "1#1 week|#{num} weeks": "one#{num} week|#{num} weeks",
-    "1#1 wk ago|#{num} wks ago": "one#{num} hafte pehle|#{num} hafte pehle",
+    "1#1 wk ago|#{num} wks ago": "one#{num} hafte pahle|#{num} hafte pahle",
     "1#1 wk|#{num} wks": "one#{num} wk|#{num} wks",
     "1#1 year ago|#{num} years ago": "one#{num} saal pahle|#{num} saal pahle",
     "1#1 year|#{num} years": "one#{num} saal|#{num} saal",
diff --git a/js/data/locale/hi/Latn/unitfmt.json b/js/data/locale/hi/Latn/unitfmt.json
index 86afe2056f..0bf573b127 100644
--- a/js/data/locale/hi/Latn/unitfmt.json
+++ b/js/data/locale/hi/Latn/unitfmt.json
@@ -44,7 +44,7 @@
             "dessert-spoon": "one#{n} dessert spoon|#{n} dessert spoons",
             "dessert-spoon-imperial": "one#{n} Imp. dessert spoon|#{n} Imp. dessert spoons",
             "dot": "one#{n} dot|#{n} dots",
-            "dot-per-centimeter": "one#{n} dot per centimetre|#{n} dots per centimetre",
+            "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "one#{n} dram|#{n} drams",
             "drop": "one#{n} drop|#{n} drops",
@@ -64,6 +64,7 @@
             "g-force": "#{n} g-force",
             "gallon": "one#{n} US gallon|#{n} US gallons",
             "gallon-imperial": "one#{n} Imp. gallon|#{n} Imp. gallons",
+            "gasoline-energy-density": "#{n} of gasoline equivalent",
             "generic": "one#{n} degree temperature|#{n} degrees temperature",
             "gigabit": "one#{n} gigabit|#{n} gigabits",
             "gigabit-per-second": "#{n} gigabits har second",
@@ -271,6 +272,7 @@
             "g-force": "#{n} G",
             "gallon": "#{n} gal US",
             "gallon-imperial": "one#{n} gal|#{n} gal Imp.",
+            "gasoline-energy-density": "#{n} gas-equiv",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
diff --git a/js/data/locale/hi/sysres.json b/js/data/locale/hi/sysres.json
index 1a96c102ef..200ad9cc56 100644
--- a/js/data/locale/hi/sysres.json
+++ b/js/data/locale/hi/sysres.json
@@ -9,7 +9,7 @@
     "#{num} ms": "one#{num} मि॰से॰|#{num} मि॰से॰",
     "#{num}d": "one#{num} दि|#{num} दि",
     "#{num}d ago": "one#{num} दिन पहले|#{num} दिन पहले",
-    "#{num}h": "one#{num}घं॰|#{num} घं",
+    "#{num}h": "one#{num} घं|#{num} घं",
     "#{num}h ago": "one#{num} घं॰ पहले|#{num} घं॰ पहले",
     "#{num}mi ago": "one#{num} मि॰ पहले|#{num} मि॰ पहले",
     "#{num}mo ago": "one#{num} माह पहले|#{num} माह पहले",
@@ -17,7 +17,7 @@
     "#{num}s ago": "one#{num} से॰ पहले|#{num} से॰ पहले",
     "#{num}w": "one#{num} सप्ताह|#{num} सप्ताह",
     "#{num}w ago": "one#{num} सप्ताह पहले|#{num} सप्ताह पहले",
-    "#{num}y": "one#{num}वर्ष|#{num}वर्ष",
+    "#{num}y": "one#{num} व|#{num} व",
     "#{num}y ago": "one#{num} वर्ष पहले|#{num} वर्ष पहले",
     "1#1 day ago|#{num} days ago": "one#{num} दिन पहले|#{num} दिन पहले",
     "1#1 day|#{num} days": "one#{num} दिन|#{num} दिन",
@@ -37,7 +37,7 @@
     "1#1 month ago|#{num} months ago": "one#{num} माह पहले|#{num} माह पहले",
     "1#1 month|#{num} months": "one#{num} महीना|#{num} महीने",
     "1#1 mon|#{num} mons": "one#{num} माह|#{num} माह",
-    "1#1 mo|#{num} mos": "one#{num}माह|#{num}माह",
+    "1#1 mo|#{num} mos": "one#{num} माह|#{num} माह",
     "1#1 sec ago|#{num} sec ago": "one#{num} सेकंड पहले|#{num} सेकंड पहले",
     "1#1 second ago|#{num} seconds ago": "one#{num} सेकंड पहले|#{num} सेकंड पहले",
     "1#1 second|#{num} seconds": "one#{num} सेकंड|#{num} सेकंड",
@@ -153,13 +153,13 @@
     "a0": "am",
     "a1": "pm",
     "durationLongDays": "one#{num} दिन|#{num} दिन",
-    "durationMediumHours": "one#{num}घं॰|#{num} घं",
+    "durationMediumHours": "one#{num} घं|#{num} घं",
     "durationMediumMillis": "one#{num} मि॰से॰|#{num} मि॰से॰",
     "durationMediumWeeks": "one#{num} सप्ताह|#{num} सप्ताह",
-    "durationMediumYears": "one#{num}वर्ष|#{num}वर्ष",
+    "durationMediumYears": "one#{num} व|#{num} व",
     "durationShortMillis": "one#{num} मि॰से॰|#{num} मि॰से॰",
     "durationShortMinutes": "one#{num} मि|#{num} मि",
-    "durationShortMonths": "one#{num}माह|#{num}माह",
+    "durationShortMonths": "one#{num} माह|#{num} माह",
     "finalSeparatorFull": ", और ",
     "finalSeparatorLong": ", ",
     "finalSeparatorMedium": ", ",
diff --git a/js/data/locale/hi/unitfmt.json b/js/data/locale/hi/unitfmt.json
index 9ff3b95274..7b564cd18e 100644
--- a/js/data/locale/hi/unitfmt.json
+++ b/js/data/locale/hi/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} वायुमंडलीय दबाव",
             "bar": "#{n} बार",
             "barrel": "#{n} बैरल",
+            "beaufort": "#ब्यूफ़ोर्ट {n}",
             "bit": "#{n} बिट",
             "bit-per-second": "#{n} बिट प्रति सेकंड",
             "british-thermal-unit": "#{n} ब्रिटिश थर्मल यूनिट",
@@ -81,7 +82,7 @@
             "hour": "one#{n} घंटा|#{n} घंटे",
             "inch": "#{n} इंच",
             "inch-ofhg": "#{n} मर्करी इंच",
-            "item": "one#{n} item|#{n} items",
+            "item": "#{n} आइटम",
             "jigger": "#{n} जिगर",
             "joule": "#{n} जूल",
             "karat": "#{n} कैरट",
@@ -203,7 +204,7 @@
             "volt": "#{n} वोल्ट",
             "watt": "#{n} वॉट",
             "week": "#{n} सप्ताह",
-            "yard": "#{n} यार्ड",
+            "yard": "one#{n} यार्ड|#{n} गज़",
             "year": "#{n} वर्ष"
         },
         "short": {
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} बार",
             "barrel": "#{n} बैरल",
+            "beaufort": "#ब्यूफ़ोर्ट {n}",
             "bit": "#{n} बिट",
             "bit-per-second": "#{n} बिट/से॰",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,8 @@
             "dessert-spoon": "#{n} डे. स्पून",
             "dessert-spoon-imperial": "#{n} इम्पी. डेज़र्टस्पून",
             "dot": "#{n} बिंदु",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} ड्रम फ्लू.",
             "drop": "#{n} बूंद",
             "dunam": "#{n} डोनम",
@@ -262,7 +264,7 @@
             "fathom": "#{n} फ़ैदम",
             "fluid-ounce": "#{n} फ़्लूइड आउंस",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Cal",
+            "foodcalorie": "#{n} कैलोरी",
             "foot": "#{n} फ़ीट",
             "foot-per-second": "#{n} फ़ीट/से॰",
             "furlong": "#{n} फ़र्लांग",
@@ -287,7 +289,7 @@
             "hour": "#{n} घं॰",
             "inch": "#{n} इंच",
             "inch-ofhg": "#{n} inHg",
-            "item": "#{n} item",
+            "item": "#{n} आइटम",
             "jigger": "#{n} जिगर",
             "joule": "#{n} जू॰",
             "karat": "#{n} kt",
diff --git a/js/data/locale/hnj/unitfmt.json b/js/data/locale/hnj/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/hnj/unitfmt.json
+++ b/js/data/locale/hnj/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/hr/BA/ctrynames.json b/js/data/locale/hr/BA/ctrynames.json
index db81a46a48..8ae37c9146 100644
--- a/js/data/locale/hr/BA/ctrynames.json
+++ b/js/data/locale/hr/BA/ctrynames.json
@@ -218,7 +218,6 @@
     "Rusija": "RU",
     "Saint Barthélemy": "BL",
     "Saint Martin": "MF",
-    "Saint-Pierre-et-Miquelon": "PM",
     "Salomonski Otoci": "SB",
     "Salvador": "SV",
     "Samoa": "WS",
@@ -253,6 +252,7 @@
     "Sveta Helena": "SH",
     "Sveta Lucija": "LC",
     "Sveti Kristofor i Nevis": "KN",
+    "Sveti Petar i Mikelon": "PM",
     "Sveti Toma i Princip": "ST",
     "Sveti Vincent i Grenadini": "VC",
     "Svijet": "001",
diff --git a/js/data/locale/hr/BA/ctryreverse.json b/js/data/locale/hr/BA/ctryreverse.json
index fd3e538d3b..9c078e277e 100644
--- a/js/data/locale/hr/BA/ctryreverse.json
+++ b/js/data/locale/hr/BA/ctryreverse.json
@@ -217,7 +217,7 @@
     "PH": "Filipini",
     "PK": "Pakistan",
     "PL": "Poljska",
-    "PM": "Saint-Pierre-et-Miquelon",
+    "PM": "Sveti Petar i Mikelon",
     "PN": "Otoci Pitcairn",
     "PR": "Portoriko",
     "PS": "Palestinsko područje",
diff --git a/js/data/locale/hr/ctrynames.json b/js/data/locale/hr/ctrynames.json
index db81a46a48..8ae37c9146 100644
--- a/js/data/locale/hr/ctrynames.json
+++ b/js/data/locale/hr/ctrynames.json
@@ -218,7 +218,6 @@
     "Rusija": "RU",
     "Saint Barthélemy": "BL",
     "Saint Martin": "MF",
-    "Saint-Pierre-et-Miquelon": "PM",
     "Salomonski Otoci": "SB",
     "Salvador": "SV",
     "Samoa": "WS",
@@ -253,6 +252,7 @@
     "Sveta Helena": "SH",
     "Sveta Lucija": "LC",
     "Sveti Kristofor i Nevis": "KN",
+    "Sveti Petar i Mikelon": "PM",
     "Sveti Toma i Princip": "ST",
     "Sveti Vincent i Grenadini": "VC",
     "Svijet": "001",
diff --git a/js/data/locale/hr/ctryreverse.json b/js/data/locale/hr/ctryreverse.json
index fd3e538d3b..9c078e277e 100644
--- a/js/data/locale/hr/ctryreverse.json
+++ b/js/data/locale/hr/ctryreverse.json
@@ -217,7 +217,7 @@
     "PH": "Filipini",
     "PK": "Pakistan",
     "PL": "Poljska",
-    "PM": "Saint-Pierre-et-Miquelon",
+    "PM": "Sveti Petar i Mikelon",
     "PN": "Otoci Pitcairn",
     "PR": "Portoriko",
     "PS": "Palestinsko područje",
diff --git a/js/data/locale/hr/sysres.json b/js/data/locale/hr/sysres.json
index 6b3f69a788..949d06d98b 100644
--- a/js/data/locale/hr/sysres.json
+++ b/js/data/locale/hr/sysres.json
@@ -6,14 +6,14 @@
     "#in {num}s": "one#za {num} s|few#za {num} s|#za {num} s",
     "#in {num}w": "one#za {num} tj.|few#za {num} tj.|#za {num} tj.",
     "#in {num}y": "one#za {num} g.|few#za {num} g.|#za {num} g.",
-    "#{num} ms": "one#{num} ms|few#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d.|few#{num} d.|#{num} d.",
     "#{num}d ago": "one#prije {num} dan|few#prije {num} dana|#prije {num} dana",
-    "#{num}h": "one#{num} h|few#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#prije {num} h|few#prije {num} h|#prije {num} h",
     "#{num}mi ago": "one#prije {num} min|few#prije {num} min|#prije {num} min",
     "#{num}mo ago": "one#prije {num} mj.|few#prije {num} mj.|#prije {num} mj.",
-    "#{num}s": "one#{num} s|few#{num} s|#{num} s",
+    "#{num}s": "#{num} s",
     "#{num}s ago": "one#prije {num} s|few#prije {num} s|#prije {num} s",
     "#{num}w": "one#{num} tj.|few#{num} tj.|#{num} tj.",
     "#{num}w ago": "one#prije {num} tj.|few#prije {num} tj.|#prije {num} tj.",
@@ -26,12 +26,12 @@
     "1#1 hour ago|#{num} hours ago": "one#prije {num} sat|few#prije {num} sata|#prije {num} sati",
     "1#1 hour|#{num} hours": "one#{num} sat|few#{num} sata|#{num} sati",
     "1#1 hr ago|#{num} hrs ago": "one#prije {num} sat|few#prije {num} sata|#prije {num} sati",
-    "1#1 hr|#{num} hrs": "one#{num} h|few#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisekunda|few#{num} milisekunde|#{num} milisekundi",
     "1#1 min ago|#{num} min ago": "one#prije {num} minutu|few#prije {num} minute|#prije {num} minuta",
     "1#1 minute ago|#{num} minutes ago": "one#prije {num} minutu|few#prije {num} minute|#prije {num} minuta",
     "1#1 minute|#{num} minutes": "one#{num} minuta|few#{num} minute|#{num} minuta",
-    "1#1 min|#{num} min": "one#{num} min|few#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num} m|few#{num} m|#{num} m",
     "1#1 mon ago|#{num} mons ago": "one#prije {num} mjesec|few#prije {num} mjeseca|#prije {num} mjeseci",
     "1#1 month ago|#{num} months ago": "one#prije {num} mjesec|few#prije {num} mjeseca|#prije {num} mjeseci",
@@ -41,8 +41,8 @@
     "1#1 sec ago|#{num} sec ago": "one#prije {num} sekundu|few#prije {num} sekunde|#prije {num} sekundi",
     "1#1 second ago|#{num} seconds ago": "one#prije {num} sekundu|few#prije {num} sekunde|#prije {num} sekundi",
     "1#1 second|#{num} seconds": "one#{num} sekunda|few#{num} sekunde|#{num} sekundi",
-    "1#1 sec|#{num} sec": "one#{num} s|few#{num} s|#{num} s",
-    "1#1 se|#{num} sec": "one#{num} s|few#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#prije {num} tjedan|few#prije {num} tjedna|#prije {num} tjedana",
     "1#1 week|#{num} weeks": "one#{num} tjedan|few#{num} tjedna|#{num} tjedana",
     "1#1 wk ago|#{num} wks ago": "one#prije {num} tjedan|few#prije {num} tjedna|#prije {num} tjedana",
@@ -227,11 +227,11 @@
     "cccc5": "petak",
     "cccc6": "subota",
     "durationLongDays": "one#{num} dan|few#{num} dana|#{num} dana",
-    "durationMediumHours": "one#{num} h|few#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|few#{num} ms|#{num} ms",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} tj.|few#{num} tj.|#{num} tj.",
     "durationMediumYears": "one#{num} g.|few#{num} g.|#{num} g.",
-    "durationShortMillis": "one#{num} ms|few#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} m|few#{num} m|#{num} m",
     "durationShortMonths": "one#{num} mj.|few#{num} mj.|#{num} mj.",
     "finalSeparatorFull": " i ",
diff --git a/js/data/locale/hr/unitfmt.json b/js/data/locale/hr/unitfmt.json
index 9a08d6f407..a1e4af2cb4 100644
--- a/js/data/locale/hr/unitfmt.json
+++ b/js/data/locale/hr/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "few#{n} atmosfere|#{n} atmosfera",
             "bar": "one#{n} bar|#{n} bara",
             "barrel": "one#{n} barel|#{n} barela",
+            "beaufort": "#B {n}",
             "bit": "one#{n} bit|few#{n} bita|#{n} bitova",
             "bit-per-second": "#{n} bitova/s",
             "british-thermal-unit": "one#{n} britanska termalna jedinica|few#{n} britanske termalne jedinice|#{n} britanskih termalnih jedinica",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bara",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "one#{n} bit|few#{n} bita|#{n} bitova",
             "bit-per-second": "#{n} bitova/s",
             "british-thermal-unit": "#{n} BTU",
@@ -263,7 +265,6 @@
             "fathom": "#{n} hv",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} imp. fl oz",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
@@ -325,7 +326,7 @@
             "megahertz": "#{n} MHz",
             "megaliter": "#{n} Ml",
             "megapascal": "#{n} MPa",
-            "megapixel": "#{n} Mp",
+            "megapixel": "#{n} MP",
             "megawatt": "#{n} MW",
             "meter": "#{n} m",
             "meter-per-second": "#{n} m/s",
diff --git a/js/data/locale/hsb/sysres.json b/js/data/locale/hsb/sysres.json
index d16c25cb51..7cb637586a 100644
--- a/js/data/locale/hsb/sysres.json
+++ b/js/data/locale/hsb/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#za {num} sek.|two#za {num} sek.|few#za {num} sek.|#za {num} sek.",
     "#in {num}w": "one#za {num} tydź.|two#za {num} tydź.|few#za {num} tydź.|#za {num} tydź.",
     "#in {num}y": "one#za {num} l.|two#za {num} l.|few#za {num} l.|#za {num} l.",
-    "#{num} ms": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d|two#{num} d|few#{num} d|#{num} d",
     "#{num}d ago": "one#před {num} dnj.|two#před {num} dnj.|few#před {num} dnj.|#před {num} dnj.",
     "#{num}h": "one#{num} h|two#{num} h|few#{num} h|#{num} h",
@@ -195,10 +195,10 @@
     "a1": "popołdnju",
     "durationLongDays": "one#{num} dź.|two#{num} dn.|few#{num} dn.|#{num} dn.",
     "durationMediumHours": "one#{num} h|two#{num} h|few#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} t.|two#{num} t.|few#{num} t.|#{num} t.",
     "durationMediumYears": "one#{num} l.|two#{num} l.|few#{num} l.|#{num} l.",
-    "durationShortMillis": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} min|two#{num} min|few#{num} min|#{num} min",
     "durationShortMonths": "one#{num} měs.|two#{num} měs.|few#{num} měs.|#{num} měs.",
     "finalSeparatorFull": " a ",
diff --git a/js/data/locale/hsb/unitfmt.json b/js/data/locale/hsb/unitfmt.json
index 456dfee58e..e560b6e5d5 100644
--- a/js/data/locale/hsb/unitfmt.json
+++ b/js/data/locale/hsb/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|two#{n} atmosferje|few#{n} atmosfery|#{n} atmosferow",
             "bar": "one#{n} bar|two#{n} baraj|few#{n} bary|#{n} barow",
             "barrel": "one#{n} barel|two#{n} barelej|few#{n} barele|#{n} barelow",
+            "beaufort": "one#{n} stopjeń beauforta|two#{n} stopnjej beauforta|few#{n} stopnje beauforta|#{n} stopnjow beauforta",
             "bit": "one#{n} bit|two#{n} bitaj|few#{n} bity|#{n} bitow",
             "bit-per-second": "#{n} bitow na sekundu",
             "british-thermal-unit": "one#{n} britiska jednotka ćopłoty|two#{n} britiskej jednotce ćopłoty|few#{n} britiske jednotki ćopłoty|#{n} britiskich jednotkow ćopłoty",
@@ -213,6 +214,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} Bft",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -256,7 +258,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl. oz.",
             "fluid-ounce-imperial": "#{n} brit. fl oz",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/hu/sysres.json b/js/data/locale/hu/sysres.json
index 07faabc2fc..95d9e4bc6a 100644
--- a/js/data/locale/hu/sysres.json
+++ b/js/data/locale/hu/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#{num} másodperc múlva|#{num} másodperc múlva",
     "#in {num}w": "one#{num} hét múlva|#{num} hét múlva",
     "#in {num}y": "one#{num} év múlva|#{num} év múlva",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} nap|#{num} nap",
     "#{num}d ago": "one#{num} napja|#{num} napja",
     "#{num}h": "one#{num} ó|#{num} ó",
@@ -157,10 +157,10 @@
     "a1": "du.",
     "durationLongDays": "one#{num} nap|#{num} nap",
     "durationMediumHours": "one#{num} ó|#{num} ó",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} hét|#{num} hét",
     "durationMediumYears": "one#{num} év|#{num} év",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} p|#{num} p",
     "durationShortMonths": "one#{num} h.|#{num} h.",
     "finalSeparatorFull": " és ",
diff --git a/js/data/locale/hu/unitfmt.json b/js/data/locale/hu/unitfmt.json
index f8d10973d2..2f9e99933e 100644
--- a/js/data/locale/hu/unitfmt.json
+++ b/js/data/locale/hu/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmoszféra",
             "bar": "#{n} bar",
             "barrel": "#{n} hordó",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/másodperc",
             "british-thermal-unit": "#{n} brit hőegység",
@@ -43,7 +44,7 @@
             "degree": "#{n} fok",
             "dessert-spoon": "#{n} desszertkanál",
             "dessert-spoon-imperial": "#{n} bir. desszertkanál",
-            "dot": "one#képpont|#{n} képpont",
+            "dot": "#{n} képpont",
             "dot-per-centimeter": "#{n} pont per centiméter",
             "dot-per-inch": "#{n} pont per hüvelyk",
             "dram": "#{n} dram",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} hordó",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/mp",
             "british-thermal-unit": "#{n} Btu",
@@ -250,8 +252,8 @@
             "dessert-spoon": "#{n} desszertkanál",
             "dessert-spoon-imperial": "#{n} bir. desszertkanál",
             "dot": "#{n} képpont",
-            "dot-per-centimeter": "one#{n} dpcm|#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} fl dram",
             "drop": "#{n} csepp",
             "dunam": "#{n} dunam",
diff --git a/js/data/locale/hy/ctrynames.json b/js/data/locale/hy/ctrynames.json
index 857039d075..855b4b9559 100644
--- a/js/data/locale/hy/ctrynames.json
+++ b/js/data/locale/hy/ctrynames.json
@@ -51,7 +51,7 @@
     "Բուրունդի": "BI",
     "Բրազիլիա": "BR",
     "Բրիտանական Վիրջինյան կղզիներ": "VG",
-    "Բրիտանական Տարածք Հնդկական Օվկիանոսում": "IO",
+    "Բրիտանական տարածք Հնդկական Օվկիանոսում": "IO",
     "Բրունեյ": "BN",
     "Գաբոն": "GA",
     "Գամբիա": "GM",
diff --git a/js/data/locale/hy/ctryreverse.json b/js/data/locale/hy/ctryreverse.json
index 7355872a81..7b4899c6cb 100644
--- a/js/data/locale/hy/ctryreverse.json
+++ b/js/data/locale/hy/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Իսրայել",
     "IM": "Մեն կղզի",
     "IN": "Հնդկաստան",
-    "IO": "Բրիտանական Տարածք Հնդկական Օվկիանոսում",
+    "IO": "Բրիտանական տարածք Հնդկական Օվկիանոսում",
     "IQ": "Իրաք",
     "IR": "Իրան",
     "IS": "Իսլանդիա",
diff --git a/js/data/locale/hy/unitfmt.json b/js/data/locale/hy/unitfmt.json
index 48c80a4307..8a47803f8d 100644
--- a/js/data/locale/hy/unitfmt.json
+++ b/js/data/locale/hy/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} մթնոլորտ",
             "bar": "#{n} բար",
             "barrel": "#{n} տակառ",
+            "beaufort": "#Բոֆորտ {n}",
             "bit": "#{n} բիթ",
             "bit-per-second": "#{n} բիթ վայրկյանում",
             "british-thermal-unit": "#{n} բրիտանական ջերմային միավոր",
@@ -49,7 +50,7 @@
             "drop": "#{n} կաթիլ",
             "dunam": "#{n} դունամ",
             "earth-mass": "one#{n} երկրային զանգված|#{n} արևային զանգված",
-            "earth-radius": "#{n} երկրային շառավիղ",
+            "earth-radius": "#{n} երկրի շառավիղ",
             "electronvolt": "#{n} էլեկտրոն-վոլտ",
             "em": "#{n} em",
             "fahrenheit": "#{n} աստիճան ըստ Ֆարենհայթի",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} մթն",
             "bar": "#{n} բար",
             "barrel": "#{n} տկռ",
+            "beaufort": "#Բ {n}",
             "bit": "#{n} բիթ",
             "bit-per-second": "#{n} բիթ/վրկ",
             "british-thermal-unit": "#{n} Բջմ",
diff --git a/js/data/locale/ia/list.json b/js/data/locale/ia/list.json
index ca16789e94..9a8a43e6d8 100644
--- a/js/data/locale/ia/list.json
+++ b/js/data/locale/ia/list.json
@@ -29,10 +29,6 @@
         "medium": {
             "2": "{0} e {1}",
             "end": "{0} e {1}"
-        },
-        "short": {
-            "2": "{0} e {1}",
-            "end": "{0} e {1}"
         }
     },
     "unit": {
diff --git a/js/data/locale/ia/sysres.json b/js/data/locale/ia/sysres.json
index 3c10d0cc0a..351a52b9df 100644
--- a/js/data/locale/ia/sysres.json
+++ b/js/data/locale/ia/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#in {num} sec.|#in {num} sec.",
     "#in {num}w": "one#in {num} sept.|#in {num} sept.",
     "#in {num}y": "one#in {num} an.|#in {num} an.",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}d|#{num}d",
     "#{num}d ago": "one#{num} die retro|#{num} dies retro",
     "#{num}h": "one#{num}h|#{num}h",
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#{num} minuta retro|#{num} minutas retro",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minuta retro|#{num} minutas retro",
     "1#1 minute|#{num} minutes": "one#{num} minuta|#{num} minutas",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "one#{num} mense retro|#{num} menses retro",
     "1#1 month ago|#{num} months ago": "one#{num} mense retro|#{num} menses retro",
diff --git a/js/data/locale/ia/unitfmt.json b/js/data/locale/ia/unitfmt.json
index e3fb0354fa..45caee3ea0 100644
--- a/js/data/locale/ia/unitfmt.json
+++ b/js/data/locale/ia/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosphera|#{n} atmospheras",
             "bar": "#{n} bar",
             "barrel": "#{n} barriles",
+            "beaufort": "#B {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits per secunda",
             "british-thermal-unit": "#{n} Btu",
@@ -53,7 +54,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "one#{n} uncia liquide|#{n} uncias liquide",
             "fluid-ounce-imperial": "one#{n} uncia liquide imperial|#{n} uncias liquide imperial",
-            "foodcalorie": "one#{n} kilocaloria|#{n} kilocalorias",
             "foot": "one#{n} pede|#{n} pedes",
             "foot-per-second": "#{n} pedes per secunda",
             "furlong": "#{n} fur",
@@ -213,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -256,7 +257,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} oz liq",
             "fluid-ounce-imperial": "#{n} oz liq imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/id/unitfmt.json b/js/data/locale/id/unitfmt.json
index d3d9775b36..e4e415afd6 100644
--- a/js/data/locale/id/unitfmt.json
+++ b/js/data/locale/id/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfer",
             "bar": "#{n} bar",
             "barrel": "#{n} barrel",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit per detik",
             "british-thermal-unit": "#{n} satuan panas Britania",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/dtk",
             "british-thermal-unit": "#{n} Btu",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
+            "dot": "#{n} dot",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
diff --git a/js/data/locale/ann/ctrynames.json b/js/data/locale/ie/ctrynames.json
similarity index 99%
rename from js/data/locale/ann/ctrynames.json
rename to js/data/locale/ie/ctrynames.json
index 3cf0212256..5ec502fa47 100644
--- a/js/data/locale/ann/ctrynames.json
+++ b/js/data/locale/ie/ctrynames.json
@@ -172,6 +172,7 @@
     "Montserrat": "MS",
     "Morocco": "MA",
     "Mozambique": "MZ",
+    "munde": "001",
     "Myanmar (Burma)": "MM",
     "Namibia": "NA",
     "Nauru": "NR",
@@ -218,6 +219,7 @@
     "Samoa": "WS",
     "San Marino": "SM",
     "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
     "Saudi Arabia": "SA",
     "Senegal": "SN",
     "Serbia": "RS",
@@ -265,7 +267,7 @@
     "Trinidad & Tobago": "TT",
     "Tristan da Cunha": "TA",
     "Tunisia": "TN",
-    "Turkey": "TR",
+    "Türkiye": "TR",
     "Turkmenistan": "TM",
     "Turks & Caicos Islands": "TC",
     "Tuvalu": "TV",
@@ -289,7 +291,6 @@
     "Western Asia": "145",
     "Western Europe": "155",
     "Western Sahara": "EH",
-    "world": "001",
     "Yemen": "YE",
     "Zambia": "ZM",
     "Zimbabwe": "ZW"
diff --git a/js/data/locale/mdf/ctryreverse.json b/js/data/locale/ie/ctryreverse.json
similarity index 99%
rename from js/data/locale/mdf/ctryreverse.json
rename to js/data/locale/ie/ctryreverse.json
index 1a338682b8..404f613d27 100644
--- a/js/data/locale/mdf/ctryreverse.json
+++ b/js/data/locale/ie/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "world",
+    "001": "munde",
     "002": "Africa",
     "003": "North America",
     "005": "South America",
@@ -81,6 +81,7 @@
     "CN": "China",
     "CO": "Colombia",
     "CP": "Clipperton Island",
+    "CQ": "Sark",
     "CR": "Costa Rica",
     "CU": "Cuba",
     "CV": "Cape Verde",
@@ -263,7 +264,7 @@
     "TM": "Turkmenistan",
     "TN": "Tunisia",
     "TO": "Tonga",
-    "TR": "Turkey",
+    "TR": "Türkiye",
     "TT": "Trinidad & Tobago",
     "TV": "Tuvalu",
     "TW": "Taiwan",
diff --git a/js/data/locale/ie/dateformats.json b/js/data/locale/ie/dateformats.json
new file mode 100644
index 0000000000..97a8977cbb
--- /dev/null
+++ b/js/data/locale/ie/dateformats.json
@@ -0,0 +1,133 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/ie/delimiters.jf b/js/data/locale/ie/delimiters.jf
new file mode 100644
index 0000000000..ff6bc9f4e5
--- /dev/null
+++ b/js/data/locale/ie/delimiters.jf
@@ -0,0 +1,9 @@
+{
+    "delimiter": {
+        "alternateQuotationEnd": "”",
+        "alternateQuotationStart": "“",
+        "quotationEnd": "»",
+        "quotationStart": "«"
+    },
+    "generated": true
+}
\ No newline at end of file
diff --git a/js/data/locale/ie/numfmt.jf b/js/data/locale/ie/numfmt.jf
new file mode 100644
index 0000000000..769a9e9301
--- /dev/null
+++ b/js/data/locale/ie/numfmt.jf
@@ -0,0 +1,10 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "commonNegative": "{s} -{n}"
+        },
+        "decimalChar": ",",
+        "groupChar": " "
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/ie/scripts.jf b/js/data/locale/ie/scripts.jf
new file mode 100644
index 0000000000..429ff24f2b
--- /dev/null
+++ b/js/data/locale/ie/scripts.jf
@@ -0,0 +1,6 @@
+{
+    "generated": true,
+    "scripts": [
+        "Latn"
+    ]
+}
\ No newline at end of file
diff --git a/js/data/locale/ie/sysres.json b/js/data/locale/ie/sysres.json
new file mode 100644
index 0000000000..33b9843efa
--- /dev/null
+++ b/js/data/locale/ie/sysres.json
@@ -0,0 +1,153 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "EE0": "soledí",
+    "EE1": "lunedí",
+    "EE2": "mardí",
+    "EE3": "mercurdí",
+    "EE4": "jovedí",
+    "EE5": "venerdí",
+    "EE6": "saturdí",
+    "EEE0": "soledí",
+    "EEE1": "lunedí",
+    "EEE2": "mardí",
+    "EEE3": "mercurdí",
+    "EEE4": "jovedí",
+    "EEE5": "venerdí",
+    "EEE6": "saturdí",
+    "EEEE0": "soledí",
+    "EEEE1": "lunedí",
+    "EEEE2": "mardí",
+    "EEEE3": "mercurdí",
+    "EEEE4": "jovedí",
+    "EEEE5": "venerdí",
+    "EEEE6": "saturdí",
+    "MMM1": "januar",
+    "MMM10": "octobre",
+    "MMM11": "novembre",
+    "MMM12": "decembre",
+    "MMM2": "februar",
+    "MMM3": "marte",
+    "MMM4": "april",
+    "MMM5": "may",
+    "MMM6": "junio",
+    "MMM7": "julí",
+    "MMM8": "august",
+    "MMM9": "septembre",
+    "MMMM1": "januar",
+    "MMMM10": "octobre",
+    "MMMM11": "novembre",
+    "MMMM12": "decembre",
+    "MMMM2": "februar",
+    "MMMM3": "marte",
+    "MMMM4": "april",
+    "MMMM5": "may",
+    "MMMM6": "junio",
+    "MMMM7": "julí",
+    "MMMM8": "august",
+    "MMMM9": "septembre",
+    "N1": "j",
+    "N10": "o",
+    "N11": "n",
+    "N12": "d",
+    "N2": "f",
+    "N3": "m",
+    "N4": "a",
+    "N5": "m",
+    "N6": "j",
+    "N7": "j",
+    "N8": "a",
+    "N9": "s",
+    "NN1": "ja",
+    "NN10": "oc",
+    "NN11": "no",
+    "NN12": "de",
+    "NN2": "fe",
+    "NN3": "ma",
+    "NN4": "ap",
+    "NN5": "ma",
+    "NN6": "ju",
+    "NN7": "ju",
+    "NN8": "au",
+    "NN9": "se",
+    "a0": "ante midí",
+    "a1": "pos midí",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": ", ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/ie/unitfmt.json b/js/data/locale/ie/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/ie/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/ig/unitfmt.json b/js/data/locale/ig/unitfmt.json
index cb58ef5198..dafd7648ba 100644
--- a/js/data/locale/ig/unitfmt.json
+++ b/js/data/locale/ig/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit-kwa-sekọnd",
             "british-thermal-unit": "#{n} Btu",
@@ -42,9 +43,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "#{n} ntụpọ",
+            "dot-per-centimeter": "#{n} ntụpọ kwa sentimita",
+            "dot-per-inch": "#{n} ntụpọ kwa inch",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
@@ -56,7 +57,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
+            "foodcalorie": "#{n} Kalori",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +250,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "#{n} ntụpọ",
+            "dot-per-centimeter": "#{n} nksm",
+            "dot-per-inch": "#{n} nki",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
@@ -262,7 +264,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
+            "foodcalorie": "#{n} Kal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/ii/unitfmt.json b/js/data/locale/ii/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ii/unitfmt.json
+++ b/js/data/locale/ii/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/io/unitfmt.json b/js/data/locale/io/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/io/unitfmt.json
+++ b/js/data/locale/io/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/is/sysres.json b/js/data/locale/is/sysres.json
index 9438722e52..10c738cddb 100644
--- a/js/data/locale/is/sysres.json
+++ b/js/data/locale/is/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#eftir {num} sek.|#eftir {num} sek.",
     "#in {num}w": "one#eftir {num} viku|#eftir {num} vikur",
     "#in {num}y": "one#eftir {num} ár|#eftir {num} ár",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d.|#{num} d.",
     "#{num}d ago": "one#fyrir {num} degi|#fyrir {num} dögum",
     "#{num}h": "one#{num} klst.|#{num} klst.",
diff --git a/js/data/locale/is/unitfmt.json b/js/data/locale/is/unitfmt.json
index 92da38223b..7bba4fe5c0 100644
--- a/js/data/locale/is/unitfmt.json
+++ b/js/data/locale/is/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} loftþyngd|#{n} loftþyngdir",
             "bar": "one#{n} bar|#{n} bör",
             "barrel": "one#{n} tunna|#{n} tunnur",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} biti|#{n} bitar",
             "bit-per-second": "#{n} bitar á sekúndu",
             "british-thermal-unit": "one#{n} Bresk varmaeining|#{n} Breskar varmaeiningar",
@@ -43,9 +44,9 @@
             "degree": "one#{n} gráða|#{n} gráður",
             "dessert-spoon": "#{n} ábætisskeið",
             "dessert-spoon-imperial": "#{n} bresk ábætisskeið",
-            "dot": "one#{n} punktur|#{n} punktar",
-            "dot-per-centimeter": "one#{n} punktur á sentimetra|#{n} punktar á sentimetra",
-            "dot-per-inch": "one#{n} punktur á tommu|#{n} punktar á tommu",
+            "dot": "one#{n} pixill|#{n} pixlar",
+            "dot-per-centimeter": "one#{n} pixill á sentimetra|#{n} pixlar á sentimetra",
+            "dot-per-inch": "one#{n} pixill á tommu|#{n} pixlar á tommu",
             "dram": "one#{n} dramm|#{n} drömm",
             "drop": "one#{n} dropi|#{n} dropar",
             "dunam": "one#{n} dúnam|#{n} dúnöm",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bör",
             "barrel": "one#{n} tunna|#{n} tunnur",
+            "beaufort": "#{n} B",
             "bit": "one#{n} biti|#{n} bitar",
             "bit-per-second": "#{n} bitar/sek.",
             "british-thermal-unit": "#{n} Btu",
@@ -249,7 +251,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} ábætissk.",
             "dessert-spoon-imperial": "#{n} bresk ábætissk.",
-            "dot": "#{n} px",
+            "dot": "",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "one#{n} dramm|#{n} drömm",
diff --git a/js/data/locale/it/CH/ctrynames.json b/js/data/locale/it/CH/ctrynames.json
index 10de9614e5..1a04024c03 100644
--- a/js/data/locale/it/CH/ctrynames.json
+++ b/js/data/locale/it/CH/ctrynames.json
@@ -82,7 +82,7 @@
     "Emirati Arabi Uniti": "AE",
     "Eritrea": "ER",
     "Estonia": "EE",
-    "eSwatini": "SZ",
+    "Eswatini": "SZ",
     "Etiopia": "ET",
     "Europa": "150",
     "Europa meridionale": "039",
diff --git a/js/data/locale/it/CH/ctryreverse.json b/js/data/locale/it/CH/ctryreverse.json
index 218d824263..56510c4317 100644
--- a/js/data/locale/it/CH/ctryreverse.json
+++ b/js/data/locale/it/CH/ctryreverse.json
@@ -251,7 +251,7 @@
     "SV": "El Salvador",
     "SX": "Sint Maarten",
     "SY": "Siria",
-    "SZ": "eSwatini",
+    "SZ": "Eswatini",
     "TA": "Tristan da Cunha",
     "TC": "Isole Turks e Caicos",
     "TD": "Ciad",
diff --git a/js/data/locale/it/SM/ctrynames.json b/js/data/locale/it/SM/ctrynames.json
index 10de9614e5..1a04024c03 100644
--- a/js/data/locale/it/SM/ctrynames.json
+++ b/js/data/locale/it/SM/ctrynames.json
@@ -82,7 +82,7 @@
     "Emirati Arabi Uniti": "AE",
     "Eritrea": "ER",
     "Estonia": "EE",
-    "eSwatini": "SZ",
+    "Eswatini": "SZ",
     "Etiopia": "ET",
     "Europa": "150",
     "Europa meridionale": "039",
diff --git a/js/data/locale/it/SM/ctryreverse.json b/js/data/locale/it/SM/ctryreverse.json
index 218d824263..56510c4317 100644
--- a/js/data/locale/it/SM/ctryreverse.json
+++ b/js/data/locale/it/SM/ctryreverse.json
@@ -251,7 +251,7 @@
     "SV": "El Salvador",
     "SX": "Sint Maarten",
     "SY": "Siria",
-    "SZ": "eSwatini",
+    "SZ": "Eswatini",
     "TA": "Tristan da Cunha",
     "TC": "Isole Turks e Caicos",
     "TD": "Ciad",
diff --git a/js/data/locale/it/VA/ctrynames.json b/js/data/locale/it/VA/ctrynames.json
index 10de9614e5..1a04024c03 100644
--- a/js/data/locale/it/VA/ctrynames.json
+++ b/js/data/locale/it/VA/ctrynames.json
@@ -82,7 +82,7 @@
     "Emirati Arabi Uniti": "AE",
     "Eritrea": "ER",
     "Estonia": "EE",
-    "eSwatini": "SZ",
+    "Eswatini": "SZ",
     "Etiopia": "ET",
     "Europa": "150",
     "Europa meridionale": "039",
diff --git a/js/data/locale/it/VA/ctryreverse.json b/js/data/locale/it/VA/ctryreverse.json
index 218d824263..56510c4317 100644
--- a/js/data/locale/it/VA/ctryreverse.json
+++ b/js/data/locale/it/VA/ctryreverse.json
@@ -251,7 +251,7 @@
     "SV": "El Salvador",
     "SX": "Sint Maarten",
     "SY": "Siria",
-    "SZ": "eSwatini",
+    "SZ": "Eswatini",
     "TA": "Tristan da Cunha",
     "TC": "Isole Turks e Caicos",
     "TD": "Ciad",
diff --git a/js/data/locale/it/ctrynames.json b/js/data/locale/it/ctrynames.json
index 10de9614e5..1a04024c03 100644
--- a/js/data/locale/it/ctrynames.json
+++ b/js/data/locale/it/ctrynames.json
@@ -82,7 +82,7 @@
     "Emirati Arabi Uniti": "AE",
     "Eritrea": "ER",
     "Estonia": "EE",
-    "eSwatini": "SZ",
+    "Eswatini": "SZ",
     "Etiopia": "ET",
     "Europa": "150",
     "Europa meridionale": "039",
diff --git a/js/data/locale/it/ctryreverse.json b/js/data/locale/it/ctryreverse.json
index 218d824263..56510c4317 100644
--- a/js/data/locale/it/ctryreverse.json
+++ b/js/data/locale/it/ctryreverse.json
@@ -251,7 +251,7 @@
     "SV": "El Salvador",
     "SX": "Sint Maarten",
     "SY": "Siria",
-    "SZ": "eSwatini",
+    "SZ": "Eswatini",
     "TA": "Tristan da Cunha",
     "TC": "Isole Turks e Caicos",
     "TD": "Ciad",
diff --git a/js/data/locale/it/sysres.json b/js/data/locale/it/sysres.json
index b4287bfa49..ad12752129 100644
--- a/js/data/locale/it/sysres.json
+++ b/js/data/locale/it/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#tra {num} sec.|#tra {num} sec.",
     "#in {num}w": "one#tra {num} sett.|#tra {num} sett.",
     "#in {num}y": "one#tra {num} anno|#tra {num} anni",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}g|#{num}gg",
     "#{num}d ago": "one#{num} g fa|#{num} gg fa",
     "#{num}h": "one#{num}h|#{num}h",
@@ -26,12 +26,12 @@
     "1#1 hour ago|#{num} hours ago": "one#{num} ora fa|#{num} ore fa",
     "1#1 hour|#{num} hours": "one#{num} ora|#{num} ore",
     "1#1 hr ago|#{num} hrs ago": "one#{num} ora fa|#{num} ore fa",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} millisecondo|#{num} millisecondi",
     "1#1 min ago|#{num} min ago": "one#{num} minuto fa|#{num} minuti fa",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minuto fa|#{num} minuti fa",
     "1#1 minute|#{num} minutes": "one#{num} minuto|#{num} minuti",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}min|#{num}min",
     "1#1 mon ago|#{num} mons ago": "one#{num} mese fa|#{num} mesi fa",
     "1#1 month ago|#{num} months ago": "one#{num} mese fa|#{num} mesi fa",
@@ -41,7 +41,7 @@
     "1#1 sec ago|#{num} sec ago": "one#{num} secondo fa|#{num} secondi fa",
     "1#1 second ago|#{num} seconds ago": "one#{num} secondo fa|#{num} secondi fa",
     "1#1 second|#{num} seconds": "one#{num} secondo|#{num} secondi",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
     "1#1 se|#{num} sec": "one#{num}s|#{num}s",
     "1#1 week ago|#{num} weeks ago": "one#{num} settimana fa|#{num} settimane fa",
     "1#1 week|#{num} weeks": "one#{num} settimana|#{num} settimane",
diff --git a/js/data/locale/it/unitfmt.json b/js/data/locale/it/unitfmt.json
index 41655192ff..8b11ac122f 100644
--- a/js/data/locale/it/unitfmt.json
+++ b/js/data/locale/it/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosfere",
             "bar": "#{n} bar",
             "barrel": "one#{n} barile|#{n} barili",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit al secondo",
             "british-thermal-unit": "one#{n} unità termica britannica|#{n} unità termiche britanniche",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#Bft {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -250,7 +252,7 @@
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dr liq",
             "drop": "one#{n} goccia|#{n} gocce",
diff --git a/js/data/locale/iu/unitfmt.json b/js/data/locale/iu/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/iu/unitfmt.json
+++ b/js/data/locale/iu/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ja/unitfmt.json b/js/data/locale/ja/unitfmt.json
index e745fa2850..2d341aae25 100644
--- a/js/data/locale/ja/unitfmt.json
+++ b/js/data/locale/ja/unitfmt.json
@@ -10,9 +10,11 @@
             "atmosphere": "#{n} 気圧",
             "bar": "#{n} バール",
             "barrel": "#{n} バレル",
+            "beaufort": "#ビューフォート風力階級 {n}",
             "bit": "#{n} ビット",
             "bit-per-second": "#{n} ビット/秒",
             "british-thermal-unit": "#{n} 英熱量",
+            "bu-jp": "#{n} 歩",
             "bushel": "#{n} ブッシェル",
             "byte": "#{n} バイト",
             "byte-per-hour": "#{n} バイト/時間",
@@ -24,6 +26,7 @@
             "centiliter": "#{n} センチリットル",
             "centimeter": "#{n} センチメートル",
             "century": "#{n} 世紀",
+            "cho": "#{n} 町",
             "coordinateUnit": "",
             "cubic-centimeter": "#{n} 立方センチメートル",
             "cubic-foot": "#{n} 立方フィート",
@@ -32,7 +35,8 @@
             "cubic-meter": "#{n} 立方メートル",
             "cubic-mile": "#{n} 立方マイル",
             "cubic-yard": "#{n} 立方ヤード",
-            "cup": "#{n} カップ",
+            "cup": "#{n} カップ - 米国",
+            "cup-jp": "#{n} カップ",
             "cup-metric": "#{n} メトリックカップ",
             "dalton": "#{n} ダルトン",
             "day": "#{n} 日",
@@ -59,6 +63,7 @@
             "foodcalorie": "#{n} カロリー",
             "foot": "#{n} フィート",
             "foot-per-second": "#{n} フィート/秒",
+            "fun": "#{n} 分 - 質量",
             "furlong": "#{n} ハロン",
             "g-force": "#{n} G",
             "gallon": "#{n} ガロン",
@@ -83,9 +88,11 @@
             "inch-ofhg": "#{n} 水銀柱インチ",
             "item": "#{n} 項目",
             "jigger": "#{n} ジガー",
+            "jo-jp": "#{n} 丈",
             "joule": "#{n} ジュール",
             "karat": "#{n} 金",
             "kelvin": "#{n} ケルビン",
+            "ken": "#{n} 間",
             "kilobit": "#{n} キロビット",
             "kilobit-per-second": "#{n} キロビット/秒",
             "kilobyte": "#{n} キロバイト",
@@ -104,6 +111,8 @@
             "kilowatt-hour": "#{n} キロワット時",
             "kilowatt-hour-per-100-kilometer": "#{n} キロワット時毎100キロメートル",
             "knot": "#{n} ノット",
+            "koku": "#{n} 石",
+            "kosaji": "#小さじ {n}",
             "light-year": "#{n} 光年",
             "liter": "#{n} リットル",
             "liter-per-100-kilometer": "#{n} リットル毎100キロメートル",
@@ -151,6 +160,7 @@
             "newton": "#{n} ニュートン",
             "newton-meter": "#{n} ニュートンメートル",
             "ohm": "#{n} オーム",
+            "osaji": "#大さじ {n}",
             "ounce": "#{n} オンス",
             "ounce-troy": "#{n} トロイオンス",
             "parsec": "#{n} パーセク",
@@ -177,7 +187,14 @@
             "quarter": "#{n} 四半期",
             "radian": "#{n} ラジアン",
             "revolution": "#{n} 回転",
+            "ri-jp": "#{n} 里",
+            "rin": "#{n} 厘",
+            "sai": "#{n} 才",
+            "se-jp": "#{n} 畝",
             "second": "#{n} 秒",
+            "shaku": "#{n} 勺",
+            "shaku-cloth": "#{n} 鯨尺",
+            "shaku-length": "#{n} 尺",
             "short-ton": "#{n} 米トン",
             "solar-luminosity": "#{n} 太陽光度",
             "solar-mass": "#{n} 太陽質量",
@@ -190,14 +207,16 @@
             "square-mile": "#{n} 平方マイル",
             "square-yard": "#{n} 平方ヤード",
             "stone": "#{n} ストーン",
-            "tablespoon": "#大さじ {n}",
-            "teaspoon": "#小さじ {n}",
+            "sun": "#{n} 寸",
+            "tablespoon": "#{n} テーブルスプーン",
+            "teaspoon": "#{n} ティースプーン",
             "terabit": "#{n} テラビット",
             "terabit-per-second": "#{n} テラビット/秒",
             "terabyte": "#{n} テラバイト",
             "terabyte-per-hour": "#{n} テラバイト/時間",
             "terabyte-per-second": "#{n} テラバイト/秒",
             "therm-us": "#{n} 米サーム",
+            "to-jp": "#{n} 斗",
             "ton": "#{n} 米トン",
             "tonne": "#{n} トン",
             "volt": "#{n} ボルト",
@@ -216,9 +235,11 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/秒",
             "british-thermal-unit": "#{n} BTU",
+            "bu-jp": "#{n} 歩",
             "bushel": "#{n} bu",
             "byte": "#{n} byte",
             "byte-per-hour": "#{n} byte/時間",
@@ -230,6 +251,7 @@
             "centiliter": "#{n} cL",
             "centimeter": "#{n} cm",
             "century": "#{n} 世紀",
+            "cho": "#{n} 町",
             "coordinateUnit": "",
             "cubic-centimeter": "#{n} cm³",
             "cubic-foot": "#{n} ft³",
@@ -238,7 +260,8 @@
             "cubic-meter": "#{n} m³",
             "cubic-mile": "#{n} mi³",
             "cubic-yard": "#{n} yd³",
-            "cup": "#{n} カップ",
+            "cup": "#{n} カップ - 米国",
+            "cup-jp": "#{n} カップ",
             "cup-metric": "#{n} mc",
             "dalton": "#{n} Da",
             "day": "#{n} 日",
@@ -265,6 +288,7 @@
             "foodcalorie": "#{n} cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/秒",
+            "fun": "#{n} 分 - 質量",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
@@ -289,9 +313,11 @@
             "inch-ofhg": "#{n} inHg",
             "item": "#{n} 項目",
             "jigger": "#{n} ジガー",
+            "jo-jp": "#{n} 丈",
             "joule": "#{n} J",
             "karat": "#{n} 金",
             "kelvin": "#{n} K",
+            "ken": "#{n} 間",
             "kilobit": "#{n} kb",
             "kilobit-per-second": "#{n} kb/秒",
             "kilobyte": "#{n} KB",
@@ -310,6 +336,8 @@
             "kilowatt-hour": "#{n} kWh",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
             "knot": "#{n} kn",
+            "koku": "#{n} 石",
+            "kosaji": "#小さじ {n}",
             "light-year": "#{n} 光年",
             "liter": "#{n} L",
             "liter-per-100-kilometer": "#{n} L/100km",
@@ -357,6 +385,7 @@
             "newton": "#{n} N",
             "newton-meter": "#{n} N⋅m",
             "ohm": "#{n} Ω",
+            "osaji": "#大さじ {n}",
             "ounce": "#{n} oz",
             "ounce-troy": "#{n} oz t",
             "parsec": "#{n} pc",
@@ -383,7 +412,14 @@
             "quarter": "#{n}四半期",
             "radian": "#{n} rad",
             "revolution": "#{n} rev",
+            "ri-jp": "#{n} 里",
+            "rin": "#{n} 厘",
+            "sai": "#{n} 才",
+            "se-jp": "#{n} 畝",
             "second": "#{n} 秒",
+            "shaku": "#{n} 勺",
+            "shaku-cloth": "#{n} 鯨尺",
+            "shaku-length": "#{n} 尺",
             "short-ton": "#{n} s/t",
             "solar-luminosity": "#{n} L☉",
             "solar-mass": "#{n} M☉",
@@ -396,14 +432,16 @@
             "square-mile": "#{n} mi²",
             "square-yard": "#{n} yd²",
             "stone": "#{n} st",
-            "tablespoon": "#大さじ {n}",
-            "teaspoon": "#小さじ {n}",
+            "sun": "#{n} 寸",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
             "terabit": "#{n} Tb",
             "terabit-per-second": "#{n} Tb/秒",
             "terabyte": "#{n} TB",
             "terabyte-per-hour": "#{n} TB/時間",
             "terabyte-per-second": "#{n} TB/秒",
             "therm-us": "#{n} 米サーム",
+            "to-jp": "#{n} 斗",
             "ton": "#{n} s/t",
             "tonne": "#{n} t",
             "volt": "#{n} V",
diff --git a/js/data/locale/jbo/unitfmt.json b/js/data/locale/jbo/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/jbo/unitfmt.json
+++ b/js/data/locale/jbo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/jgo/unitfmt.json b/js/data/locale/jgo/unitfmt.json
index b36891b14e..2b47d2d5c6 100644
--- a/js/data/locale/jgo/unitfmt.json
+++ b/js/data/locale/jgo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/jmc/ctrynames.json b/js/data/locale/jmc/ctrynames.json
index f17a4fc647..2f48370426 100644
--- a/js/data/locale/jmc/ctrynames.json
+++ b/js/data/locale/jmc/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/jmc/ctryreverse.json b/js/data/locale/jmc/ctryreverse.json
index 3919b41208..894a6816e2 100644
--- a/js/data/locale/jmc/ctryreverse.json
+++ b/js/data/locale/jmc/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/jmc/unitfmt.json b/js/data/locale/jmc/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/jmc/unitfmt.json
+++ b/js/data/locale/jmc/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/jv/ctrynames.json b/js/data/locale/jv/ctrynames.json
index acda992109..ce83c3a6b9 100644
--- a/js/data/locale/jv/ctrynames.json
+++ b/js/data/locale/jv/ctrynames.json
@@ -289,7 +289,7 @@
     "Viètnam": "VN",
     "Walanda": "NL",
     "Wallis lan Futuna": "WF",
-    "Wilayah Inggris nang Segoro Hindia": "IO",
+    "Wilayah Inggris ing Segara Hindia": "IO",
     "Wilayah Prancis nang Kutub Kidul": "TF",
     "Yaman": "YE",
     "Yordania": "JO",
diff --git a/js/data/locale/jv/ctryreverse.json b/js/data/locale/jv/ctryreverse.json
index f73ff57eca..9016f9ffa9 100644
--- a/js/data/locale/jv/ctryreverse.json
+++ b/js/data/locale/jv/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israèl",
     "IM": "Pulo Man",
     "IN": "Indhia",
-    "IO": "Wilayah Inggris nang Segoro Hindia",
+    "IO": "Wilayah Inggris ing Segara Hindia",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Èslan",
diff --git a/js/data/locale/jv/unitfmt.json b/js/data/locale/jv/unitfmt.json
index 8fa8b20e44..dc5d12c8e2 100644
--- a/js/data/locale/jv/unitfmt.json
+++ b/js/data/locale/jv/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfer",
             "bar": "#{n} bar",
             "barrel": "#{n} barel",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit saben detik",
             "british-thermal-unit": "#{n} takeran panas Britania",
@@ -43,8 +44,8 @@
             "dessert-spoon": "#{n} sendok es",
             "dessert-spoon-imperial": "#{n} Imp. sendok es",
             "dot": "#{n} titik",
-            "dot-per-centimeter": "#{n} titek saben sentimeter",
-            "dot-per-inch": "#{n} titek saben inci",
+            "dot-per-centimeter": "#{n} titik per sentimeter",
+            "dot-per-inch": "#{n} titik per inci",
             "dram": "#{n} banyu dram",
             "drop": "#{n} tetes",
             "dunam": "#{n} dunam",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/dtk",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,8 @@
             "dessert-spoon": "#{n} sendok es",
             "dessert-spoon-imperial": "#{n} Imp. sendok es",
             "dot": "#{n} titik",
-            "dot-per-centimeter": "#{n} tscm",
-            "dot-per-inch": "#{n} tsi",
+            "dot-per-centimeter": "#{n} tpcm",
+            "dot-per-inch": "#{n} tpi",
             "dram": "#{n} banyu dram",
             "drop": "#{n} tetes",
             "dunam": "#{n} dunam",
diff --git a/js/data/locale/ka/unitfmt.json b/js/data/locale/ka/unitfmt.json
index aa790ea3b3..48a4c949bc 100644
--- a/js/data/locale/ka/unitfmt.json
+++ b/js/data/locale/ka/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} ატმოსფერო",
             "bar": "#{n} ბარი",
             "barrel": "#{n} ბარელი",
+            "beaufort": "#ბოფორტი {n}",
             "bit": "#{n} ბიტი",
             "bit-per-second": "#{n} ბიტი წამში",
             "british-thermal-unit": "#{n} ბრიტანული სითბური ერთეული",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} ატმ.",
             "bar": "#{n} ბარი",
             "barrel": "#{n} ბარ.",
+            "beaufort": "#B {n}",
             "bit": "#{n} ბიტი",
             "bit-per-second": "#{n} ბიტი/წმ",
             "british-thermal-unit": "#{n} ბსე",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} დესერტის კოვზი",
             "dessert-spoon-imperial": "#{n} ბრიტ. დეს. კოვზი",
-            "dot": "#{n} წერტილი",
+            "dot": "#{n} წერტ.",
             "dot-per-centimeter": "#{n} წერტ/სმ-ზე",
             "dot-per-inch": "#{n} წერტ/დუიმზე",
             "dram": "#{n} ბრიტ. თხევ. დრაქმა",
diff --git a/js/data/locale/kab/ctrynames.json b/js/data/locale/kab/ctrynames.json
index ca5102007a..62d4ade585 100644
--- a/js/data/locale/kab/ctrynames.json
+++ b/js/data/locale/kab/ctrynames.json
@@ -1,7 +1,6 @@
 {
     "Afɣanistan": "AF",
     "Africa": "002",
-    "Akal Aglizi deg Ugaraw Ahendi": "IO",
     "Åland Islands": "AX",
     "Americas": "019",
     "Antarctica": "AQ",
@@ -24,6 +23,7 @@
     "Biliz": "BZ",
     "Binin": "BJ",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Brizil": "BR",
     "Bruney": "BN",
     "Bulgari": "BG",
diff --git a/js/data/locale/kab/ctryreverse.json b/js/data/locale/kab/ctryreverse.json
index 738cd24290..5cdd1d151a 100644
--- a/js/data/locale/kab/ctryreverse.json
+++ b/js/data/locale/kab/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Izrayil",
     "IM": "Isle of Man",
     "IN": "Lhend",
-    "IO": "Akal Aglizi deg Ugaraw Ahendi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Lɛiraq",
     "IR": "Iran",
     "IS": "Island",
diff --git a/js/data/locale/kab/unitfmt.json b/js/data/locale/kab/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kab/unitfmt.json
+++ b/js/data/locale/kab/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kaj/unitfmt.json b/js/data/locale/kaj/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kaj/unitfmt.json
+++ b/js/data/locale/kaj/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kam/ctrynames.json b/js/data/locale/kam/ctrynames.json
index b3b5faa184..726cdeb0ce 100644
--- a/js/data/locale/kam/ctrynames.json
+++ b/js/data/locale/kam/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -60,7 +61,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/kam/ctryreverse.json b/js/data/locale/kam/ctryreverse.json
index 900bebbc29..d0dafea5b5 100644
--- a/js/data/locale/kam/ctryreverse.json
+++ b/js/data/locale/kam/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/kam/unitfmt.json b/js/data/locale/kam/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kam/unitfmt.json
+++ b/js/data/locale/kam/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kcg/unitfmt.json b/js/data/locale/kcg/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kcg/unitfmt.json
+++ b/js/data/locale/kcg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kde/ctrynames.json b/js/data/locale/kde/ctrynames.json
index 02b3df109f..0c1b2638d6 100644
--- a/js/data/locale/kde/ctrynames.json
+++ b/js/data/locale/kde/ctrynames.json
@@ -36,6 +36,7 @@
     "Bosnia na Hezegovina": "BA",
     "Botswana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Buchinafaso": "BF",
     "Bukini": "MG",
     "Bulgalia": "BG",
@@ -147,7 +148,6 @@
     "Lesoto": "LS",
     "Libelia": "LR",
     "Libya": "LY",
-    "Lieneo lyaki Nngalesa Nbahali ya Hindi": "IO",
     "Lishenteni": "LI",
     "Litwania": "LT",
     "Liyunioni": "RE",
diff --git a/js/data/locale/kde/ctryreverse.json b/js/data/locale/kde/ctryreverse.json
index 2d6a2460d3..e9b275f7d2 100644
--- a/js/data/locale/kde/ctryreverse.json
+++ b/js/data/locale/kde/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Islaeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Lieneo lyaki Nngalesa Nbahali ya Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Ilaki",
     "IR": "Uadyemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/kde/unitfmt.json b/js/data/locale/kde/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kde/unitfmt.json
+++ b/js/data/locale/kde/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kea/ctrynames.json b/js/data/locale/kea/ctrynames.json
index 3578998482..0b04a87f88 100644
--- a/js/data/locale/kea/ctrynames.json
+++ b/js/data/locale/kea/ctrynames.json
@@ -40,6 +40,7 @@
     "Bósnia i Erzegovina": "BA",
     "Botsuana": "BW",
     "Brazil": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bulgária": "BG",
     "Burkina Fasu": "BF",
@@ -88,7 +89,6 @@
     "Ilha di Natal": "CX",
     "Ilha Kliperton": "CP",
     "Ilhas Åland": "AX",
-    "Ilhas Británikas di Índiku": "IO",
     "Ilhas di Oseania": "QO",
     "Ilhas Faroe": "FO",
     "Ilhas Heard i McDonald": "HM",
diff --git a/js/data/locale/kea/ctryreverse.json b/js/data/locale/kea/ctryreverse.json
index 550a7ceaf3..17665a318f 100644
--- a/js/data/locale/kea/ctryreverse.json
+++ b/js/data/locale/kea/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Ilha di Man",
     "IN": "Índia",
-    "IO": "Ilhas Británikas di Índiku",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irãu",
     "IS": "Islándia",
diff --git a/js/data/locale/kea/unitfmt.json b/js/data/locale/kea/unitfmt.json
index 13130cf1de..a018803e81 100644
--- a/js/data/locale/kea/unitfmt.json
+++ b/js/data/locale/kea/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfera",
             "bar": "#{n} bar",
             "barrel": "#{n} baril",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit pur sigundu",
             "british-thermal-unit": "#{n} unidadi térmiku britániku",
@@ -42,9 +43,6 @@
             "degree": "#{n} grau",
             "dessert-spoon": "#{n} kudjer di subrimeza",
             "dessert-spoon-imperial": "#{n} kudjer di subrimeza britániku",
-            "dot": "#{n} pontu",
-            "dot-per-centimeter": "#{n} pontu pur sentímetru",
-            "dot-per-inch": "#{n} pontu pur pulegada",
             "dram": "#{n} drakma fluídu",
             "drop": "#{n} gota",
             "dunam": "#{n} dunam",
@@ -56,7 +54,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} ónsa fluídu",
             "fluid-ounce-imperial": "#{n} ónsa fluídu britániku",
-            "foodcalorie": "#{n} Kaloria",
             "foot": "#{n} pe",
             "foot-per-second": "#{n} pe pur sigundu",
             "furlong": "#{n} fur",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +246,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn brit.",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} drakma fl.",
             "drop": "#{n} gota",
             "dunam": "#{n} dunam",
@@ -262,7 +257,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz brit.",
-            "foodcalorie": "#{n} Cal",
             "foot": "#{n} pe",
             "foot-per-second": "#{n} pe/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/ken/unitfmt.json b/js/data/locale/ken/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ken/unitfmt.json
+++ b/js/data/locale/ken/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kgp/ctrynames.json b/js/data/locale/kgp/ctrynames.json
index 42b6e66db9..b6cdcda8c6 100644
--- a/js/data/locale/kgp/ctrynames.json
+++ b/js/data/locale/kgp/ctrynames.json
@@ -30,6 +30,7 @@
     "Asẽnsỹv Goj-vẽso": "AC",
     "Ausitrarajia": "053",
     "Avotyraria": "AU",
+    "British Indian Ocean Territory": "IO",
     "Ejito": "EG",
     "Ekuvanor": "EC",
     "Emĩrano Arame Unĩno": "AE",
@@ -196,7 +197,6 @@
     "Orópa-Rãjur": "151",
     "Oseanĩja": "009",
     "Osiỹnĩja Kuvar-gy": "QO",
-    "Osiỹno Ĩniko tỹ Tehitórijo Mritỹnĩku": "IO",
     "Pajisi Rur": "NL",
     "Pajisi Rur Karimejã": "BQ",
     "Pakinhtỹv": "PK",
diff --git a/js/data/locale/kgp/ctryreverse.json b/js/data/locale/kgp/ctryreverse.json
index 09dc786435..4d82bee351 100644
--- a/js/data/locale/kgp/ctryreverse.json
+++ b/js/data/locale/kgp/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isihaé",
     "IM": "Mỹn Goj-vẽso",
     "IN": "Ĩnija",
-    "IO": "Osiỹno Ĩniko tỹ Tehitórijo Mritỹnĩku",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irỹ",
     "IS": "Inhrỹnija",
diff --git a/js/data/locale/kgp/sysres.json b/js/data/locale/kgp/sysres.json
index 65b1054aca..155c9cca4c 100644
--- a/js/data/locale/kgp/sysres.json
+++ b/js/data/locale/kgp/sysres.json
@@ -1,70 +1,70 @@
 {
-    "#in {num}d": "one#kurã {num} kar kỹ|#kurã {num} kar kỹ",
+    "#in {num}d": "#kurã {num} kar kỹ",
     "#in {num}h": "one#{num} h kar kỹ|#{num} h kar kỹ",
     "#in {num}mi": "one#mĩn. {num} kar kỹ|#mĩn. {num} kar kỹ",
-    "#in {num}mo": "one#kysã {num} kar kỹ|#kysã {num} kar kỹ",
+    "#in {num}mo": "#kysã {num} kar kỹ",
     "#in {num}s": "one#seg. {num} kar kỹ|#seg. {num} kar kỹ",
     "#in {num}w": "one#sim. {num} kar kỹ|#sim. {num} kar kỹ",
-    "#in {num}y": "one#prỹg {num} kar kỹ|#prỹg {num} kar kỹ",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#in {num}y": "#prỹg {num} kar kỹ",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} kurã|#{num} kurã ag",
-    "#{num}d ago": "one#kurã {num} si ser|#kurã {num} si ser",
-    "#{num}h": "one#{num} h|#{num} h",
+    "#{num}d ago": "#kurã {num} si ser",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#{num} h si ser|#{num} h si ser",
     "#{num}mi ago": "one#mĩn. {num} si ser|#mĩn. {num} si ser",
-    "#{num}mo ago": "one#kysã {num} si ser|#kysã {num} si ser",
+    "#{num}mo ago": "#kysã {num} si ser",
     "#{num}s": "one#{num} s|#{num} s",
     "#{num}s ago": "one#seg. {num} si ser|#seg. {num} si ser",
-    "#{num}w": "one#{num} sim.|#{num} sim. Ag",
+    "#{num}w": "#{num} sim. Ag",
     "#{num}w ago": "one#sim. {num} si ser|#sim. {num} si ser",
     "#{num}y": "one#{num} prỹg|#{num} prỹg ag",
-    "#{num}y ago": "one#prỹg {num} si ser|#prỹg {num} si ser",
-    "1#1 day ago|#{num} days ago": "one#kurã {num} si ser|#kurã {num} si ser",
+    "#{num}y ago": "#prỹg {num} si ser",
+    "1#1 day ago|#{num} days ago": "#kurã {num} si ser",
     "1#1 day|#{num} days": "one#kurã {num}|#kurã {num}",
-    "1#1 dy ago|#{num} dys ago": "one#kurã {num} si ser|#kurã {num} si ser",
+    "1#1 dy ago|#{num} dys ago": "#kurã {num} si ser",
     "1#1 dy|#{num} dys": "one#{num} kurã|#{num} kurã ag",
-    "1#1 hour ago|#{num} hours ago": "one#óra {num} si ser|#óra {num} si ser",
+    "1#1 hour ago|#{num} hours ago": "#óra {num} si ser",
     "1#1 hour|#{num} hours": "one#óra {num}|#óra ag {num}",
-    "1#1 hr ago|#{num} hrs ago": "one#óra {num} si ser|#óra {num} si ser",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#óra {num} si ser",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#mĩrisigũnu {num}|#mĩrisigũnu {num}",
-    "1#1 min ago|#{num} min ago": "one#mĩnũtu {num} si ser|#mĩnũtu {num} si ser",
-    "1#1 minute ago|#{num} minutes ago": "one#mĩnũtu {num} si ser|#mĩnũtu {num} si ser",
+    "1#1 min ago|#{num} min ago": "#mĩnũtu {num} si ser",
+    "1#1 minute ago|#{num} minutes ago": "#mĩnũtu {num} si ser",
     "1#1 minute|#{num} minutes": "one#mĩnũtu {num}|#mĩnũtu {num}",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mon ago|#{num} mons ago": "one#kysã {num} si ser|#kysã {num} si ser",
-    "1#1 month ago|#{num} months ago": "one#kysã {num} si ser|#kysã {num} si ser",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#kysã {num} si ser",
+    "1#1 month ago|#{num} months ago": "#kysã {num} si ser",
     "1#1 month|#{num} months": "one#kysã {num}|#kysã ag {num}",
     "1#1 mon|#{num} mons": "one#{num} kysã|#{num} kysã ag",
     "1#1 mo|#{num} mos": "one#{num} kysã|#{num} kysã ag",
-    "1#1 sec ago|#{num} sec ago": "one#segũno {num} si ser|#segũno {num} si ser",
-    "1#1 second ago|#{num} seconds ago": "one#segũno {num} si ser|#segũno {num} si ser",
+    "1#1 sec ago|#{num} sec ago": "#segũno {num} si ser",
+    "1#1 second ago|#{num} seconds ago": "#segũno {num} si ser",
     "1#1 second|#{num} seconds": "one#sigũnu {num}|#sigũnu {num}",
-    "1#1 sec|#{num} sec": "one#{num} sig|#{num} sig",
+    "1#1 sec|#{num} sec": "#{num} sig",
     "1#1 se|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 week ago|#{num} weeks ago": "one#simỹnỹ {num} si ser|#simỹnỹ {num} si ser",
+    "1#1 week ago|#{num} weeks ago": "#simỹnỹ {num} si ser",
     "1#1 week|#{num} weeks": "one#{num} simỹnỹ|#{num} simỹnỹ ag",
-    "1#1 wk ago|#{num} wks ago": "one#simỹnỹ {num} si ser|#simỹnỹ {num} si ser",
-    "1#1 wk|#{num} wks": "one#{num} sim.|#{num} sim.",
-    "1#1 year ago|#{num} years ago": "one#prỹg {num} si ser|#prỹg {num} si ser",
+    "1#1 wk ago|#{num} wks ago": "#simỹnỹ {num} si ser",
+    "1#1 wk|#{num} wks": "#{num} sim.",
+    "1#1 year ago|#{num} years ago": "#prỹg {num} si ser",
     "1#1 year|#{num} years": "one#{num} prỹg|#{num} prỹg ag",
-    "1#1 yr ago|#{num} yrs ago": "one#prỹg {num} si ser|#prỹg {num} si ser",
+    "1#1 yr ago|#{num} yrs ago": "#prỹg {num} si ser",
     "1#1 yr|#{num} yrs": "one#{num} prỹg|#{num} prỹg ag",
-    "1#in 1 day|#in {num} days": "one#kurã {num} kar kỹ|#kurã {num} kar kỹ",
-    "1#in 1 dy|#in {num} dys": "one#kurã {num} kar kỹ|#kurã {num} kar kỹ",
-    "1#in 1 hour|#in {num} hours": "one#óra {num} kar kỹ|#óra {num} kar kỹ",
-    "1#in 1 hr|#in {num} hrs": "one#óra {num} kar kỹ|#óra {num} kar kỹ",
-    "1#in 1 minute|#in {num} minutes": "one#mĩnũtu {num} kar kỹ|#mĩnũtu {num} kar kỹ",
-    "1#in 1 min|#in {num} min": "one#mĩnũtu {num} kar kỹ|#mĩnũtu {num} kar kỹ",
-    "1#in 1 month|#in {num} months": "one#kysã {num} kar kỹ|#kysã {num} kar kỹ",
-    "1#in 1 mon|#in {num} mons": "one#kysã {num} kar kỹ|#kysã {num} kar kỹ",
-    "1#in 1 second|#in {num} seconds": "one#segũno {num} kar kỹ|#segũno {num} kar kỹ",
-    "1#in 1 sec|#in {num} sec": "one#segũno {num} kar kỹ|#segũno {num} kar kỹ",
-    "1#in 1 week|#in {num} weeks": "one#simỹnỹ {num} kar kỹ|#simỹnỹ {num} kar kỹ",
-    "1#in 1 wk|#in {num} wks": "one#simỹnỹ {num} kar kỹ|#simỹnỹ {num} kar kỹ",
-    "1#in 1 year|#in {num} years": "one#prỹg {num} kar kỹ|#prỹg {num} kar kỹ",
-    "1#in 1 yr|#in {num} yrs": "one#prỹg {num} kar kỹ|#prỹg {num} kar kỹ",
+    "1#in 1 day|#in {num} days": "#kurã {num} kar kỹ",
+    "1#in 1 dy|#in {num} dys": "#kurã {num} kar kỹ",
+    "1#in 1 hour|#in {num} hours": "#óra {num} kar kỹ",
+    "1#in 1 hr|#in {num} hrs": "#óra {num} kar kỹ",
+    "1#in 1 minute|#in {num} minutes": "#mĩnũtu {num} kar kỹ",
+    "1#in 1 min|#in {num} min": "#mĩnũtu {num} kar kỹ",
+    "1#in 1 month|#in {num} months": "#kysã {num} kar kỹ",
+    "1#in 1 mon|#in {num} mons": "#kysã {num} kar kỹ",
+    "1#in 1 second|#in {num} seconds": "#segũno {num} kar kỹ",
+    "1#in 1 sec|#in {num} sec": "#segũno {num} kar kỹ",
+    "1#in 1 week|#in {num} weeks": "#simỹnỹ {num} kar kỹ",
+    "1#in 1 wk|#in {num} wks": "#simỹnỹ {num} kar kỹ",
+    "1#in 1 year|#in {num} years": "#prỹg {num} kar kỹ",
+    "1#in 1 yr|#in {num} yrs": "#prỹg {num} kar kỹ",
     "B0": "kuty-si",
     "B1": "kurã ge",
     "B2": "AM",
@@ -152,12 +152,12 @@
     "NN8": "8K",
     "NN9": "9K",
     "durationLongDays": "one#{num} kurã|#{num} kurã ag",
-    "durationMediumHours": "one#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
-    "durationMediumWeeks": "one#{num} sim.|#{num} sim. Ag",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} sim. Ag",
     "durationMediumYears": "one#{num} prỹg|#{num} prỹg ag",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|#{num} min",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
     "durationShortMonths": "one#{num} kysã|#{num} kysã ag",
     "finalSeparatorFull": " kar ",
     "finalSeparatorLong": " kar ",
diff --git a/js/data/locale/kgp/unitfmt.json b/js/data/locale/kgp/unitfmt.json
index 314c41b94e..5d30304b47 100644
--- a/js/data/locale/kgp/unitfmt.json
+++ b/js/data/locale/kgp/unitfmt.json
@@ -10,7 +10,8 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosfera ag",
             "bar": "one#{n} bar|#{n} bar ag",
             "barrel": "one#{n} marir|#{n} marir ag",
-            "bit": "one#{n} bit|#{n} bit ag",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit ag",
             "bit-per-second": "#sigũnu {n} bit ag ki",
             "british-thermal-unit": "one#{n} ũnĩnane térmĩka mritỹnĩka|#{n} ũnĩnane térmĩka mritỹnĩka ag",
             "bushel": "#{n} bu",
@@ -42,11 +43,9 @@
             "degree": "#{n} grav",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "one#{n} pãntu sẽntimẽturo ki|#{n} pãntu ag sẽntimẽturo ki",
-            "dot-per-inch": "one#{n} pãntu poregana ki|#{n} pãntu ag poregana ki",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
-            "dunam": "one#{n} dunam|#dunam {n}",
+            "dunam": "#dunam {n}",
             "earth-mass": "#{n} ga-pãgoj",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "one#{n} elétron-volt|#{n} elétron-volt ag",
@@ -55,7 +54,6 @@
             "fathom": "one#{n} mrasa|#{n} mrasa ag",
             "fluid-ounce": "one#{n} mĩgfi gungón|#{n} mĩgfi gungón ag",
             "fluid-ounce-imperial": "one#{n} mĩgfi gungón ĩmperijav|#{n} mĩgfi gungón ĩmperijav ag",
-            "foodcalorie": "one#{n} Karorija|#{n} Karorija ag",
             "foot": "one#{n} tipẽn|#{n} tipẽn ag",
             "foot-per-second": "#sigũnu {n} tipẽn ag ki",
             "furlong": "one#{n} furlong|#{n} furlong ag",
@@ -103,7 +101,7 @@
             "kilowatt-hour": "one#{n} kirowatt-óra|#{n} kirowatt-óra ag",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
             "knot": "one#{n} kagje|#{n} kagje ag",
-            "light-year": "one#{n} prỹg-jẽngrẽ|#{n} prỹg-jẽngrẽ ag",
+            "light-year": "#{n} prỹg-jẽngrẽ ag",
             "liter": "one#{n} ritru|#{n} ritru ag",
             "liter-per-100-kilometer": "one#{n} ritru kiromẽturo tỹ 100 ki|#{n} ritru ag kiromẽturo tỹ 100 ki",
             "liter-per-kilometer": "one#{n} ritru kiromẽturo ki|#{n} ritru ag kiromẽturo ki",
@@ -215,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bar ag",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s ki",
             "british-thermal-unit": "#{n} BTU",
@@ -247,8 +246,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
@@ -260,7 +257,6 @@
             "fathom": "#{n} bça. mrs",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} cal",
             "foot": "one#{n} tipẽn|#{n} tipẽn ag",
             "foot-per-second": "#{n} tipẽn ag/s ki",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/khq/ctrynames.json b/js/data/locale/khq/ctrynames.json
index 7d6fd94b1f..1a102a4c0c 100644
--- a/js/data/locale/khq/ctrynames.json
+++ b/js/data/locale/khq/ctrynames.json
@@ -37,7 +37,7 @@
     "Botswaana": "BW",
     "Bouvet Island": "BV",
     "Breezil": "BR",
-    "Britiši Indu teekoo laama": "IO",
+    "British Indian Ocean Territory": "IO",
     "Britiši Virgin gungey": "VG",
     "Bruunee": "BN",
     "Bulgaari": "BG",
diff --git a/js/data/locale/khq/ctryreverse.json b/js/data/locale/khq/ctryreverse.json
index 24e7ca136f..9f4b3bd258 100644
--- a/js/data/locale/khq/ctryreverse.json
+++ b/js/data/locale/khq/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israyel",
     "IM": "Isle of Man",
     "IN": "Indu laboo",
-    "IO": "Britiši Indu teekoo laama",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Ayceland",
diff --git a/js/data/locale/khq/unitfmt.json b/js/data/locale/khq/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/khq/unitfmt.json
+++ b/js/data/locale/khq/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ki/ctrynames.json b/js/data/locale/ki/ctrynames.json
index d1f707b216..9197264670 100644
--- a/js/data/locale/ki/ctrynames.json
+++ b/js/data/locale/ki/ctrynames.json
@@ -36,6 +36,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/ki/ctryreverse.json b/js/data/locale/ki/ctryreverse.json
index 80b2244c2c..f865e3446c 100644
--- a/js/data/locale/ki/ctryreverse.json
+++ b/js/data/locale/ki/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/ki/unitfmt.json b/js/data/locale/ki/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ki/unitfmt.json
+++ b/js/data/locale/ki/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kk/unitfmt.json b/js/data/locale/kk/unitfmt.json
index 2cb60432a9..19a50127fe 100644
--- a/js/data/locale/kk/unitfmt.json
+++ b/js/data/locale/kk/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} атмосфера",
             "bar": "#{n} бар",
             "barrel": "#{n} баррель",
+            "beaufort": "#бофорт {n}",
             "bit": "#{n} бит",
             "bit-per-second": "#секундына {n} бит",
             "british-thermal-unit": "#{n} британдық жылу бірлігі",
@@ -30,7 +31,7 @@
             "cubic-inch": "#{n} текше дюйм",
             "cubic-kilometer": "#{n} текше километр",
             "cubic-meter": "#{n} текше метр",
-            "cubic-mile": "#{n} текше миля",
+            "cubic-mile": "#{n} текше миль",
             "cubic-yard": "#{n} текше ярд",
             "cup": "#{n} кесе",
             "cup-metric": "#{n} метрлік кесе",
@@ -41,7 +42,7 @@
             "decimeter": "#{n} дециметр",
             "degree": "#{n} градус",
             "dessert-spoon": "#{n} десерт қасығы",
-            "dessert-spoon-imperial": "#{n} брит. дес. қас.",
+            "dessert-spoon-imperial": "#{n} имп. дес. қас.",
             "dot": "#{n} нүкте",
             "dot-per-centimeter": "#{n} нүкте/сантиметр",
             "dot-per-inch": "#{n} нүкте/дюйм",
@@ -62,7 +63,7 @@
             "furlong": "#{n} фурлонг",
             "g-force": "#{n} гравитациялық күш",
             "gallon": "#{n} галлон",
-            "gallon-imperial": "#{n} брит. галлон",
+            "gallon-imperial": "#{n} имп. галлон",
             "generic": "#{n} градус",
             "gigabit": "#{n} гигабит",
             "gigabit-per-second": "#секундына {n} гигабит",
@@ -126,12 +127,12 @@
             "microgram": "#{n} микрограмм",
             "micrometer": "#{n} микрометр",
             "microsecond": "#{n} микросекунд",
-            "mile": "#{n} миля",
-            "mile-per-gallon": "#{n} миля/галлон",
-            "mile-per-gallon-imperial": "#{n} миля/имп. галлон",
-            "mile-per-hour": "#{n} миля/сағат",
-            "mile-per-second": "#секундына {n} миля",
-            "mile-scandinavian": "#{n} скандинавиялық миля",
+            "mile": "#{n} миль",
+            "mile-per-gallon": "#{n} миль/галлон",
+            "mile-per-gallon-imperial": "#{n} миль/имп. галлон",
+            "mile-per-hour": "#{n} миль/сағат",
+            "mile-per-second": "#секундына {n} миль",
+            "mile-scandinavian": "#{n} скандинавиялық миль",
             "milliampere": "#{n} миллиампер",
             "millibar": "#{n} миллибар",
             "milligram": "#{n} миллиграмм",
@@ -147,7 +148,7 @@
             "month": "#{n} ай",
             "nanometer": "#{n} нанометр",
             "nanosecond": "#{n} наносекунд",
-            "nautical-mile": "#{n} теңіз милясы",
+            "nautical-mile": "#{n} теңіз милі",
             "newton": "#{n} ньютон",
             "newton-meter": "#{n} ньютон-метр",
             "ohm": "#{n} Ом",
@@ -187,7 +188,7 @@
             "square-inch": "#{n} шаршы дюйм",
             "square-kilometer": "#{n} шаршы километр",
             "square-meter": "#{n} шаршы метр",
-            "square-mile": "#{n} шаршы миля",
+            "square-mile": "#{n} шаршы миль",
             "square-yard": "#{n} шаршы ярд",
             "stone": "#{n} стоун",
             "tablespoon": "#{n} ас қасық",
@@ -197,7 +198,7 @@
             "terabyte": "#{n} терабайт",
             "terabyte-per-hour": "#сағатына {n} терабайт",
             "terabyte-per-second": "#секундына {n} терабайт",
-            "therm-us": "#{n} америка термі",
+            "therm-us": "#{n} АҚШ термі",
             "ton": "#{n} тонна",
             "tonne": "#{n} метрлік тонна",
             "volt": "#{n} вольт",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} атм",
             "bar": "#{n} бар",
             "barrel": "#{n} баррель",
+            "beaufort": "#бофорт {n}",
             "bit": "#{n} бит",
             "bit-per-second": "#{n} бит/с",
             "british-thermal-unit": "#{n} Btu",
@@ -236,7 +238,7 @@
             "cubic-inch": "#{n} дюйм³",
             "cubic-kilometer": "#{n} км³",
             "cubic-meter": "#{n} м³",
-            "cubic-mile": "#{n} миля³",
+            "cubic-mile": "#{n} миль³",
             "cubic-yard": "#{n} ярд³",
             "cup": "#{n} к.",
             "cup-metric": "#{n} мк",
@@ -247,8 +249,8 @@
             "decimeter": "#{n} дм",
             "degree": "#{n} градус",
             "dessert-spoon": "#{n} дес. қас.",
-            "dessert-spoon-imperial": "#{n} брит. дес. қас.",
-            "dot": "#{n} пиксель",
+            "dessert-spoon-imperial": "#{n} имп. дес. қас.",
+            "dot": "#{n} нүкте",
             "dot-per-centimeter": "#{n} нүкте/см",
             "dot-per-inch": "#{n} нүкте/дюйм",
             "dram": "#{n} сұй. драхма",
@@ -261,14 +263,14 @@
             "fahrenheit": "#{n}°F",
             "fathom": "#{n} фатом",
             "fluid-ounce": "#{n} сұй. унц.",
-            "fluid-ounce-imperial": "#{n} брит. сұй. унция",
+            "fluid-ounce-imperial": "#{n} имп. сұй. унция",
             "foodcalorie": "#{n} кал",
             "foot": "#{n} фут",
             "foot-per-second": "#{n} фут/с",
             "furlong": "#{n} фурлонг",
             "g-force": "#{n} G",
             "gallon": "#{n} гал.",
-            "gallon-imperial": "#{n} брит. галлон",
+            "gallon-imperial": "#{n} имп. галлон",
             "generic": "#{n}°",
             "gigabit": "#{n} Гб",
             "gigabit-per-second": "#{n} Гб/с",
@@ -309,7 +311,7 @@
             "kilowatt": "#{n} кВт",
             "kilowatt-hour": "#{n} кВт-сағ",
             "kilowatt-hour-per-100-kilometer": "#{n} кВт-сағ/100 км",
-            "knot": "#{n} kn",
+            "knot": "#{n} түйін",
             "light-year": "#{n} ж. ж.",
             "liter": "#{n} л",
             "liter-per-100-kilometer": "#{n} л/100 км",
@@ -332,11 +334,11 @@
             "microgram": "#{n} мкг",
             "micrometer": "#{n} мкм",
             "microsecond": "#{n} мкс",
-            "mile": "#{n} миля",
-            "mile-per-gallon": "#{n} миля/гал.",
-            "mile-per-gallon-imperial": "#{n} миля/имп. гал.",
-            "mile-per-hour": "#{n} миля/сағ",
-            "mile-per-second": "#{n} миля/с",
+            "mile": "#{n} миль",
+            "mile-per-gallon": "#{n} миль/гал.",
+            "mile-per-gallon-imperial": "#{n} миль/имп. гал.",
+            "mile-per-hour": "#{n} миль/сағ",
+            "mile-per-second": "#{n} миль/с",
             "mile-scandinavian": "#{n} smi",
             "milliampere": "#{n} мA",
             "millibar": "#{n} мбар",
@@ -393,7 +395,7 @@
             "square-inch": "#{n} дюйм²",
             "square-kilometer": "#{n} км²",
             "square-meter": "#{n} м²",
-            "square-mile": "#{n} миля²",
+            "square-mile": "#{n} миль²",
             "square-yard": "#{n} ярд²",
             "stone": "#{n} стоун",
             "tablespoon": "#{n} ас қ.",
@@ -403,7 +405,7 @@
             "terabyte": "#{n} TБ",
             "terabyte-per-hour": "#{n} TБ/сағ",
             "terabyte-per-second": "#{n} TБ/с",
-            "therm-us": "#{n} амер. термі",
+            "therm-us": "#{n} АҚШ термі",
             "ton": "#{n} тн",
             "tonne": "#{n} т",
             "volt": "#{n} В",
diff --git a/js/data/locale/kkj/unitfmt.json b/js/data/locale/kkj/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kkj/unitfmt.json
+++ b/js/data/locale/kkj/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kl/unitfmt.json b/js/data/locale/kl/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kl/unitfmt.json
+++ b/js/data/locale/kl/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kln/ctrynames.json b/js/data/locale/kln/ctrynames.json
index dbb853408a..ce40433c94 100644
--- a/js/data/locale/kln/ctrynames.json
+++ b/js/data/locale/kln/ctrynames.json
@@ -7,6 +7,7 @@
     "Asia": "142",
     "Australasia": "053",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Canary Islands": "IC",
     "Caribbean": "029",
     "Caribbean Netherlands": "BQ",
@@ -253,7 +254,6 @@
     "Ikwemweiyotab Amerika": "VI",
     "Isle of Man": "IM",
     "Jersey": "JE",
-    "Kebebertab araraitab indian Ocean nebo Uingeresa": "IO",
     "Kosovo": "XK",
     "Latin America": "419",
     "Macao SAR China": "MO",
diff --git a/js/data/locale/kln/ctryreverse.json b/js/data/locale/kln/ctryreverse.json
index b12d26bc63..c526a657f6 100644
--- a/js/data/locale/kln/ctryreverse.json
+++ b/js/data/locale/kln/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Emetab Israel",
     "IM": "Isle of Man",
     "IN": "Emetab India",
-    "IO": "Kebebertab araraitab indian Ocean nebo Uingeresa",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Emetab Iraq",
     "IR": "Emetab Iran",
     "IS": "Emetab Iceland",
diff --git a/js/data/locale/kln/unitfmt.json b/js/data/locale/kln/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kln/unitfmt.json
+++ b/js/data/locale/kln/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/km/numfmt.jf b/js/data/locale/km/numfmt.jf
index 3c6cfa1ff8..c483ef4de5 100644
--- a/js/data/locale/km/numfmt.jf
+++ b/js/data/locale/km/numfmt.jf
@@ -22,8 +22,6 @@
         "currencyFormats": {
             "common": "{n}{s}",
             "commonNegative": "-{n}{s}"
-        },
-        "decimalChar": ",",
-        "groupChar": "."
+        }
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/km/unitfmt.json b/js/data/locale/km/unitfmt.json
index 2e0c71459a..3d5a3f79e5 100644
--- a/js/data/locale/km/unitfmt.json
+++ b/js/data/locale/km/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#បរិយាកាស {n}",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} ប៊ីត",
             "bit-per-second": "#{n} ប៊ីត ក្នុង​មួយ​វិនាទី",
             "british-thermal-unit": "#{n} ឯកតាកម្ដៅអង់គ្លេស",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/វិនាទី",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,6 @@
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dot": "#{n} ចំណុច",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} ត្រាមរាវ",
             "drop": "#{n} តំណក់",
             "dunam": "#{n} ឌូណាម",
diff --git a/js/data/locale/kn/ctrynames.json b/js/data/locale/kn/ctrynames.json
index 2897361280..6cc85e5ef6 100644
--- a/js/data/locale/kn/ctrynames.json
+++ b/js/data/locale/kn/ctrynames.json
@@ -109,7 +109,6 @@
     "ಜೆರ್ಸಿ": "JE",
     "ಜೋರ್ಡಾನ್": "JO",
     "ಝೆಕಿಯಾ": "CZ",
-    "ಟರ್ಕಿ": "TR",
     "ಟರ್ಕ್ಸ್ ಮತ್ತು ಕೈಕೋಸ್ ದ್ವೀಪಗಳು": "TC",
     "ಟಿಮೋರ್ ಲೆಸ್ಟೆ": "TL",
     "ಟುನೀಶಿಯ": "TN",
@@ -126,6 +125,7 @@
     "ತಜಿಕಿಸ್ತಾನ್": "TJ",
     "ತಾಂಜೇನಿಯಾ": "TZ",
     "ತುರ್ಕಮೆನಿಸ್ತಾನ್": "TM",
+    "ತುರ್ಕಿಯೆ": "TR",
     "ತೈವಾನ್": "TW",
     "ಥೈಲ್ಯಾಂಡ್": "TH",
     "ದಕ್ಷಿಣ ಅಮೇರಿಕಾ": "005",
@@ -199,7 +199,7 @@
     "ಭಾರತ": "IN",
     "ಭೂತಾನ್": "BT",
     "ಮಂಗೋಲಿಯಾ": "MN",
-    "ಮಕಾವು SAR ಚೈನಾ": "MO",
+    "ಮಕಾವು ಎಸ್ಎಆರ್ ಚೈನಾ": "MO",
     "ಮಡಗಾಸ್ಕರ್": "MG",
     "ಮಧ್ಯ ಅಮೇರಿಕಾ": "013",
     "ಮಧ್ಯ ಆಫ್ರಿಕಾ": "017",
@@ -290,7 +290,7 @@
     "ಸ್ವೀಡನ್": "SE",
     "ಹಂಗೇರಿ": "HU",
     "ಹರ್ಡ್ ಮತ್ತು ಮ್ಯಾಕ್‌ಡೋನಾಲ್ಡ್ ದ್ವೀಪಗಳು": "HM",
-    "ಹಾಂಗ್ ಕಾಂಗ್ SAR ಚೈನಾ": "HK",
+    "ಹಾಂಗ್ ಕಾಂಗ್ ಎಸ್ಎಆರ್ ಚೈನಾ": "HK",
     "ಹೈಟಿ": "HT",
     "ಹೊಂಡುರಾಸ್": "HN",
     "Sark": "CQ"
diff --git a/js/data/locale/kn/ctryreverse.json b/js/data/locale/kn/ctryreverse.json
index b00716c09b..e8f15ad2d3 100644
--- a/js/data/locale/kn/ctryreverse.json
+++ b/js/data/locale/kn/ctryreverse.json
@@ -131,7 +131,7 @@
     "GU": "ಗುವಾಮ್",
     "GW": "ಗಿನಿ-ಬಿಸ್ಸಾವ್",
     "GY": "ಗಯಾನಾ",
-    "HK": "ಹಾಂಗ್ ಕಾಂಗ್ SAR ಚೈನಾ",
+    "HK": "ಹಾಂಗ್ ಕಾಂಗ್ ಎಸ್ಎಆರ್ ಚೈನಾ",
     "HM": "ಹರ್ಡ್ ಮತ್ತು ಮ್ಯಾಕ್‌ಡೋನಾಲ್ಡ್ ದ್ವೀಪಗಳು",
     "HN": "ಹೊಂಡುರಾಸ್",
     "HR": "ಕ್ರೊಯೇಷಿಯಾ",
@@ -185,7 +185,7 @@
     "ML": "ಮಾಲಿ",
     "MM": "ಮಯನ್ಮಾರ್ (ಬರ್ಮಾ)",
     "MN": "ಮಂಗೋಲಿಯಾ",
-    "MO": "ಮಕಾವು SAR ಚೈನಾ",
+    "MO": "ಮಕಾವು ಎಸ್ಎಆರ್ ಚೈನಾ",
     "MP": "ಉತ್ತರ ಮರಿಯಾನಾ ದ್ವೀಪಗಳು",
     "MQ": "ಮಾರ್ಟಿನಿಕ್",
     "MR": "ಮಾರಿಟೇನಿಯಾ",
@@ -264,7 +264,7 @@
     "TM": "ತುರ್ಕಮೆನಿಸ್ತಾನ್",
     "TN": "ಟುನೀಶಿಯ",
     "TO": "ಟೊಂಗಾ",
-    "TR": "ಟರ್ಕಿ",
+    "TR": "ತುರ್ಕಿಯೆ",
     "TT": "ಟ್ರಿನಿಡಾಡ್ ಮತ್ತು ಟೊಬಾಗೊ",
     "TV": "ಟುವಾಲು",
     "TW": "ತೈವಾನ್",
diff --git a/js/data/locale/kn/unitfmt.json b/js/data/locale/kn/unitfmt.json
index 29ae1aae14..dc08a6aa85 100644
--- a/js/data/locale/kn/unitfmt.json
+++ b/js/data/locale/kn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} ವಾತಾವರಣ|#{n} ವಾತಾವರಣಗಳು",
             "bar": "one#{n} ಬಾರ್‌|#{n} ಬಾರ್‌ಗಳು",
             "barrel": "one#{n} ಬ್ಯಾರೆಲ್|#{n} ಬ್ಯಾರೆಲ್‌ಗಳು",
+            "beaufort": "#ಬ್ಯೂಫೋರ್ಟ್ {n}",
             "bit": "one#{n} ಬಿಟ್‌|#{n} ಬಿಟ್‍ಗಳು",
             "bit-per-second": "#ಪ್ರತಿ ಸೆಕೆಂಡ್‌ಗೆ {n} ಬಿಟ್‍ಗಳು",
             "british-thermal-unit": "one#{n} ಬ್ರಿಟಿಷ್ ಉಷ್ಣ ಘಟಕ|#{n} ಬ್ರಿಟಿಷ್ ಉಷ್ಣ ಘಟಕಗಳು",
@@ -43,10 +44,10 @@
             "dessert-spoon": "#{n} ಡೆಸರ್ಟ್ ಸ್ಪೂನ್",
             "dessert-spoon-imperial": "#{n} ಇಂಪಿರಿಯಲ್ ಡೆಸರ್ಟ್ ಸ್ಪೂನ್",
             "dot": "one#{n} ಡಾಟ್‌|#{n} ಡಾಟ್‌ಗಳು",
-            "dot-per-centimeter": "#{n} ಡಾಟ್ಸ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್",
+            "dot-per-centimeter": "one#{n} ಡಾಟ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್|#{n} ಡಾಟ್ಸ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್",
             "dot-per-inch": "one#{n} ಡಾಟ್ ಪರ್ ಇಂಚ್|#{n} ಡಾಟ್ಸ್ ಪರ್ ಇಂಚ್",
             "dram": "#{n} ಡ್ರಾಮ್",
-            "drop": "#{n} ಡ್ರಾಪ್",
+            "drop": "one#{n} ಡ್ರಾಪ್|#{n} ಡ್ರಾಪ್ಸ್",
             "dunam": "one#{n} ಡುನಮ್‌|#{n} ಡುನಮ್‌ಗಳು",
             "earth-mass": "one#{n} ಭೂಮಿಯ ದ್ರವ್ಯರಾಶಿ|#{n} ಭೂಮಿಯ ದ್ರವ್ಯರಾಶಿಗಳು",
             "earth-radius": "#{n} ಭೂಮಿಯ ತ್ರಿಜ್ಯ",
@@ -56,7 +57,7 @@
             "fathom": "one#{n} ಫ್ಯಾಥಮ್|#{n} ಫ್ಯಾಥಮ್ಸ್",
             "fluid-ounce": "one#{n} ಫ್ಲೂಯ್ಡ್ ಔನ್ಸ್|#{n} ಫ್ಲೂಯ್ಡ್ ಔನ್ಸ್‌ಗಳು",
             "fluid-ounce-imperial": "one#{n} ಇಂಪಿರಿಯಲ್ ಫ್ಲೂಯ್ಡ್ ಔನ್ಸ್‌|#{n} ಇಂಪಿರಿಯಲ್ ಫ್ಲೂಯ್ಡ್ ಔನ್ಸ್‌ಗಳು",
-            "foodcalorie": "one#{n} ಕ್ಯಾಲೋರಿ|#{n} ಕ್ಯಾಲೋರಿಗಳು",
+            "foodcalorie": "one#{n} ಕ್ಯಾಲೊರಿ|#{n} ಕ್ಯಾಲೊರಿಗಳು",
             "foot": "#{n} ಅಡಿ",
             "foot-per-second": "#ಪ್ರತಿ ಸೆಕೆಂಡ್‌ಗೆ {n} ಅಡಿ",
             "furlong": "one#{n} ಫರ್ಲಾಂಗ್|#{n} ಫರ್ಲಾಂಗ್ಸ್",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} ವಾತಾವರಣ",
             "bar": "one#{n} ಬಾರ್‌|#{n} ಬಾರ್‌ಗಳು",
             "barrel": "#{n} bbl",
+            "beaufort": "#ಬಿ {n}",
             "bit": "one#{n} ಬಿಟ್|#{n} ಬಿ.",
             "bit-per-second": "#{n} ಬಿ./ಸೆ",
             "british-thermal-unit": "#{n} ಬ್ರಿಉಘ",
@@ -225,7 +227,7 @@
             "byte-per-second": "#{n} ಬೈ./ಸೆ",
             "calorie": "#{n} ಕ್ಯಾಲೊ",
             "candela": "#{n} ಕ್ಯಾಂ",
-            "carat": "#{n} CD",
+            "carat": "#{n} ಸಿಡಿ",
             "celsius": "#{n}°ಸೆ",
             "centiliter": "#{n} ಸೆಂ.ಲೀ",
             "centimeter": "#{n} ಸೆಮೀ",
@@ -248,9 +250,9 @@
             "degree": "#{n} ಡಿ.",
             "dessert-spoon": "#{n} ಡೆ.ಸ್ಪೂ",
             "dessert-spoon-imperial": "#{n} ಡೆ.ಸ್ಪೂ.ಇಂಪಿ",
-            "dot": "#{n} ಪಿಕ್ಸೆ",
-            "dot-per-centimeter": "one#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|#{n} dpi",
+            "dot": "one#{n} ಡಾಟ್|#{n} ಡಾಟ್‌ಗಳು",
+            "dot-per-centimeter": "#{n} ಡಿಪಿಸಿಎಂ",
+            "dot-per-inch": "#{n} ಡಿಪಿಐ",
             "dram": "one#{n} ಡ್ರಾಮ್ ಫ್ಲೂ|#{n} ಡ್ರಾಮ್.ಫ್ಲೂ",
             "drop": "#{n} ಡ್ರಾಪ್",
             "dunam": "#{n} ಡುನಮ್",
@@ -262,7 +264,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} ಫ್ಲೂ.ಔ",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} ಕ್ಯಾ",
+            "foodcalorie": "#{n} ಕ್ಯಾಲೊ",
             "foot": "#{n} ಅ",
             "foot-per-second": "#{n} ಅ/ಸೆ",
             "furlong": "#{n} ಫರ್",
diff --git a/js/data/locale/ko/CN/ctrynames.json b/js/data/locale/ko/CN/ctrynames.json
new file mode 100644
index 0000000000..bcd2ab7a62
--- /dev/null
+++ b/js/data/locale/ko/CN/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "가나": "GH",
+    "가봉": "GA",
+    "가이아나": "GY",
+    "감비아": "GM",
+    "건지": "GG",
+    "과들루프": "GP",
+    "과테말라": "GT",
+    "괌": "GU",
+    "국제연합": "UN",
+    "그레나다": "GD",
+    "그리스": "GR",
+    "그린란드": "GL",
+    "기니": "GN",
+    "기니비사우": "GW",
+    "나미비아": "NA",
+    "나우루": "NR",
+    "나이지리아": "NG",
+    "남극 대륙": "AQ",
+    "남부 아프리카": "018",
+    "남수단": "SS",
+    "남아메리카": "005",
+    "남아시아": "034",
+    "남아프리카": "ZA",
+    "남유럽": "039",
+    "네덜란드": "NL",
+    "네덜란드령 카리브": "BQ",
+    "네팔": "NP",
+    "노르웨이": "NO",
+    "노퍽섬": "NF",
+    "뉴질랜드": "NZ",
+    "뉴칼레도니아": "NC",
+    "니우에": "NU",
+    "니제르": "NE",
+    "니카라과": "NI",
+    "대만": "TW",
+    "대한민국": "KR",
+    "덴마크": "DK",
+    "도미니카": "DM",
+    "도미니카 공화국": "DO",
+    "독일": "DE",
+    "동남아시아": "035",
+    "동부 아프리카": "014",
+    "동아시아": "030",
+    "동유럽": "151",
+    "동티모르": "TL",
+    "디에고 가르시아": "DG",
+    "라오스": "LA",
+    "라이베리아": "LR",
+    "라트비아": "LV",
+    "라틴 아메리카": "419",
+    "러시아": "RU",
+    "레바논": "LB",
+    "레소토": "LS",
+    "레위니옹": "RE",
+    "루마니아": "RO",
+    "룩셈부르크": "LU",
+    "르완다": "RW",
+    "리비아": "LY",
+    "리투아니아": "LT",
+    "리히텐슈타인": "LI",
+    "마다가스카르": "MG",
+    "마르티니크": "MQ",
+    "마셜 제도": "MH",
+    "마요트": "YT",
+    "마카오(중국 특별행정구)": "MO",
+    "말라위": "MW",
+    "말레이시아": "MY",
+    "말리": "ML",
+    "맨섬": "IM",
+    "멕시코": "MX",
+    "멜라네시아": "054",
+    "모나코": "MC",
+    "모로코": "MA",
+    "모리셔스": "MU",
+    "모리타니": "MR",
+    "모잠비크": "MZ",
+    "몬테네그로": "ME",
+    "몬트세라트": "MS",
+    "몰도바": "MD",
+    "몰디브": "MV",
+    "몰타": "MT",
+    "몽골": "MN",
+    "미국": "US",
+    "미국령 버진아일랜드": "VI",
+    "미국령 해외 제도": "UM",
+    "미얀마": "MM",
+    "미크로네시아": "FM",
+    "미크로네시아 지역": "057",
+    "바누아투": "VU",
+    "바레인": "BH",
+    "바베이도스": "BB",
+    "바티칸 시국": "VA",
+    "바하마": "BS",
+    "방글라데시": "BD",
+    "버뮤다": "BM",
+    "베냉": "BJ",
+    "베네수엘라": "VE",
+    "베트남": "VN",
+    "벨기에": "BE",
+    "벨라루스": "BY",
+    "벨리즈": "BZ",
+    "보스니아 헤르체고비나": "BA",
+    "보츠와나": "BW",
+    "볼리비아": "BO",
+    "부룬디": "BI",
+    "부르키나파소": "BF",
+    "부베섬": "BV",
+    "부탄": "BT",
+    "북마리아나제도": "MP",
+    "북마케도니아": "MK",
+    "북부 아메리카": "021",
+    "북부 아프리카": "015",
+    "북아메리카": "003",
+    "북유럽": "154",
+    "북한": "KP",
+    "불가리아": "BG",
+    "브라질": "BR",
+    "브루나이": "BN",
+    "사모아": "WS",
+    "사우디아라비아": "SA",
+    "사우스조지아 사우스샌드위치 제도": "GS",
+    "사하라 사막 이남 아프리카": "202",
+    "산마리노": "SM",
+    "상투메 프린시페": "ST",
+    "생마르탱": "MF",
+    "생바르텔레미": "BL",
+    "생피에르 미클롱": "PM",
+    "서부 아프리카": "011",
+    "서사하라": "EH",
+    "서아시아": "145",
+    "서유럽": "155",
+    "세계": "001",
+    "세네갈": "SN",
+    "세르비아": "RS",
+    "세우타 및 멜리야": "EA",
+    "세이셸": "SC",
+    "세인트루시아": "LC",
+    "세인트빈센트그레나딘": "VC",
+    "세인트키츠 네비스": "KN",
+    "세인트헬레나": "SH",
+    "소말리아": "SO",
+    "솔로몬 제도": "SB",
+    "수단": "SD",
+    "수리남": "SR",
+    "스리랑카": "LK",
+    "스발바르제도-얀마웬섬": "SJ",
+    "스웨덴": "SE",
+    "스위스": "CH",
+    "스페인": "ES",
+    "슬로바키아": "SK",
+    "슬로베니아": "SI",
+    "시리아": "SY",
+    "시에라리온": "SL",
+    "신트마르턴": "SX",
+    "싱가포르": "SG",
+    "아랍에미리트": "AE",
+    "아루바": "AW",
+    "아르메니아": "AM",
+    "아르헨티나": "AR",
+    "아메리카 대륙": "019",
+    "아메리칸 사모아": "AS",
+    "아시아": "142",
+    "아이슬란드": "IS",
+    "아이티": "HT",
+    "아일랜드": "IE",
+    "아제르바이잔": "AZ",
+    "아프가니스탄": "AF",
+    "아프리카": "002",
+    "안도라": "AD",
+    "알려지지 않은 지역": "ZZ",
+    "알바니아": "AL",
+    "알제리": "DZ",
+    "앙골라": "AO",
+    "앤티가 바부다": "AG",
+    "앵귈라": "AI",
+    "어센션섬": "AC",
+    "에리트리아": "ER",
+    "에스와티니": "SZ",
+    "에스토니아": "EE",
+    "에콰도르": "EC",
+    "에티오피아": "ET",
+    "엘살바도르": "SV",
+    "영국": "GB",
+    "영국령 버진아일랜드": "VG",
+    "영국령 인도양 지역": "IO",
+    "예멘": "YE",
+    "오만": "OM",
+    "오세아니아": "009",
+    "오세아니아 외곽": "QO",
+    "오스트랄라시아": "053",
+    "오스트레일리아": "AU",
+    "오스트리아": "AT",
+    "온두라스": "HN",
+    "올란드 제도": "AX",
+    "왈리스-푸투나 제도": "WF",
+    "요르단": "JO",
+    "우간다": "UG",
+    "우루과이": "UY",
+    "우즈베키스탄": "UZ",
+    "우크라이나": "UA",
+    "유럽": "150",
+    "유럽 연합": "EU",
+    "유로존": "EZ",
+    "유사 양방향": "XB",
+    "유사 억양": "XA",
+    "이라크": "IQ",
+    "이란": "IR",
+    "이스라엘": "IL",
+    "이집트": "EG",
+    "이탈리아": "IT",
+    "인도": "IN",
+    "인도네시아": "ID",
+    "일본": "JP",
+    "자메이카": "JM",
+    "잠비아": "ZM",
+    "저지": "JE",
+    "적도 기니": "GQ",
+    "조지아": "GE",
+    "중국": "CN",
+    "중부 아프리카": "017",
+    "중앙 아메리카": "013",
+    "중앙 아시아": "143",
+    "중앙 아프리카 공화국": "CF",
+    "지부티": "DJ",
+    "지브롤터": "GI",
+    "짐바브웨": "ZW",
+    "차드": "TD",
+    "체코": "CZ",
+    "칠레": "CL",
+    "카나리아 제도": "IC",
+    "카리브 제도": "029",
+    "카메룬": "CM",
+    "카보베르데": "CV",
+    "카자흐스탄": "KZ",
+    "카타르": "QA",
+    "캄보디아": "KH",
+    "캐나다": "CA",
+    "케냐": "KE",
+    "케이맨 제도": "KY",
+    "코모로": "KM",
+    "코소보": "XK",
+    "코스타리카": "CR",
+    "코코스 제도": "CC",
+    "코트디부아르": "CI",
+    "콜롬비아": "CO",
+    "콩고-브라자빌": "CG",
+    "콩고-킨샤사": "CD",
+    "쿠바": "CU",
+    "쿠웨이트": "KW",
+    "쿡 제도": "CK",
+    "퀴라소": "CW",
+    "크로아티아": "HR",
+    "크리스마스섬": "CX",
+    "클리퍼턴섬": "CP",
+    "키르기스스탄": "KG",
+    "키리바시": "KI",
+    "키프로스": "CY",
+    "타지키스탄": "TJ",
+    "탄자니아": "TZ",
+    "태국": "TH",
+    "터크스 케이커스 제도": "TC",
+    "토고": "TG",
+    "토켈라우": "TK",
+    "통가": "TO",
+    "투르크메니스탄": "TM",
+    "투발루": "TV",
+    "튀니지": "TN",
+    "튀르키예": "TR",
+    "트리니다드 토바고": "TT",
+    "트리스탄다쿠나": "TA",
+    "파나마": "PA",
+    "파라과이": "PY",
+    "파키스탄": "PK",
+    "파푸아뉴기니": "PG",
+    "팔라우": "PW",
+    "팔레스타인 지구": "PS",
+    "페로 제도": "FO",
+    "페루": "PE",
+    "포르투갈": "PT",
+    "포클랜드 제도": "FK",
+    "폴란드": "PL",
+    "폴리네시아": "061",
+    "푸에르토리코": "PR",
+    "프랑스": "FR",
+    "프랑스령 기아나": "GF",
+    "프랑스령 남방 지역": "TF",
+    "프랑스령 폴리네시아": "PF",
+    "피지": "FJ",
+    "핀란드": "FI",
+    "필리핀": "PH",
+    "핏케언 제도": "PN",
+    "허드 맥도널드 제도": "HM",
+    "헝가리": "HU",
+    "홍콩(중국 특별행정구)": "HK",
+    "Sark": "CQ"
+}
\ No newline at end of file
diff --git a/js/data/locale/ko/CN/ctryreverse.json b/js/data/locale/ko/CN/ctryreverse.json
new file mode 100644
index 0000000000..e0d1bdff9e
--- /dev/null
+++ b/js/data/locale/ko/CN/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "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": "서유럽",
+    "202": "사하라 사막 이남 아프리카",
+    "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": "클리퍼턴섬",
+    "CQ": "Sark",
+    "CR": "코스타리카",
+    "CU": "쿠바",
+    "CV": "카보베르데",
+    "CW": "퀴라소",
+    "CX": "크리스마스섬",
+    "CY": "키프로스",
+    "CZ": "체코",
+    "DE": "독일",
+    "DG": "디에고 가르시아",
+    "DJ": "지부티",
+    "DK": "덴마크",
+    "DM": "도미니카",
+    "DO": "도미니카 공화국",
+    "DZ": "알제리",
+    "EA": "세우타 및 멜리야",
+    "EC": "에콰도르",
+    "EE": "에스토니아",
+    "EG": "이집트",
+    "EH": "서사하라",
+    "ER": "에리트리아",
+    "ES": "스페인",
+    "ET": "에티오피아",
+    "EU": "유럽 연합",
+    "EZ": "유로존",
+    "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": "미국령 해외 제도",
+    "UN": "국제연합",
+    "US": "미국",
+    "UY": "우루과이",
+    "UZ": "우즈베키스탄",
+    "VA": "바티칸 시국",
+    "VC": "세인트빈센트그레나딘",
+    "VE": "베네수엘라",
+    "VG": "영국령 버진아일랜드",
+    "VI": "미국령 버진아일랜드",
+    "VN": "베트남",
+    "VU": "바누아투",
+    "WF": "왈리스-푸투나 제도",
+    "WS": "사모아",
+    "XA": "유사 억양",
+    "XB": "유사 양방향",
+    "XK": "코소보",
+    "YE": "예멘",
+    "YT": "마요트",
+    "ZA": "남아프리카",
+    "ZM": "잠비아",
+    "ZW": "짐바브웨",
+    "ZZ": "알려지지 않은 지역"
+}
\ No newline at end of file
diff --git a/js/data/locale/ko/CN/dateformats.json b/js/data/locale/ko/CN/dateformats.json
new file mode 100644
index 0000000000..cb8828fab4
--- /dev/null
+++ b/js/data/locale/ko/CN/dateformats.json
@@ -0,0 +1,28 @@
+{
+    "gregorian": {
+        "time": {
+            "12": {
+                "ahmsz": "z a h:mm:ss",
+                "ahmz": "z a h:mm",
+                "hmsz": "z h:mm:ss",
+                "hmz": "z h:mm",
+                "m": "mm",
+                "s": "ss"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "z HH:mm:ss",
+                "ahmz": "z HH:mm",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "z HH:mm:ss",
+                "hmz": "z HH:mm",
+                "m": "mm",
+                "s": "ss"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/ko/KP/ctrynames.json b/js/data/locale/ko/KP/ctrynames.json
index 08bad14d50..db564769f2 100644
--- a/js/data/locale/ko/KP/ctrynames.json
+++ b/js/data/locale/ko/KP/ctrynames.json
@@ -182,7 +182,7 @@
     "엘살바도르": "SV",
     "영국": "GB",
     "영국령 버진아일랜드": "VG",
-    "영국령 인도양 식민지": "IO",
+    "영국령 인도양 지역": "IO",
     "예멘": "YE",
     "오만": "OM",
     "오세아니아": "009",
diff --git a/js/data/locale/ko/KP/ctryreverse.json b/js/data/locale/ko/KP/ctryreverse.json
index 1d8c47e12d..a69c09c7d5 100644
--- a/js/data/locale/ko/KP/ctryreverse.json
+++ b/js/data/locale/ko/KP/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "이스라엘",
     "IM": "맨섬",
     "IN": "인도",
-    "IO": "영국령 인도양 식민지",
+    "IO": "영국령 인도양 지역",
     "IQ": "이라크",
     "IR": "이란",
     "IS": "아이슬란드",
diff --git a/js/data/locale/ko/ctrynames.json b/js/data/locale/ko/ctrynames.json
index 2ea1912966..bcd2ab7a62 100644
--- a/js/data/locale/ko/ctrynames.json
+++ b/js/data/locale/ko/ctrynames.json
@@ -183,7 +183,7 @@
     "엘살바도르": "SV",
     "영국": "GB",
     "영국령 버진아일랜드": "VG",
-    "영국령 인도양 식민지": "IO",
+    "영국령 인도양 지역": "IO",
     "예멘": "YE",
     "오만": "OM",
     "오세아니아": "009",
diff --git a/js/data/locale/ko/ctryreverse.json b/js/data/locale/ko/ctryreverse.json
index 5283c639d3..e0d1bdff9e 100644
--- a/js/data/locale/ko/ctryreverse.json
+++ b/js/data/locale/ko/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "이스라엘",
     "IM": "맨섬",
     "IN": "인도",
-    "IO": "영국령 인도양 식민지",
+    "IO": "영국령 인도양 지역",
     "IQ": "이라크",
     "IR": "이란",
     "IS": "아이슬란드",
diff --git a/js/data/locale/ko/dateformats.json b/js/data/locale/ko/dateformats.json
index bcd1e67941..45a0ee65a3 100644
--- a/js/data/locale/ko/dateformats.json
+++ b/js/data/locale/ko/dateformats.json
@@ -50,26 +50,26 @@
                 "s": "d"
             },
             "dm": {
-                "f": "M월 d일",
-                "l": "M월 d일",
+                "f": "MMMM d일",
+                "l": "MMMM d일",
                 "m": "M. d.",
                 "s": "M. d."
             },
             "dmw": {
-                "f": "M월 d일 EEEE",
-                "l": "M월 d일 EEE",
+                "f": "MMMM d일 EEEE",
+                "l": "MMMM d일 EEE",
                 "m": "M. d. EE",
                 "s": "M. d. E"
             },
             "dmwy": {
-                "f": "yyyy년 M월 d일 EEEE",
-                "l": "yyyy년 M월 d일 EEE",
+                "f": "yyyy년 MMMM d일 EEEE",
+                "l": "yyyy년 MMMM d일 EEE",
                 "m": "yyyy. M. d. EE",
                 "s": "yy. M. d. E"
             },
             "dmy": {
-                "f": "yyyy년 M월 d일",
-                "l": "yyyy년 M월 d일",
+                "f": "yyyy년 MMMM d일",
+                "l": "yyyy년 MMMM d일",
                 "m": "yyyy. M. d.",
                 "s": "yy. M. d."
             },
@@ -80,19 +80,18 @@
                 "s": "d. E"
             },
             "l": {
-                "f": "M월",
-                "l": "M월",
+                "f": "MMMM",
+                "l": "MMMM",
                 "m": "M월",
                 "s": "M월"
             },
             "m": {
-                "f": "M",
-                "l": "M",
+                "l": "MMMM",
                 "m": "M"
             },
             "my": {
-                "f": "yyyy년 M월",
-                "l": "yyyy년 M월",
+                "f": "yyyy년 MMMM",
+                "l": "yyyy년 MMMM",
                 "m": "yyyy. M.",
                 "s": "yy. M."
             },
@@ -105,50 +104,50 @@
         },
         "range": {
             "c00": {
-                "f": "{sy}년 {sm}월 {sd}일 {st} – {et}",
-                "l": "{sy}년 {sm}월 {sd}일 {st} – {et}",
+                "f": "{sy}년 {sm} {sd}일 {st} – {et}",
+                "l": "{sy}년 {sm} {sd}일 {st} – {et}",
                 "m": "{sy}. {sm}. {sd}. {st} – {et}",
                 "s": "{sy}. {sm}. {sd}. {st} – {et}"
             },
             "c01": {
-                "f": "{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}",
-                "l": "{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}",
+                "f": "{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}",
+                "l": "{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}",
                 "m": "{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}",
                 "s": "{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}"
             },
             "c02": {
-                "f": "{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}",
-                "l": "{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}",
+                "f": "{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}",
+                "l": "{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}",
                 "m": "{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}",
                 "s": "{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}"
             },
             "c03": {
-                "f": "{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}",
-                "l": "{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}",
+                "f": "{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}",
+                "l": "{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}",
                 "m": "{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}",
                 "s": "{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}"
             },
             "c10": {
-                "f": "{sy}년 {sm}월 {sd}일 – {ed}일",
-                "l": "{sy}년 {sm}월 {sd}일 – {ed}일",
+                "f": "{sy}년 {sm} {sd}일 – {ed}일",
+                "l": "{sy}년 {sm} {sd}일 – {ed}일",
                 "m": "{sy}. {sm}. {sd}. – {ed}",
                 "s": "{sy}. {sm}. {sd}. – {ed}"
             },
             "c11": {
-                "f": "{sy}년 {sm}월 {sd}일 – {em}월 {ed}일",
-                "l": "{sy}년 {sm}월 {sd}일 – {em}월 {ed}일",
+                "f": "{sy}년 {sm} {sd}일 – {em} {ed}일",
+                "l": "{sy}년 {sm} {sd}일 – {em} {ed}일",
                 "m": "{sy}. {sm}. {sd}. – {ey}. {em}. {ed}.",
                 "s": "{sy}. {sm}. {sd}. – {ey}. {em}. {ed}."
             },
             "c12": {
-                "f": "{sy}년 {sm}월 {sd}일 – {ey}년 {em}월 {ed}일",
-                "l": "{sy}년 {sm}월 {sd}일 – {ey}년 {em}월 {ed}일",
+                "f": "{sy}년 {sm} {sd}일 – {ey}년 {em} {ed}일",
+                "l": "{sy}년 {sm} {sd}일 – {ey}년 {em} {ed}일",
                 "m": "{sy}. {sm}. {sd}. – {ey}. {em}. {ed}.",
                 "s": "{sy}. {sm}. {sd}. – {ey}. {em}. {ed}."
             },
             "c20": {
-                "f": "{sy}년 {sm}월 – {ey}년 {em}월",
-                "l": "{sy}년 {sm}월 – {ey}년 {em}월",
+                "f": "{sy}년 {sm} – {ey}년 {em}",
+                "l": "{sy}년 {sm} – {ey}년 {em}",
                 "m": "{sy}. {sm}. – {ey}. {em}.",
                 "s": "{sy}. {sm}. – {ey}. {em}."
             },
diff --git a/js/data/locale/ko/sysres.json b/js/data/locale/ko/sysres.json
index d7a7401140..f594ca66f4 100644
--- a/js/data/locale/ko/sysres.json
+++ b/js/data/locale/ko/sysres.json
@@ -102,54 +102,54 @@
     "EEEE4": "목요일",
     "EEEE5": "금요일",
     "EEEE6": "토요일",
-    "MMM1": "1",
-    "MMM10": "10",
-    "MMM11": "11",
-    "MMM12": "12",
-    "MMM2": "2",
-    "MMM3": "3",
-    "MMM4": "4",
-    "MMM5": "5",
-    "MMM6": "6",
-    "MMM7": "7",
-    "MMM8": "8",
-    "MMM9": "9",
-    "MMMM1": "1",
-    "MMMM10": "10",
-    "MMMM11": "11",
-    "MMMM12": "12",
-    "MMMM2": "2",
-    "MMMM3": "3",
-    "MMMM4": "4",
-    "MMMM5": "5",
-    "MMMM6": "6",
-    "MMMM7": "7",
-    "MMMM8": "8",
-    "MMMM9": "9",
-    "N1": "1",
-    "N10": "10",
-    "N11": "11",
-    "N12": "12",
-    "N2": "2",
-    "N3": "3",
-    "N4": "4",
-    "N5": "5",
-    "N6": "6",
-    "N7": "7",
-    "N8": "8",
-    "N9": "9",
-    "NN1": "1",
-    "NN10": "10",
-    "NN11": "11",
-    "NN12": "12",
-    "NN2": "2",
-    "NN3": "3",
-    "NN4": "4",
-    "NN5": "5",
-    "NN6": "6",
-    "NN7": "7",
-    "NN8": "8",
-    "NN9": "9",
+    "MMM1": "1월",
+    "MMM10": "10월",
+    "MMM11": "11월",
+    "MMM12": "12월",
+    "MMM2": "2월",
+    "MMM3": "3월",
+    "MMM4": "4월",
+    "MMM5": "5월",
+    "MMM6": "6월",
+    "MMM7": "7월",
+    "MMM8": "8월",
+    "MMM9": "9월",
+    "MMMM1": "1월",
+    "MMMM10": "10월",
+    "MMMM11": "11월",
+    "MMMM12": "12월",
+    "MMMM2": "2월",
+    "MMMM3": "3월",
+    "MMMM4": "4월",
+    "MMMM5": "5월",
+    "MMMM6": "6월",
+    "MMMM7": "7월",
+    "MMMM8": "8월",
+    "MMMM9": "9월",
+    "N1": "1월",
+    "N10": "10월",
+    "N11": "11월",
+    "N12": "12월",
+    "N2": "2월",
+    "N3": "3월",
+    "N4": "4월",
+    "N5": "5월",
+    "N6": "6월",
+    "N7": "7월",
+    "N8": "8월",
+    "N9": "9월",
+    "NN1": "1월",
+    "NN10": "10월",
+    "NN11": "11월",
+    "NN12": "12월",
+    "NN2": "2월",
+    "NN3": "3월",
+    "NN4": "4월",
+    "NN5": "5월",
+    "NN6": "6월",
+    "NN7": "7월",
+    "NN8": "8월",
+    "NN9": "9월",
     "a0": "오전",
     "a1": "오후",
     "durationLongDays": "#{num}일",
diff --git a/js/data/locale/ko/unitfmt.json b/js/data/locale/ko/unitfmt.json
index a98b9c2c89..0892d3004d 100644
--- a/js/data/locale/ko/unitfmt.json
+++ b/js/data/locale/ko/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n}atm",
             "bar": "#{n}바",
             "barrel": "#{n}배럴",
+            "beaufort": "#보퍼트 계급 {n}",
             "bit": "#{n}비트",
             "bit-per-second": "#초당 {n}비트",
             "british-thermal-unit": "#{n}영국 열량 단위",
@@ -42,9 +43,9 @@
             "degree": "#{n}도",
             "dessert-spoon": "#{n}디저트스푼",
             "dessert-spoon-imperial": "#{n}영국 디저트스푼",
-            "dot": "#{n}dot",
-            "dot-per-centimeter": "#{n}dpcm",
-            "dot-per-inch": "#{n}dpi",
+            "dot": "#{n}도트",
+            "dot-per-centimeter": "#센티미터당 {n}도트",
+            "dot-per-inch": "#인치당 {n}도트",
             "dram": "#{n}영국 액량 드램",
             "drop": "#{n}방울",
             "dunam": "#{n}두남",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n}atm",
             "bar": "#{n}bar",
             "barrel": "#{n}bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n}bit",
             "bit-per-second": "#{n}bit/s",
             "british-thermal-unit": "#{n}Btu",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n}dstspn",
             "dessert-spoon-imperial": "#{n}dstspn Imp",
-            "dot": "#{n}dot",
+            "dot": "#{n}도트",
             "dot-per-centimeter": "#{n}dpcm",
             "dot-per-inch": "#{n}dpi",
             "dram": "#{n}dram fl",
diff --git a/js/data/locale/kok/ctrynames.json b/js/data/locale/kok/ctrynames.json
index 53421c8141..322d744326 100644
--- a/js/data/locale/kok/ctrynames.json
+++ b/js/data/locale/kok/ctrynames.json
@@ -197,7 +197,7 @@
     "भारत": "IN",
     "भूतान": "BT",
     "मंगोलिया": "MN",
-    "मकाव SAR चीन": "MO",
+    "मकाव एसएआर चीन": "MO",
     "मध्य अफ्रीकी लोकसत्तकराज्य": "CF",
     "मध्य अमेरिका": "013",
     "मध्य आफ्रिका": "017",
@@ -228,7 +228,7 @@
     "यु. एस. वर्जिन आयलँड्‍स": "VI",
     "युक्रेन": "UA",
     "युगांडा": "UG",
-    "युनाइटेड अरब इमीरॅट्स": "AE",
+    "युनाइटेड अरब इमीरात": "AE",
     "युनायटेड किंगडम": "GB",
     "युनायटेड नेशन्स": "UN",
     "युनायटेड स्टेट्स": "US",
@@ -250,12 +250,13 @@
     "लॅटविया": "LV",
     "लॅटीन अमेरिका": "419",
     "लेबनान": "LB",
-    "वनातू": "VU",
+    "वनौतू": "VU",
     "वालिस आनी फ्यूचूना": "WF",
     "विनेझुएला": "VE",
     "वॅटिकन सिटी": "VA",
     "व्हिएतनाम": "VN",
     "श्री लंका": "LK",
+    "सँ. पायरे आनी मिकेलन": "PM",
     "सँट लुसिया": "LC",
     "सऊदी अरेबिया": "SA",
     "सर्बिया": "RS",
@@ -274,7 +275,6 @@
     "सॅंट मार्टिन": "MF",
     "सॅन मारीनो": "SM",
     "सेंट किट्स आनी नेविस": "KN",
-    "सेंट पिएर आनी मिकेलन": "PM",
     "सेंट विंसेंट ऐंड द ग्रेनेडाइंस": "VC",
     "सेंट हेलिना": "SH",
     "सेशेल्स": "SC",
@@ -290,7 +290,7 @@
     "स्वीडन": "SE",
     "हंगेरी": "HU",
     "हर्ड ऍंड मॅक्डोनाल्ड आयलँड्स": "HM",
-    "हाँग काँग SAR चीन": "HK",
+    "हाँग काँग एसएआर चीन": "HK",
     "हैती": "HT",
     "हॉनडुरस": "HN",
     "Sark": "CQ"
diff --git a/js/data/locale/kok/ctryreverse.json b/js/data/locale/kok/ctryreverse.json
index f1c754e8fa..3c4c6d2ccc 100644
--- a/js/data/locale/kok/ctryreverse.json
+++ b/js/data/locale/kok/ctryreverse.json
@@ -32,7 +32,7 @@
     "419": "लॅटीन अमेरिका",
     "AC": "असेंशन आयलँड",
     "AD": "अंडोरा",
-    "AE": "युनाइटेड अरब इमीरॅट्स",
+    "AE": "युनाइटेड अरब इमीरात",
     "AF": "अफगानिस्तान",
     "AG": "एँटिगुआ आनी बारबुडा",
     "AI": "अंगुला",
@@ -131,7 +131,7 @@
     "GU": "गुआम",
     "GW": "गुअनिया-बिसाउ",
     "GY": "गयाना",
-    "HK": "हाँग काँग SAR चीन",
+    "HK": "हाँग काँग एसएआर चीन",
     "HM": "हर्ड ऍंड मॅक्डोनाल्ड आयलँड्स",
     "HN": "हॉनडुरस",
     "HR": "क्रोयेशीया",
@@ -185,7 +185,7 @@
     "ML": "माली",
     "MM": "म्यानमार (बर्मा)",
     "MN": "मंगोलिया",
-    "MO": "मकाव SAR चीन",
+    "MO": "मकाव एसएआर चीन",
     "MP": "उत्तरी मरिना आयसलैण्ड",
     "MQ": "मार्टीनिक",
     "MR": "मॉरिटानिया",
@@ -217,7 +217,7 @@
     "PH": "फिलीपिन्झ",
     "PK": "पाकिस्तान",
     "PL": "पोलंड",
-    "PM": "सेंट पिएर आनी मिकेलन",
+    "PM": "सँ. पायरे आनी मिकेलन",
     "PN": "पिटकॅरन आयलँड्स",
     "PR": "प्युएर्तो रिको",
     "PS": "पेलेस्टीनियन प्रांत",
@@ -282,7 +282,7 @@
     "VG": "ब्रिटिश वर्जिन आयलँड्स",
     "VI": "यु. एस. वर्जिन आयलँड्‍स",
     "VN": "व्हिएतनाम",
-    "VU": "वनातू",
+    "VU": "वनौतू",
     "WF": "वालिस आनी फ्यूचूना",
     "WS": "सामोआ",
     "XA": "स्युडो-ऍक्सेंट",
diff --git a/js/data/locale/kok/unitfmt.json b/js/data/locale/kok/unitfmt.json
index b541fcdd22..addcc5faa9 100644
--- a/js/data/locale/kok/unitfmt.json
+++ b/js/data/locale/kok/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} अटमोसपियर",
             "bar": "#{n} पट्ट्यो",
             "barrel": "#{n} बॅरल",
+            "beaufort": "#B {n}",
             "bit": "#{n} बिट",
             "bit-per-second": "#दर सेकंद {n} बिट",
             "british-thermal-unit": "#{n} ब्रिटिश थर्मल युनिट्स",
@@ -42,7 +43,7 @@
             "degree": "#{n} अंश",
             "dessert-spoon": "#{n} डिझर्ट कुलेर",
             "dessert-spoon-imperial": "#{n} इंप. डिझर्ट कुलेर",
-            "dot": "#{n}ठिपको",
+            "dot": "#{n} ठिपके",
             "dot-per-centimeter": "#दर सेंटिमीटर ठिपके {n}",
             "dot-per-inch": "#दर इंचाक ठिपके {n}",
             "dram": "#{n} ड्रॅम",
@@ -63,7 +64,7 @@
             "g-force": "#{n} जी-फोर्स",
             "gallon": "#{n} गॅलोन",
             "gallon-imperial": "#{n} इंप. गॅलोन",
-            "generic": "#{n}°",
+            "generic": "#{n} अंश तापमान",
             "gigabit": "#{n} गिगाबिट",
             "gigabit-per-second": "#दर सेकंद {n} गिगाबिट",
             "gigabyte": "#{n} गिगाबायट",
@@ -91,7 +92,7 @@
             "kilobyte": "#{n} किलोबायट",
             "kilobyte-per-hour": "#दर वरा {n} किलोबायट",
             "kilobyte-per-second": "#दर सेकंद {n} किलोबायट",
-            "kilocalorie": "#{n} किलोकॅल",
+            "kilocalorie": "#{n} किलोकॅलरीज",
             "kilogram": "#{n} किलोग्राम",
             "kilohertz": "#{n} किलोहर्ट्झ",
             "kilojoule": "#{n} किलोज्युल",
@@ -123,7 +124,7 @@
             "meter": "#{n} मीटर",
             "meter-per-second": "#{n} मी/से",
             "meter-per-square-second": "#{n} मी/से²",
-            "microgram": "#{n} μg",
+            "microgram": "#{n} मायक्रोग्राम",
             "micrometer": "#{n} मायक्रोमीटर",
             "microsecond": "#{n} मायक्रोसेकंदांनी",
             "mile": "#{n} मायल्स",
@@ -143,7 +144,7 @@
             "millisecond": "#{n} मिलिसेकंदांनी",
             "milliwatt": "#{n} मिलिवॅट",
             "minute": "#{n} मिण्टां",
-            "mole": "#{n} मोल",
+            "mole": "#{n} मोल्स",
             "month": "#{n} म्हयने",
             "nanometer": "#{n} नॅनोमीटर",
             "nanosecond": "#{n} नॅनोसेकंदांनी",
@@ -209,13 +210,14 @@
         "short": {
             "acre": "#{n} ac",
             "acre-foot": "#{n} ac ft",
-            "ampere": "#{n} ए",
-            "arc-minute": "#{n}′",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n} आर्कमिनीट",
             "arc-second": "#{n}″",
             "astronomical-unit": "#{n} au",
             "atmosphere": "#{n} atm",
             "bar": "#{n} पट्टी",
             "barrel": "#{n} बॅरल",
+            "beaufort": "#B {n}",
             "bit": "#{n} बिट",
             "bit-per-second": "#{n} बिट/से",
             "british-thermal-unit": "#{n} Btu",
@@ -226,7 +228,7 @@
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} कॅ",
-            "celsius": "#{n} अंसे",
+            "celsius": "#{n}°C",
             "centiliter": "#{n} cL",
             "centimeter": "#{n} सेमी",
             "century": "#{n} श",
@@ -245,10 +247,10 @@
             "decade": "#{n} दशक",
             "deciliter": "#{n} dL",
             "decimeter": "#{n} डेमी",
-            "degree": "#{n}°",
+            "degree": "#{n} अंश",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} ठिपको",
+            "dot": "#{n} ठिपके",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} ड्रॅम फ्लु",
@@ -258,7 +260,7 @@
             "earth-radius": "#{n} R⊕",
             "electronvolt": "#{n} eV",
             "em": "#{n} em",
-            "fahrenheit": "#{n}°फा",
+            "fahrenheit": "#{n}°F",
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
@@ -283,15 +285,15 @@
             "hectoliter": "#{n} hL",
             "hectopascal": "#{n} hPa",
             "hertz": "#{n} Hz",
-            "horsepower": "#{n} हॉर्सपावर",
+            "horsepower": "#{n} hp",
             "hour": "#{n} वर",
             "inch": "#{n} in",
             "inch-ofhg": "#{n} inHg",
             "item": "#{n} वस्त",
             "jigger": "#{n} जिगर",
-            "joule": "#{n} ज्यु",
+            "joule": "#{n} J",
             "karat": "#{n} kt",
-            "kelvin": "#{n} के",
+            "kelvin": "#{n} K",
             "kilobit": "#{n} kb",
             "kilobit-per-second": "#{n} kb/से",
             "kilobyte": "#{n} kB",
@@ -300,20 +302,20 @@
             "kilocalorie": "#{n} kcal",
             "kilogram": "#{n} किग्रा",
             "kilohertz": "#{n} kHz",
-            "kilojoule": "#{n} किलोज्युल",
+            "kilojoule": "#{n} kJ",
             "kilometer": "#{n} किमी",
             "kilometer-per-hour": "#{n} किमी/व",
             "kilometer-per-liter": "#{n} किमी/लि",
             "kilometer-per-second": "#{n} किमी/से",
             "kilopascal": "#{n} kPa",
-            "kilowatt": "#{n} किवॅ",
-            "kilowatt-hour": "#{n}किवॅटवर",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
             "kilowatt-hour-per-100-kilometer": "#{n} किवॉवर/१००किमी",
             "knot": "#{n} kn",
             "light-year": "#{n} ly",
             "liter": "#{n} लि",
             "liter-per-100-kilometer": "#{n} लि/100किमी",
-            "liter-per-kilometer": "#{n} लि/किमी",
+            "liter-per-kilometer": "#{n} L/km",
             "lumen": "#{n} lm",
             "lux": "#{n} lx",
             "megabit": "#{n} Mb",
@@ -325,7 +327,7 @@
             "megaliter": "#{n} ML",
             "megapascal": "#{n} MPa",
             "megapixel": "#{n} MP",
-            "megawatt": "#{n} मेवॅ",
+            "megawatt": "#{n} MW",
             "meter": "#{n} मी",
             "meter-per-second": "#{n} मी/से",
             "meter-per-square-second": "#{n} मी/से²",
@@ -341,11 +343,11 @@
             "milliampere": "#{n} mA",
             "millibar": "#{n} mbar",
             "milligram": "#{n} मिग्रा",
-            "milligram-ofglucose-per-deciliter": "#{n} मिग्रा/डेलि",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
             "milliliter": "#{n} मिलि",
             "millimeter": "#{n} मिमी",
             "millimeter-ofhg": "#{n} mm Hg",
-            "millimole-per-liter": "#{n} मिमो/लि",
+            "millimole-per-liter": "#{n} mmol/L",
             "millisecond": "#{n} मिलिसेकंद",
             "milliwatt": "#{n} mW",
             "minute": "#{n} मिनीट",
@@ -357,7 +359,7 @@
             "newton": "#{n} न्यु",
             "newton-meter": "#{n} N⋅m",
             "ohm": "#{n} Ω",
-            "ounce": "#{n} oz",
+            "ounce": "#{n} औंस",
             "ounce-troy": "#{n} oz t",
             "parsec": "#{n} pc",
             "pascal": "#{n} Pa",
@@ -406,8 +408,8 @@
             "therm-us": "#{n} युएस थर्म्स",
             "ton": "#{n} टन",
             "tonne": "#{n} t",
-            "volt": "#{n} वो",
-            "watt": "#{n} वॅ",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
             "week": "#{n} सप्तक",
             "yard": "#{n} yd",
             "year": "#{n} वर्सां"
diff --git a/js/data/locale/kpe/unitfmt.json b/js/data/locale/kpe/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kpe/unitfmt.json
+++ b/js/data/locale/kpe/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ks/Arab/ctrynames.json b/js/data/locale/ks/Arab/ctrynames.json
index 9522fc95aa..0e965683ef 100644
--- a/js/data/locale/ks/Arab/ctrynames.json
+++ b/js/data/locale/ks/Arab/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "آذربائیجان": "AZ",
     "آسٹریا": "AT",
@@ -44,7 +45,6 @@
     "بحریٖن": "BH",
     "برازِل": "BR",
     "بَرطانوی ؤرجِن جٔزیٖرٕ": "VG",
-    "برطانوی بحرِ ہِندۍ علاقہٕ": "IO",
     "بُرکِنا فیسو": "BF",
     "برمودا": "BM",
     "برونے": "BN",
diff --git a/js/data/locale/ks/Arab/ctryreverse.json b/js/data/locale/ks/Arab/ctryreverse.json
index 596a0d79ec..9a1c363adb 100644
--- a/js/data/locale/ks/Arab/ctryreverse.json
+++ b/js/data/locale/ks/Arab/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "اسرا ییل",
     "IM": "آیِل آف مین",
     "IN": "ہِندوستان",
-    "IO": "برطانوی بحرِ ہِندۍ علاقہٕ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ایٖراق",
     "IR": "ایٖران",
     "IS": "اَیِسلینڑ",
diff --git a/js/data/locale/ks/Arab/dateformats.json b/js/data/locale/ks/Arab/dateformats.json
index c0ca7f7543..5fd878107e 100644
--- a/js/data/locale/ks/Arab/dateformats.json
+++ b/js/data/locale/ks/Arab/dateformats.json
@@ -16,12 +16,6 @@
                 "m": "cc",
                 "s": "c"
             },
-            "l": {
-                "f": "LLLL",
-                "l": "LLLL",
-                "m": "LLL",
-                "s": "L"
-            },
             "my": {
                 "s": "M/yy"
             }
diff --git a/js/data/locale/ks/Arab/sysres.json b/js/data/locale/ks/Arab/sysres.json
index 1354252c4c..ba14b136b5 100644
--- a/js/data/locale/ks/Arab/sysres.json
+++ b/js/data/locale/ks/Arab/sysres.json
@@ -41,54 +41,6 @@
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 year|#in {num} years": "#+{num} y",
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "L1": "ج",
-    "L10": "س",
-    "L11": "ا",
-    "L12": "ن",
-    "L2": "ف",
-    "L3": "م",
-    "L4": "ا",
-    "L5": "م",
-    "L6": "ج",
-    "L7": "ج",
-    "L8": "ا",
-    "L9": "س",
-    "LL1": "جن",
-    "LL10": "اک",
-    "LL11": "نو",
-    "LL12": "دس",
-    "LL2": "فر",
-    "LL3": "ما",
-    "LL4": "اپ",
-    "LL5": "مئ",
-    "LL6": "جو",
-    "LL7": "جو",
-    "LL8": "اگ",
-    "LL9": "ست",
-    "LLL1": "جنؤری",
-    "LLL10": "اکتوٗبر",
-    "LLL11": "نومبر",
-    "LLL12": "دسمبر",
-    "LLL2": "فرؤری",
-    "LLL3": "مارٕچ",
-    "LLL4": "اپریل",
-    "LLL5": "مئی",
-    "LLL6": "جوٗن",
-    "LLL7": "جوٗلایی",
-    "LLL8": "اگست",
-    "LLL9": "ستمبر",
-    "LLLL1": "جنؤری",
-    "LLLL10": "اکتوٗبر",
-    "LLLL11": "نومبر",
-    "LLLL12": "دسمبر",
-    "LLLL2": "فرؤری",
-    "LLLL3": "مارٕچ",
-    "LLLL4": "اپریل",
-    "LLLL5": "مئی",
-    "LLLL6": "جوٗن",
-    "LLLL7": "جوٗلایی",
-    "LLLL8": "اگست",
-    "LLLL9": "ستمبر",
     "c0": "ا",
     "c1": "ژ",
     "c2": "ب",
diff --git a/js/data/locale/ks/Deva/ctrynames.json b/js/data/locale/ks/Deva/ctrynames.json
index 474720c51c..14332b458e 100644
--- a/js/data/locale/ks/Deva/ctrynames.json
+++ b/js/data/locale/ks/Deva/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "آذربائیجان": "AZ",
     "آسٹریا": "AT",
@@ -42,7 +43,6 @@
     "باربیڈوس": "BB",
     "بحریٖن": "BH",
     "بَرطانوی ؤرجِن جٔزیٖرٕ": "VG",
-    "برطانوی بحرِ ہِندۍ علاقہٕ": "IO",
     "بُرکِنا فیسو": "BF",
     "برمودا": "BM",
     "برونے": "BN",
diff --git a/js/data/locale/ks/Deva/ctryreverse.json b/js/data/locale/ks/Deva/ctryreverse.json
index 34edb1dcb4..d5fe64df13 100644
--- a/js/data/locale/ks/Deva/ctryreverse.json
+++ b/js/data/locale/ks/Deva/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "اسرا ییل",
     "IM": "آیِل آف مین",
     "IN": "हिंदोस्तान",
-    "IO": "برطانوی بحرِ ہِندۍ علاقہٕ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ایٖراق",
     "IR": "ایٖران",
     "IS": "اَیِسلینڑ",
diff --git a/js/data/locale/ks/Deva/dateformats.json b/js/data/locale/ks/Deva/dateformats.json
index 43b734423a..41470f2abd 100644
--- a/js/data/locale/ks/Deva/dateformats.json
+++ b/js/data/locale/ks/Deva/dateformats.json
@@ -31,12 +31,6 @@
                 "m": "cc",
                 "s": "c"
             },
-            "l": {
-                "f": "LLLL",
-                "l": "LLLL",
-                "m": "LLL",
-                "s": "L"
-            },
             "my": {
                 "f": "MMMM yyyy",
                 "l": "MMMM yyyy",
diff --git a/js/data/locale/ks/Deva/numfmt.jf b/js/data/locale/ks/Deva/numfmt.jf
index 390efb5ec5..5535d834ce 100644
--- a/js/data/locale/ks/Deva/numfmt.jf
+++ b/js/data/locale/ks/Deva/numfmt.jf
@@ -2,7 +2,8 @@
     "generated": true,
     "numfmt": {
         "currencyFormats": {
-            "commonNegative": "-{s}{n}"
+            "common": "{s} {n}",
+            "commonNegative": "-{s} {n}"
         },
         "decimalChar": ".",
         "exponential": "E",
diff --git a/js/data/locale/ks/Deva/sysres.json b/js/data/locale/ks/Deva/sysres.json
index b0eb7e12e7..3cba0ed46d 100644
--- a/js/data/locale/ks/Deva/sysres.json
+++ b/js/data/locale/ks/Deva/sysres.json
@@ -60,21 +60,21 @@
     "EE2": "बुवार",
     "EE3": "बोदवार",
     "EE4": "ब्रेसवार",
-    "EE5": "जुम्मा",
+    "EE5": "जुमा",
     "EE6": "बटवार",
     "EEE0": "आथवार",
     "EEE1": "चंदिरवार",
     "EEE2": "बुवार",
     "EEE3": "बोदवार",
     "EEE4": "ब्रेसवार",
-    "EEE5": "जुम्मा",
+    "EEE5": "जुमा",
     "EEE6": "बटवार",
     "EEEE0": "आथवार",
-    "EEEE1": "चंदिरवार",
-    "EEEE2": "बुवार",
+    "EEEE1": "च़ंदिरवार",
+    "EEEE2": "बोमवार",
     "EEEE3": "बोदवार",
     "EEEE4": "ब्रेसवार",
-    "EEEE5": "जुम्मा",
+    "EEEE5": "जुमा",
     "EEEE6": "बटवार",
     "G-1": "BC",
     "G1": "AD",
@@ -127,7 +127,7 @@
     "LLLL8": "अगस्त",
     "LLLL9": "सतुंबर",
     "MMM1": "जनवरी",
-    "MMM10": "अकतुम्बर",
+    "MMM10": "अक्तूबर",
     "MMM11": "नवूमबर",
     "MMM12": "दसूमबर",
     "MMM2": "फ़रवरी",
@@ -139,9 +139,9 @@
     "MMM8": "अगस्त",
     "MMM9": "सतुंबर",
     "MMMM1": "जनवरी",
-    "MMMM10": "अकतुम्बर",
-    "MMMM11": "नवूमबर",
-    "MMMM12": "दसूमबर",
+    "MMMM10": "अक्तूबर",
+    "MMMM11": "नवमबर",
+    "MMMM12": "दसमबर",
     "MMMM2": "फ़रवरी",
     "MMMM3": "मार्च",
     "MMMM4": "अप्रैल",
@@ -149,7 +149,7 @@
     "MMMM6": "जून",
     "MMMM7": "जुलाई",
     "MMMM8": "अगस्त",
-    "MMMM9": "सतुंबर",
+    "MMMM9": "सतमबर",
     "N1": "ज",
     "N10": "अ",
     "N11": "न",
@@ -188,7 +188,7 @@
     "cc2": "बुवार",
     "cc3": "बोदवार",
     "cc4": "ब्रेसवार",
-    "cc5": "जुम्मा",
+    "cc5": "जुमा",
     "cc6": "बटवार",
     "ccc0": "आथवार",
     "ccc1": "चंदिरवार",
diff --git a/js/data/locale/ks/Deva/unitfmt.json b/js/data/locale/ks/Deva/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ks/Deva/unitfmt.json
+++ b/js/data/locale/ks/Deva/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ks/ctrynames.json b/js/data/locale/ks/ctrynames.json
index 9522fc95aa..0e965683ef 100644
--- a/js/data/locale/ks/ctrynames.json
+++ b/js/data/locale/ks/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "آذربائیجان": "AZ",
     "آسٹریا": "AT",
@@ -44,7 +45,6 @@
     "بحریٖن": "BH",
     "برازِل": "BR",
     "بَرطانوی ؤرجِن جٔزیٖرٕ": "VG",
-    "برطانوی بحرِ ہِندۍ علاقہٕ": "IO",
     "بُرکِنا فیسو": "BF",
     "برمودا": "BM",
     "برونے": "BN",
diff --git a/js/data/locale/ks/ctryreverse.json b/js/data/locale/ks/ctryreverse.json
index 596a0d79ec..9a1c363adb 100644
--- a/js/data/locale/ks/ctryreverse.json
+++ b/js/data/locale/ks/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "اسرا ییل",
     "IM": "آیِل آف مین",
     "IN": "ہِندوستان",
-    "IO": "برطانوی بحرِ ہِندۍ علاقہٕ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ایٖراق",
     "IR": "ایٖران",
     "IS": "اَیِسلینڑ",
diff --git a/js/data/locale/ks/dateformats.json b/js/data/locale/ks/dateformats.json
index 65e9582bf8..fc6a7ec7a6 100644
--- a/js/data/locale/ks/dateformats.json
+++ b/js/data/locale/ks/dateformats.json
@@ -37,6 +37,12 @@
                 "m": "EE, d",
                 "s": "E, d"
             },
+            "l": {
+                "f": "LLLL",
+                "l": "LLLL",
+                "m": "LLL",
+                "s": "L"
+            },
             "m": {
                 "l": "MMMM",
                 "m": "MMM"
diff --git a/js/data/locale/ks/sysres.json b/js/data/locale/ks/sysres.json
index e951ca14c8..33207fe6d0 100644
--- a/js/data/locale/ks/sysres.json
+++ b/js/data/locale/ks/sysres.json
@@ -95,6 +95,54 @@
     "EEEE6": "بٹوار",
     "G-1": "بی سی ای",
     "G1": "سی ای",
+    "L1": "ج",
+    "L10": "س",
+    "L11": "ا",
+    "L12": "ن",
+    "L2": "ف",
+    "L3": "م",
+    "L4": "ا",
+    "L5": "م",
+    "L6": "ج",
+    "L7": "ج",
+    "L8": "ا",
+    "L9": "س",
+    "LL1": "جن",
+    "LL10": "اک",
+    "LL11": "نو",
+    "LL12": "دس",
+    "LL2": "فر",
+    "LL3": "ما",
+    "LL4": "اپ",
+    "LL5": "مئ",
+    "LL6": "جو",
+    "LL7": "جو",
+    "LL8": "اگ",
+    "LL9": "ست",
+    "LLL1": "جنؤری",
+    "LLL10": "اکتوٗبر",
+    "LLL11": "نومبر",
+    "LLL12": "دسمبر",
+    "LLL2": "فرؤری",
+    "LLL3": "مارٕچ",
+    "LLL4": "اپریل",
+    "LLL5": "مئی",
+    "LLL6": "جوٗن",
+    "LLL7": "جوٗلایی",
+    "LLL8": "اگست",
+    "LLL9": "ستمبر",
+    "LLLL1": "جنؤری",
+    "LLLL10": "اکتوٗبر",
+    "LLLL11": "نومبر",
+    "LLLL12": "دسمبر",
+    "LLLL2": "فرؤری",
+    "LLLL3": "مارٕچ",
+    "LLLL4": "اپریل",
+    "LLLL5": "مئی",
+    "LLLL6": "جوٗن",
+    "LLLL7": "جوٗلایی",
+    "LLLL8": "اگست",
+    "LLLL9": "ستمبر",
     "MMM1": "جنؤری",
     "MMM10": "اکتوٗبر",
     "MMM11": "نومبر",
@@ -104,19 +152,19 @@
     "MMM4": "اپریل",
     "MMM5": "مئی",
     "MMM6": "جوٗن",
-    "MMM7": "جوٗلایی",
+    "MMM7": "جُلَے",
     "MMM8": "اگست",
     "MMM9": "ستمبر",
     "MMMM1": "جنؤری",
     "MMMM10": "اکتوٗبر",
     "MMMM11": "نومبر",
-    "MMMM12": "دسمبر",
+    "MMMM12": "دَسَمبَر",
     "MMMM2": "فرؤری",
     "MMMM3": "مارٕچ",
     "MMMM4": "اپریل",
     "MMMM5": "مئی",
     "MMMM6": "جوٗن",
-    "MMMM7": "جوٗلایی",
+    "MMMM7": "جُلَے",
     "MMMM8": "اگست",
     "MMMM9": "ستمبر",
     "N1": "ج",
@@ -140,7 +188,7 @@
     "NN4": "اپ",
     "NN5": "مئ",
     "NN6": "جو",
-    "NN7": "جو",
+    "NN7": "جُ",
     "NN8": "اگ",
     "NN9": "ست",
     "a0": "اے ایم",
diff --git a/js/data/locale/ks/unitfmt.json b/js/data/locale/ks/unitfmt.json
index fa2543fbef..9772bf6b72 100644
--- a/js/data/locale/ks/unitfmt.json
+++ b/js/data/locale/ks/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ksb/ctrynames.json b/js/data/locale/ksb/ctrynames.json
index 79bd8bd3cd..67ba175fb1 100644
--- a/js/data/locale/ksb/ctrynames.json
+++ b/js/data/locale/ksb/ctrynames.json
@@ -37,6 +37,7 @@
     "Bosnia na Hezegovina": "BA",
     "Botswana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bukinafaso": "BF",
     "Bukini": "MG",
     "Bulgalia": "BG",
@@ -64,7 +65,6 @@
     "Ekwado": "EC",
     "Elitlea": "ER",
     "Elsavado": "SV",
-    "Eneo ja Uingeeza mwe Bahali Hindi": "IO",
     "Estonia": "EE",
     "Europe": "150",
     "European Union": "EU",
diff --git a/js/data/locale/ksb/ctryreverse.json b/js/data/locale/ksb/ctryreverse.json
index 1d9754a2b0..1621b7961e 100644
--- a/js/data/locale/ksb/ctryreverse.json
+++ b/js/data/locale/ksb/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Islaeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo ja Uingeeza mwe Bahali Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Ilaki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/ksb/unitfmt.json b/js/data/locale/ksb/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ksb/unitfmt.json
+++ b/js/data/locale/ksb/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ksf/ctrynames.json b/js/data/locale/ksf/ctrynames.json
index 543b6bc3b9..ebaa58e74e 100644
--- a/js/data/locale/ksf/ctrynames.json
+++ b/js/data/locale/ksf/ctrynames.json
@@ -36,6 +36,7 @@
     "bɔɔlíví": "BO",
     "bɔsnyɛ ri hɛrsǝgɔvín": "BA",
     "brɛsíl": "BR",
+    "British Indian Ocean Territory": "IO",
     "brunǝ́": "BN",
     "bukína fǝ́ asɔ": "BF",
     "bulgarí": "BG",
@@ -284,7 +285,6 @@
     "zǝ i gan": "KY",
     "zǝ i glás": "IS",
     "zǝ i marcál": "MH",
-    "zǝ ingɛrís ncɔ́m wa indi": "IO",
     "zǝ maalwín": "FK",
     "zǝ maryánnɔ́r": "MP",
     "zǝ palɛstínǝ": "PS",
diff --git a/js/data/locale/ksf/ctryreverse.json b/js/data/locale/ksf/ctryreverse.json
index 23db626015..a86cd278db 100644
--- a/js/data/locale/ksf/ctryreverse.json
+++ b/js/data/locale/ksf/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "israɛ́l",
     "IM": "Isle of Man",
     "IN": "indí",
-    "IO": "zǝ ingɛrís ncɔ́m wa indi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "irák",
     "IR": "iráŋ",
     "IS": "zǝ i glás",
diff --git a/js/data/locale/ksf/unitfmt.json b/js/data/locale/ksf/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ksf/unitfmt.json
+++ b/js/data/locale/ksf/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ksh/ctrynames.json b/js/data/locale/ksh/ctrynames.json
index d490023b58..86828d3023 100644
--- a/js/data/locale/ksh/ctrynames.json
+++ b/js/data/locale/ksh/ctrynames.json
@@ -34,7 +34,7 @@
     "Boßnije un Herzegovina": "BA",
     "Bozwaana": "BW",
     "Brasilije": "BR",
-    "Brettesche Besezunge em indesche Oozejahn": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukkinna-Faase": "BF",
     "Bulljaarije": "BG",
diff --git a/js/data/locale/ksh/ctryreverse.json b/js/data/locale/ksh/ctryreverse.json
index 578ee0b844..3ac119e437 100644
--- a/js/data/locale/ksh/ctryreverse.json
+++ b/js/data/locale/ksh/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Ißraäl",
     "IM": "de Ensel Män",
     "IN": "Indije",
-    "IO": "Brettesche Besezunge em indesche Oozejahn",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Persije",
     "IS": "Ißland",
diff --git a/js/data/locale/ksh/sysres.json b/js/data/locale/ksh/sysres.json
index eb06b02f4b..1e92d894db 100644
--- a/js/data/locale/ksh/sysres.json
+++ b/js/data/locale/ksh/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "#+{num} s",
     "#in {num}w": "#+{num} w",
     "#in {num}y": "zero#en keinem Johr|one#en {num} Johr|#en {num} Johre",
-    "#{num} ms": "zero#{num} ms|one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "zero#{num}d|one#{num}d|#{num}d",
     "#{num}d ago": "#-{num} d",
     "#{num}h": "zero#{num}h|one#{num}h|#{num}h",
@@ -26,12 +26,12 @@
     "1#1 hour ago|#{num} hours ago": "#-{num} h",
     "1#1 hour|#{num} hours": "zero#{num} Schtunde|one#{num} Schtunde|#{num} Schtunde",
     "1#1 hr ago|#{num} hrs ago": "#-{num} h",
-    "1#1 hr|#{num} hrs": "zero#{num} h|one#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "zero#{num} Millisekunde|one#{num} Millisekunde|#{num} Millisekunde",
     "1#1 min ago|#{num} min ago": "#-{num} min",
     "1#1 minute ago|#{num} minutes ago": "#-{num} min",
     "1#1 minute|#{num} minutes": "zero#{num} Menutte|one#{num} Menutte|#{num} Menutte",
-    "1#1 min|#{num} min": "zero#{num} min|one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "zero#{num}m|one#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "#-{num} m",
     "1#1 month ago|#{num} months ago": "#-{num} m",
@@ -41,7 +41,7 @@
     "1#1 sec ago|#{num} sec ago": "#-{num} s",
     "1#1 second ago|#{num} seconds ago": "#-{num} s",
     "1#1 second|#{num} seconds": "zero#{num} Sekunde|one#{num} Sekunde|#{num} Sekunde",
-    "1#1 sec|#{num} sec": "zero#{num} s|one#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
     "1#1 se|#{num} sec": "zero#{num}s|one#{num}s|#{num}s",
     "1#1 week ago|#{num} weeks ago": "#-{num} w",
     "1#1 week|#{num} weeks": "zero#{num} Woche|one#{num} Woche|#{num} Woche",
@@ -162,7 +162,7 @@
     "NN9": "Sä",
     "a0": "Uhr vörmiddaachs",
     "a1": "Uhr nommendaachs",
-    "durationLongDays": "zero#{num} d|one#{num} d|#{num} d",
+    "durationLongDays": "#{num} d",
     "durationMediumHours": "zero#{num}h|one#{num}h|#{num}h",
     "durationMediumMillis": "zero#{num}ms|one#{num}ms|#{num}ms",
     "durationMediumWeeks": "#{num} w",
diff --git a/js/data/locale/ksh/unitfmt.json b/js/data/locale/ksh/unitfmt.json
index 466c54c685..e9aaef751b 100644
--- a/js/data/locale/ksh/unitfmt.json
+++ b/js/data/locale/ksh/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ku/ctrynames.json b/js/data/locale/ku/ctrynames.json
index 9ea0530379..4c515bd8a4 100644
--- a/js/data/locale/ku/ctrynames.json
+++ b/js/data/locale/ku/ctrynames.json
@@ -2,7 +2,11 @@
     "Afrîka": "002",
     "Afrîkaya Bakur": "015",
     "Afrîkaya Başûr": "ZA",
-    "Åland Islands": "AX",
+    "Afrîkaya Jêra Sahrayê": "202",
+    "Afrîkaya Navîn": "017",
+    "Afrîkaya Rojava": "011",
+    "Afrîkaya Rojhilat": "014",
+    "Aksanên Psodoyê": "XA",
     "Albanya": "AL",
     "Almanya": "DE",
     "Amerîka": "019",
@@ -12,48 +16,46 @@
     "Amerîkaya Navîn": "013",
     "Andorra": "AD",
     "Angola": "AO",
-    "Anguilla": "AI",
+    "Anguîla": "AI",
     "Antarktîka": "AQ",
     "Antîgua û Berbûda": "AG",
-    "Arjentîn": "AR",
+    "Arjantîn": "AR",
     "Arûba": "AW",
-    "Ascension Island": "AC",
     "Asya": "142",
+    "Asyaya Başûr": "034",
+    "Asyaya Başûrrojhilat": "035",
+    "Asyaya Navîn": "143",
+    "Asyaya Rojava": "145",
+    "Asyaya Rojhilat": "030",
     "Awistirya": "AT",
     "Awistralasya": "053",
     "Awistralya": "AU",
-    "Azerbaycan": "AZ",
+    "Azerbeycan": "AZ",
     "Bahama": "BS",
-    "Bangladeş": "BD",
+    "Bakurê Amerîkayê": "021",
     "Barbados": "BB",
+    "Başûrê Afrîkayê": "018",
     "Behreyn": "BH",
     "Belarûs": "BY",
     "Belçîka": "BE",
     "Belîze": "BZ",
+    "Bengladeş": "BD",
     "Bermûda": "BM",
     "Bênîn": "BJ",
     "Bolîvya": "BO",
-    "Bosniya û Herzegovîna": "BA",
+    "Bosniya û Hersek": "BA",
     "Botswana": "BW",
-    "Bouvet Island": "BV",
-    "Brazîl": "BR",
-    "British Indian Ocean Territory": "IO",
-    "British Virgin Islands": "VG",
+    "Brezîlya": "BR",
     "Brûney": "BN",
     "Bulgaristan": "BG",
     "Burkîna Faso": "BF",
-    "Burundî": "BI",
+    "Bûrûndî": "BI",
     "Bûtan": "BT",
-    "Caribbean Netherlands": "BQ",
-    "Central Asia": "143",
-    "Ceuta & Melilla": "EA",
-    "Cezayir": "DZ",
-    "Christmas Island": "CX",
+    "Ceuta û Melîla": "EA",
+    "Cezayîr": "DZ",
     "Cîbraltar": "GI",
     "Cîbûtî": "DJ",
-    "Cîhan": "001",
-    "Clipperton Island": "CP",
-    "Cocos (Keeling) Islands": "CC",
+    "Côte d’Ivoire": "CI",
     "Curaçao": "CW",
     "Çad": "TD",
     "Çekya": "CZ",
@@ -61,47 +63,58 @@
     "Danîmarka": "DK",
     "Dewletên Yekbûyî yên Amerîkayê": "US",
     "Diego Garcia": "DG",
+    "dinya": "001",
     "Domînîka": "DM",
-    "Eastern Africa": "014",
-    "Eastern Asia": "030",
     "Efxanistan": "AF",
-    "Ekuador": "EC",
+    "Ekwador": "EC",
     "El Salvador": "SV",
-    "Emîrtiyên Erebî yên Yekbûyî": "AE",
-    "Erebistana Siyûdî": "SA",
-    "Erîtrea": "ER",
+    "Endonezya": "ID",
+    "Erebistana Siûdî": "SA",
+    "Erître": "ER",
     "Ermenistan": "AM",
     "Estonya": "EE",
+    "Eswatînî": "SZ",
     "Etiyopya": "ET",
-    "Eurozone": "EZ",
     "Ewropa": "150",
+    "Ewropaya Bakur": "154",
+    "Ewropaya Başûr": "039",
     "Ewropaya Rojava": "155",
     "Ewropaya Rojhilat": "151",
-    "Filîpîn": "PH",
     "Fîjî": "FJ",
+    "Fîlîpîn": "PH",
     "Fînlenda": "FI",
     "Fransa": "FR",
-    "French Southern Territories": "TF",
     "Gabon": "GA",
     "Gambiya": "GM",
     "Gana": "GH",
-    "Girava Man": "IM",
-    "Girava Norfolk": "NF",
+    "Girava Ascensionê": "AC",
+    "Girava Bouvetê": "BV",
+    "Girava Christmasê": "CX",
+    "Girava Clippertonê": "CP",
+    "Girava Manê": "IM",
+    "Girava Norfolkê": "NF",
+    "Giravên Alandê": "AX",
     "Giravên Bakurê Marianan": "MP",
+    "Giravên Biçûk ên Derveyî DYAyê": "UM",
     "Giravên Cook": "CK",
-    "Giravên Feroe": "FO",
+    "Giravên Falklandê": "FK",
+    "Giravên Faroeyê": "FO",
+    "Giravên Georgiyaya Başûr û Sandwicha Başûr": "GS",
+    "Giravên Heard û MacDonaldê": "HM",
+    "Giravên Kanaryayê": "IC",
     "Giravên Kaymanê": "KY",
-    "Giravên Malvîn": "FK",
+    "Giravên Kokosê (Keeling)": "CC",
     "Giravên Marşal": "MH",
     "Giravên Pitcairn": "PN",
-    "Giravên Qenariyê": "IC",
-    "Giravên Salomon": "SB",
-    "Giravên Turk û Kaîkos": "TC",
+    "Giravên Solomonê": "SB",
+    "Giravên Turks û Kaîkosê": "TC",
+    "Giravên Vîrjînê yên Amerîkayê": "VI",
+    "Giravên Vîrjînê yên Brîtanyayê": "VG",
     "Gîne": "GN",
     "Gîne-Bissau": "GW",
-    "Gîneya Rojbendî": "GQ",
+    "Gîneya Ekwadorê": "GQ",
     "Grenada": "GD",
-    "Grînlenda": "GL",
+    "Grînlanda": "GL",
     "Guadeloupe": "GP",
     "Guam": "GU",
     "Guatemala": "GT",
@@ -110,45 +123,48 @@
     "Guyana": "GY",
     "Guyanaya Fransî": "GF",
     "Haîtî": "HT",
-    "Heard & McDonald Islands": "HM",
-    "Herêma Mîkronezya": "057",
+    "Herêma Ewroyê": "EZ",
+    "Herêma Mîkronezyayê": "057",
+    "Herêma Nenas": "ZZ",
+    "Herêma Okyanûsa Hindî ya Brîtanyayê": "IO",
+    "Herêmên Başûr ên Fransayê": "TF",
+    "Herêmên Filîstînî": "PS",
     "Hindistan": "IN",
-    "Holenda": "NL",
+    "Holanda": "NL",
+    "Holendaya Karayîbê": "BQ",
     "Hondûras": "HN",
-    "Hong Kong": "HK",
+    "Hong Konga HîT ya Çînê": "HK",
     "Iraq": "IQ",
-    "Îndonezya": "ID",
     "Îran": "IR",
-    "Îrlenda": "IE",
-    "Îslenda": "IS",
-    "Îsraêl": "IL",
+    "Îrlanda": "IE",
+    "Îslanda": "IS",
+    "Îsraîl": "IL",
     "Îtalya": "IT",
     "Jamaîka": "JM",
-    "Japon": "JP",
+    "Japonya": "JP",
     "Jersey": "JE",
     "Kaledonyaya Nû": "NC",
-    "Kamboca": "KH",
+    "Kamboçya": "KH",
     "Kamerûn": "CM",
     "Kanada": "CA",
     "Kap Verde": "CV",
-    "Karîb": "029",
+    "Karayîb": "029",
     "Kenya": "KE",
     "Keyaniya Yekbûyî": "GB",
     "Kirîbatî": "KI",
-    "Kîpros": "CY",
     "Kolombiya": "CO",
     "Komara Afrîkaya Navend": "CF",
-    "Komara Domînîk": "DO",
+    "Komara Domînîkê": "DO",
     "Komor": "KM",
     "Kongo - Brazzaville": "CG",
     "Kongo - Kînşasa": "CD",
     "Korêya Bakur": "KP",
     "Korêya Başûr": "KR",
-    "Kosovo": "XK",
+    "Kosova": "XK",
     "Kosta Rîka": "CR",
     "Kroatya": "HR",
+    "Kuba": "CU",
     "Kuweyt": "KW",
-    "Kûba": "CU",
     "Laos": "LA",
     "Lesoto": "LS",
     "Letonya": "LV",
@@ -157,30 +173,30 @@
     "Lîberya": "LR",
     "Lîbya": "LY",
     "Lîtvanya": "LT",
-    "Lûksembûrg": "LU",
+    "Luksembûrg": "LU",
     "Macaristan": "HU",
     "Madagaskar": "MG",
-    "Makao": "MO",
-    "Makedonya": "MK",
+    "Makaoya Hît ya Çînê": "MO",
+    "Makendonyaya Bakur": "MK",
     "Malawî": "MW",
-    "Maldîv": "MV",
+    "Maldîva": "MV",
     "Malezya": "MY",
     "Malî": "ML",
     "Malta": "MT",
     "Maroko": "MA",
-    "Martinique": "MQ",
+    "Martînîk": "MQ",
     "Maurîtius": "MU",
     "Mayotte": "YT",
-    "Meksîk": "MX",
+    "Meksîka": "MX",
     "Melanezya": "054",
-    "Middle Africa": "017",
     "Misir": "EG",
     "Mîkronezya": "FM",
+    "Mîrgehên Erebî yên Yekbûyî": "AE",
     "Moldova": "MD",
     "Monako": "MC",
     "Mongolya": "MN",
     "Montenegro": "ME",
-    "Montserrat": "MS",
+    "Montserat": "MS",
     "Morîtanya": "MR",
     "Mozambîk": "MZ",
     "Myanmar (Birmanya)": "MM",
@@ -192,39 +208,37 @@
     "Nîjer": "NE",
     "Nîjerya": "NG",
     "Nîkaragua": "NI",
-    "Northern America": "021",
-    "Northern Europe": "154",
     "Norwêc": "NO",
-    "Nû Zelenda": "NZ",
     "Okyanûsya": "009",
+    "Okyanûsyaya Dûr": "QO",
     "Oman": "OM",
-    "Outlying Oceania": "QO",
     "Pakistan": "PK",
     "Palau": "PW",
     "Panama": "PA",
     "Papua Gîneya Nû": "PG",
-    "Paraguay": "PY",
-    "Peravê Diranfîl": "CI",
+    "Paragûay": "PY",
     "Perû": "PE",
     "Polînezya": "061",
     "Polînezyaya Fransî": "PF",
     "Polonya": "PL",
     "Porto Rîko": "PR",
     "Portûgal": "PT",
-    "Pseudo-Accents": "XA",
-    "Pseudo-Bidi": "XB",
+    "Psodo Bidî": "XB",
     "Qazaxistan": "KZ",
     "Qeter": "QA",
+    "Qibris": "CY",
     "Qirgizistan": "KG",
     "Réunion": "RE",
     "Romanya": "RO",
     "Rûsya": "RU",
     "Rwanda": "RW",
     "Sahraya Rojava": "EH",
+    "Saint Barthelemy": "BL",
+    "Saint Helena": "SH",
     "Saint Kitts û Nevîs": "KN",
     "Saint Lucia": "LC",
-    "Saint Vincent û Giravên Grenadîn": "VC",
-    "Saint-Barthélemy": "BL",
+    "Saint Martin": "MF",
+    "Saint Vincent û Giravên Grenadînê": "VC",
     "Saint-Pierre û Miquelon": "PM",
     "Samoa": "WS",
     "Samoaya Amerîkanî": "AS",
@@ -232,40 +246,31 @@
     "Sao Tome û Prînsîpe": "ST",
     "Sark": "CQ",
     "Senegal": "SN",
-    "Serbistan": "RS",
     "Seyşel": "SC",
     "Sierra Leone": "SL",
-    "Singapûr": "SG",
-    "Sint Maarten": "SX",
+    "Sint Marteen": "SX",
+    "Sirbistan": "RS",
+    "Sîngapûr": "SG",
     "Slovakya": "SK",
     "Slovenya": "SI",
     "Somalya": "SO",
-    "South Georgia & South Sandwich Islands": "GS",
-    "Southeast Asia": "035",
-    "Southern Africa": "018",
-    "Southern Asia": "034",
-    "Southern Europe": "039",
     "Spanya": "ES",
     "Srî Lanka": "LK",
-    "St. Helena": "SH",
-    "St. Martin": "MF",
-    "Sub-Saharan Africa": "202",
+    "Surînam": "SR",
     "Sûdan": "SD",
     "Sûdana Başûr": "SS",
     "Sûrî": "SY",
-    "Sûrînam": "SR",
-    "Svalbard & Jan Mayen": "SJ",
-    "Swazîlenda": "SZ",
+    "Svalbard û Jan Mayen": "SJ",
     "Swêd": "SE",
     "Swîsre": "CH",
     "Şîle": "CL",
     "Tacîkistan": "TJ",
     "Tanzanya": "TZ",
-    "Taylenda": "TH",
+    "Tayland": "TH",
     "Taywan": "TW",
     "Tirkiye": "TR",
     "Tirkmenistan": "TM",
-    "Tîmora-Leste": "TL",
+    "Tîmor-Leste": "TL",
     "Togo": "TG",
     "Tokelau": "TK",
     "Tonga": "TO",
@@ -273,9 +278,6 @@
     "Trînîdad û Tobago": "TT",
     "Tûnis": "TN",
     "Tûvalû": "TV",
-    "U.S. Outlying Islands": "UM",
-    "U.S. Virgin Islands": "VI",
-    "Unknown Region": "ZZ",
     "Urdun": "JO",
     "Ûganda": "UG",
     "Ûkrayna": "UA",
@@ -286,12 +288,10 @@
     "Venezuela": "VE",
     "Viyetnam": "VN",
     "Wallis û Futuna": "WF",
-    "Western Africa": "011",
-    "Western Asia": "145",
-    "Xakên filistînî": "PS",
     "Yekîtiya Ewropayê": "EU",
     "Yemen": "YE",
     "Yewnanistan": "GR",
     "Zambiya": "ZM",
+    "Zelandaya Nû": "NZ",
     "Zîmbabwe": "ZW"
 }
\ No newline at end of file
diff --git a/js/data/locale/ku/ctryreverse.json b/js/data/locale/ku/ctryreverse.json
index 80f9028dba..c3f8747ea5 100644
--- a/js/data/locale/ku/ctryreverse.json
+++ b/js/data/locale/ku/ctryreverse.json
@@ -1,116 +1,116 @@
 {
-    "001": "Cîhan",
+    "001": "dinya",
     "002": "Afrîka",
     "003": "Amerîkaya Bakur",
     "005": "Amerîkaya Başûr",
     "009": "Okyanûsya",
-    "011": "Western Africa",
+    "011": "Afrîkaya Rojava",
     "013": "Amerîkaya Navîn",
-    "014": "Eastern Africa",
+    "014": "Afrîkaya Rojhilat",
     "015": "Afrîkaya Bakur",
-    "017": "Middle Africa",
-    "018": "Southern Africa",
+    "017": "Afrîkaya Navîn",
+    "018": "Başûrê Afrîkayê",
     "019": "Amerîka",
-    "021": "Northern America",
-    "029": "Karîb",
-    "030": "Eastern Asia",
-    "034": "Southern Asia",
-    "035": "Southeast Asia",
-    "039": "Southern Europe",
+    "021": "Bakurê Amerîkayê",
+    "029": "Karayîb",
+    "030": "Asyaya Rojhilat",
+    "034": "Asyaya Başûr",
+    "035": "Asyaya Başûrrojhilat",
+    "039": "Ewropaya Başûr",
     "053": "Awistralasya",
     "054": "Melanezya",
-    "057": "Herêma Mîkronezya",
+    "057": "Herêma Mîkronezyayê",
     "061": "Polînezya",
     "142": "Asya",
-    "143": "Central Asia",
-    "145": "Western Asia",
+    "143": "Asyaya Navîn",
+    "145": "Asyaya Rojava",
     "150": "Ewropa",
     "151": "Ewropaya Rojhilat",
-    "154": "Northern Europe",
+    "154": "Ewropaya Bakur",
     "155": "Ewropaya Rojava",
-    "202": "Sub-Saharan Africa",
+    "202": "Afrîkaya Jêra Sahrayê",
     "419": "Amerîkaya Latînî",
-    "AC": "Ascension Island",
+    "AC": "Girava Ascensionê",
     "AD": "Andorra",
-    "AE": "Emîrtiyên Erebî yên Yekbûyî",
+    "AE": "Mîrgehên Erebî yên Yekbûyî",
     "AF": "Efxanistan",
     "AG": "Antîgua û Berbûda",
-    "AI": "Anguilla",
+    "AI": "Anguîla",
     "AL": "Albanya",
     "AM": "Ermenistan",
     "AO": "Angola",
     "AQ": "Antarktîka",
-    "AR": "Arjentîn",
+    "AR": "Arjantîn",
     "AS": "Samoaya Amerîkanî",
     "AT": "Awistirya",
     "AU": "Awistralya",
     "AW": "Arûba",
-    "AX": "Åland Islands",
-    "AZ": "Azerbaycan",
-    "BA": "Bosniya û Herzegovîna",
+    "AX": "Giravên Alandê",
+    "AZ": "Azerbeycan",
+    "BA": "Bosniya û Hersek",
     "BB": "Barbados",
-    "BD": "Bangladeş",
+    "BD": "Bengladeş",
     "BE": "Belçîka",
     "BF": "Burkîna Faso",
     "BG": "Bulgaristan",
     "BH": "Behreyn",
-    "BI": "Burundî",
+    "BI": "Bûrûndî",
     "BJ": "Bênîn",
-    "BL": "Saint-Barthélemy",
+    "BL": "Saint Barthelemy",
     "BM": "Bermûda",
     "BN": "Brûney",
     "BO": "Bolîvya",
-    "BQ": "Caribbean Netherlands",
-    "BR": "Brazîl",
+    "BQ": "Holendaya Karayîbê",
+    "BR": "Brezîlya",
     "BS": "Bahama",
     "BT": "Bûtan",
-    "BV": "Bouvet Island",
+    "BV": "Girava Bouvetê",
     "BW": "Botswana",
     "BY": "Belarûs",
     "BZ": "Belîze",
     "CA": "Kanada",
-    "CC": "Cocos (Keeling) Islands",
+    "CC": "Giravên Kokosê (Keeling)",
     "CD": "Kongo - Kînşasa",
     "CF": "Komara Afrîkaya Navend",
     "CG": "Kongo - Brazzaville",
     "CH": "Swîsre",
-    "CI": "Peravê Diranfîl",
+    "CI": "Côte d’Ivoire",
     "CK": "Giravên Cook",
     "CL": "Şîle",
     "CM": "Kamerûn",
     "CN": "Çîn",
     "CO": "Kolombiya",
-    "CP": "Clipperton Island",
+    "CP": "Girava Clippertonê",
     "CQ": "Sark",
     "CR": "Kosta Rîka",
-    "CU": "Kûba",
+    "CU": "Kuba",
     "CV": "Kap Verde",
     "CW": "Curaçao",
-    "CX": "Christmas Island",
-    "CY": "Kîpros",
+    "CX": "Girava Christmasê",
+    "CY": "Qibris",
     "CZ": "Çekya",
     "DE": "Almanya",
     "DG": "Diego Garcia",
     "DJ": "Cîbûtî",
     "DK": "Danîmarka",
     "DM": "Domînîka",
-    "DO": "Komara Domînîk",
-    "DZ": "Cezayir",
-    "EA": "Ceuta & Melilla",
-    "EC": "Ekuador",
+    "DO": "Komara Domînîkê",
+    "DZ": "Cezayîr",
+    "EA": "Ceuta û Melîla",
+    "EC": "Ekwador",
     "EE": "Estonya",
     "EG": "Misir",
     "EH": "Sahraya Rojava",
-    "ER": "Erîtrea",
+    "ER": "Erître",
     "ES": "Spanya",
     "ET": "Etiyopya",
     "EU": "Yekîtiya Ewropayê",
-    "EZ": "Eurozone",
+    "EZ": "Herêma Ewroyê",
     "FI": "Fînlenda",
     "FJ": "Fîjî",
-    "FK": "Giravên Malvîn",
+    "FK": "Giravên Falklandê",
     "FM": "Mîkronezya",
-    "FO": "Giravên Feroe",
+    "FO": "Giravên Faroeyê",
     "FR": "Fransa",
     "GA": "Gabon",
     "GB": "Keyaniya Yekbûyî",
@@ -120,41 +120,41 @@
     "GG": "Guernsey",
     "GH": "Gana",
     "GI": "Cîbraltar",
-    "GL": "Grînlenda",
+    "GL": "Grînlanda",
     "GM": "Gambiya",
     "GN": "Gîne",
     "GP": "Guadeloupe",
-    "GQ": "Gîneya Rojbendî",
+    "GQ": "Gîneya Ekwadorê",
     "GR": "Yewnanistan",
-    "GS": "South Georgia & South Sandwich Islands",
+    "GS": "Giravên Georgiyaya Başûr û Sandwicha Başûr",
     "GT": "Guatemala",
     "GU": "Guam",
     "GW": "Gîne-Bissau",
     "GY": "Guyana",
-    "HK": "Hong Kong",
-    "HM": "Heard & McDonald Islands",
+    "HK": "Hong Konga HîT ya Çînê",
+    "HM": "Giravên Heard û MacDonaldê",
     "HN": "Hondûras",
     "HR": "Kroatya",
     "HT": "Haîtî",
     "HU": "Macaristan",
-    "IC": "Giravên Qenariyê",
-    "ID": "Îndonezya",
-    "IE": "Îrlenda",
-    "IL": "Îsraêl",
-    "IM": "Girava Man",
+    "IC": "Giravên Kanaryayê",
+    "ID": "Endonezya",
+    "IE": "Îrlanda",
+    "IL": "Îsraîl",
+    "IM": "Girava Manê",
     "IN": "Hindistan",
-    "IO": "British Indian Ocean Territory",
+    "IO": "Herêma Okyanûsa Hindî ya Brîtanyayê",
     "IQ": "Iraq",
     "IR": "Îran",
-    "IS": "Îslenda",
+    "IS": "Îslanda",
     "IT": "Îtalya",
     "JE": "Jersey",
     "JM": "Jamaîka",
     "JO": "Urdun",
-    "JP": "Japon",
+    "JP": "Japonya",
     "KE": "Kenya",
     "KG": "Qirgizistan",
-    "KH": "Kamboca",
+    "KH": "Kamboçya",
     "KI": "Kirîbatî",
     "KM": "Komor",
     "KN": "Saint Kitts û Nevîs",
@@ -171,96 +171,96 @@
     "LR": "Lîberya",
     "LS": "Lesoto",
     "LT": "Lîtvanya",
-    "LU": "Lûksembûrg",
+    "LU": "Luksembûrg",
     "LV": "Letonya",
     "LY": "Lîbya",
     "MA": "Maroko",
     "MC": "Monako",
     "MD": "Moldova",
     "ME": "Montenegro",
-    "MF": "St. Martin",
+    "MF": "Saint Martin",
     "MG": "Madagaskar",
     "MH": "Giravên Marşal",
-    "MK": "Makedonya",
+    "MK": "Makendonyaya Bakur",
     "ML": "Malî",
     "MM": "Myanmar (Birmanya)",
     "MN": "Mongolya",
-    "MO": "Makao",
+    "MO": "Makaoya Hît ya Çînê",
     "MP": "Giravên Bakurê Marianan",
-    "MQ": "Martinique",
+    "MQ": "Martînîk",
     "MR": "Morîtanya",
-    "MS": "Montserrat",
+    "MS": "Montserat",
     "MT": "Malta",
     "MU": "Maurîtius",
-    "MV": "Maldîv",
+    "MV": "Maldîva",
     "MW": "Malawî",
-    "MX": "Meksîk",
+    "MX": "Meksîka",
     "MY": "Malezya",
     "MZ": "Mozambîk",
     "NA": "Namîbya",
     "NC": "Kaledonyaya Nû",
     "NE": "Nîjer",
-    "NF": "Girava Norfolk",
+    "NF": "Girava Norfolkê",
     "NG": "Nîjerya",
     "NI": "Nîkaragua",
-    "NL": "Holenda",
+    "NL": "Holanda",
     "NO": "Norwêc",
     "NP": "Nepal",
     "NR": "Naûrû",
     "NU": "Niûe",
-    "NZ": "Nû Zelenda",
+    "NZ": "Zelandaya Nû",
     "OM": "Oman",
     "PA": "Panama",
     "PE": "Perû",
     "PF": "Polînezyaya Fransî",
     "PG": "Papua Gîneya Nû",
-    "PH": "Filîpîn",
+    "PH": "Fîlîpîn",
     "PK": "Pakistan",
     "PL": "Polonya",
     "PM": "Saint-Pierre û Miquelon",
     "PN": "Giravên Pitcairn",
     "PR": "Porto Rîko",
-    "PS": "Xakên filistînî",
+    "PS": "Herêmên Filîstînî",
     "PT": "Portûgal",
     "PW": "Palau",
-    "PY": "Paraguay",
+    "PY": "Paragûay",
     "QA": "Qeter",
-    "QO": "Outlying Oceania",
+    "QO": "Okyanûsyaya Dûr",
     "RE": "Réunion",
     "RO": "Romanya",
-    "RS": "Serbistan",
+    "RS": "Sirbistan",
     "RU": "Rûsya",
     "RW": "Rwanda",
-    "SA": "Erebistana Siyûdî",
-    "SB": "Giravên Salomon",
+    "SA": "Erebistana Siûdî",
+    "SB": "Giravên Solomonê",
     "SC": "Seyşel",
     "SD": "Sûdan",
     "SE": "Swêd",
-    "SG": "Singapûr",
-    "SH": "St. Helena",
+    "SG": "Sîngapûr",
+    "SH": "Saint Helena",
     "SI": "Slovenya",
-    "SJ": "Svalbard & Jan Mayen",
+    "SJ": "Svalbard û Jan Mayen",
     "SK": "Slovakya",
     "SL": "Sierra Leone",
     "SM": "San Marîno",
     "SN": "Senegal",
     "SO": "Somalya",
-    "SR": "Sûrînam",
+    "SR": "Surînam",
     "SS": "Sûdana Başûr",
     "ST": "Sao Tome û Prînsîpe",
     "SV": "El Salvador",
-    "SX": "Sint Maarten",
+    "SX": "Sint Marteen",
     "SY": "Sûrî",
-    "SZ": "Swazîlenda",
+    "SZ": "Eswatînî",
     "TA": "Tristan da Cunha",
-    "TC": "Giravên Turk û Kaîkos",
+    "TC": "Giravên Turks û Kaîkosê",
     "TD": "Çad",
-    "TF": "French Southern Territories",
+    "TF": "Herêmên Başûr ên Fransayê",
     "TG": "Togo",
-    "TH": "Taylenda",
+    "TH": "Tayland",
     "TJ": "Tacîkistan",
     "TK": "Tokelau",
-    "TL": "Tîmora-Leste",
+    "TL": "Tîmor-Leste",
     "TM": "Tirkmenistan",
     "TN": "Tûnis",
     "TO": "Tonga",
@@ -271,27 +271,27 @@
     "TZ": "Tanzanya",
     "UA": "Ûkrayna",
     "UG": "Ûganda",
-    "UM": "U.S. Outlying Islands",
+    "UM": "Giravên Biçûk ên Derveyî DYAyê",
     "UN": "Neteweyên Yekbûyî",
     "US": "Dewletên Yekbûyî yên Amerîkayê",
     "UY": "Ûrûguay",
     "UZ": "Ûzbêkistan",
     "VA": "Vatîkan",
-    "VC": "Saint Vincent û Giravên Grenadîn",
+    "VC": "Saint Vincent û Giravên Grenadînê",
     "VE": "Venezuela",
-    "VG": "British Virgin Islands",
-    "VI": "U.S. Virgin Islands",
+    "VG": "Giravên Vîrjînê yên Brîtanyayê",
+    "VI": "Giravên Vîrjînê yên Amerîkayê",
     "VN": "Viyetnam",
     "VU": "Vanûatû",
     "WF": "Wallis û Futuna",
     "WS": "Samoa",
-    "XA": "Pseudo-Accents",
-    "XB": "Pseudo-Bidi",
-    "XK": "Kosovo",
+    "XA": "Aksanên Psodoyê",
+    "XB": "Psodo Bidî",
+    "XK": "Kosova",
     "YE": "Yemen",
     "YT": "Mayotte",
     "ZA": "Afrîkaya Başûr",
     "ZM": "Zambiya",
     "ZW": "Zîmbabwe",
-    "ZZ": "Unknown Region"
+    "ZZ": "Herêma Nenas"
 }
\ No newline at end of file
diff --git a/js/data/locale/ku/unitfmt.json b/js/data/locale/ku/unitfmt.json
index 0569c9d25f..6e509a3bca 100644
--- a/js/data/locale/ku/unitfmt.json
+++ b/js/data/locale/ku/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kw/unitfmt.json b/js/data/locale/kw/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/kw/unitfmt.json
+++ b/js/data/locale/kw/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/kxv/Deva/ctrynames.json b/js/data/locale/kxv/Deva/ctrynames.json
new file mode 100644
index 0000000000..de2d587725
--- /dev/null
+++ b/js/data/locale/kxv/Deva/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "aail āp man": "IM",
+    "aanḍiti arab emireṭs": "AE",
+    "aapganistan": "AF",
+    "aarhenṭina": "AR",
+    "aarmenia": "AM",
+    "aayarlanḍ": "IE",
+    "Africa": "002",
+    "aislanḍ": "IS",
+    "ajerbaijan": "AZ",
+    "albania": "AL",
+    "aljīriaa": "DZ",
+    "Americas": "019",
+    "amerikati samva": "AS",
+    "ānḍorā": "AD",
+    "angola": "AO",
+    "anguila": "AI",
+    "ānṭarkṭikā": "AQ",
+    "aruba": "AW",
+    "Ascension Island": "AC",
+    "Asia": "142",
+    "astrelia": "AU",
+    "Australasia": "053",
+    "austria": "AT",
+    "bāhāmās": "BS",
+    "bajnia aḍe hertsegovina": "BA",
+    "banglades": "BD",
+    "barbaḍos": "BB",
+    "bāren": "BH",
+    "bāṭikān": "VA",
+    "belarūs": "BY",
+    "belīj": "BZ",
+    "beljiym": "BE",
+    "benīn": "BJ",
+    "bermuḍā": "BM",
+    "boliviā": "BO",
+    "boṭsvana": "BW",
+    "Bouvet Island": "BV",
+    "brājil": "BR",
+    "briṭis inḍiāti samudra handi": "IO",
+    "briṭis vrjin dīp": "VG",
+    "brunae": "BN",
+    "bulgaria": "BG",
+    "burkina paso": "BF",
+    "buruṇḍī": "BI",
+    "buṭān": "BT",
+    "cad": "TD",
+    "caina": "CN",
+    "Caribbean": "029",
+    "cekiya": "CZ",
+    "Central America": "013",
+    "Central Asia": "143",
+    "cili": "CL",
+    "Clipperton Island": "CP",
+    "dakiṇ jārjiā aḍe dakiṇ sandwich dīp": "GS",
+    "ḍenmark": "DK",
+    "ḍiego garsia": "DG",
+    "dkīṇ aaprika": "ZA",
+    "dkiṇ koriyaa": "KR",
+    "dkiṇ sūdan": "SS",
+    "dominika": "DM",
+    "dominikan republik": "DO",
+    "Eastern Africa": "014",
+    "Eastern Asia": "030",
+    "Eastern Europe": "151",
+    "ekvaḍor": "EC",
+    "el salvador": "SV",
+    "eleṇḍ dīp": "AX",
+    "eṇṭigaa aḍe barbuḍaa": "AG",
+    "esṭoniya": "EE",
+    "esvaṭini": "SZ",
+    "Europe": "150",
+    "European Union": "EU",
+    "Eurozone": "EZ",
+    "gambia": "GM",
+    "gana": "GH",
+    "gbon": "GA",
+    "gini": "GN",
+    "gini-bisau": "GW",
+    "graneida": "GD",
+    "grīnlanḍ": "GL",
+    "grīs": "GR",
+    "grnse": "GG",
+    "guām": "GU",
+    "guyana": "GY",
+    "gvadelup": "GP",
+    "gvaṭemala": "GT",
+    "haiti": "HT",
+    "Heard & McDonald Islands": "HM",
+    "honḍuras": "HN",
+    "hong kong (sar) caina": "HK",
+    "hungarī": "HU",
+    "ījipṭ": "EG",
+    "ikveṭorial gini": "GQ",
+    "inḍonesiya": "ID",
+    "irak": "IQ",
+    "iran": "IR",
+    "īriṭriaa": "ER",
+    "israel": "IL",
+    "iṭalī": "IT",
+    "ītiyopiya": "ET",
+    "jamaika": "JM",
+    "jambiya": "ZM",
+    "japan": "JP",
+    "jbralṭr": "GI",
+    "jeorjiaa": "GE",
+    "jermanī": "DE",
+    "jersī": "JE",
+    "jibutī": "DJ",
+    "jimbabve": "ZW",
+    "jorḍan": "JO",
+    "kajakstan": "KZ",
+    "kamboḍia": "KH",
+    "kanaḍa": "CA",
+    "kanari dīp": "IC",
+    "karibiyn nedrlends": "BQ",
+    "katar": "QA",
+    "keimen dīp": "KY",
+    "kemarun": "CM",
+    "kenya": "KE",
+    "kep vrḍi": "CV",
+    "kirgistan": "KG",
+    "kiribaṭi": "KI",
+    "kokos keling dīp": "CC",
+    "kolmbiaa": "CO",
+    "komoros": "KM",
+    "kongo - brajavil": "CG",
+    "kongo - kinsasa": "CD",
+    "kosovo": "XK",
+    "kosta rika": "CR",
+    "koṭ ḍi vaa": "CI",
+    "kristmas dīp": "CX",
+    "kroesia": "HR",
+    "kuk dīp": "CK",
+    "kuvet": "KW",
+    "kyuba": "CU",
+    "kyurasao": "CW",
+    "laiberīya": "LR",
+    "laos": "LA",
+    "laṭin amerika": "419",
+    "laṭviya": "LV",
+    "lebanon": "LB",
+    "lesotho": "LS",
+    "libya": "LY",
+    "likṭensṭein": "LI",
+    "liṭuaania": "LT",
+    "lksemborg": "LU",
+    "madagascar": "MG",
+    "madini aaprika republik": "CF",
+    "makao sar cina": "MO",
+    "malavī": "MW",
+    "māldīp": "MV",
+    "maleseāā": "MY",
+    "mali": "ML",
+    "malṭaa": "MT",
+    "marsall dīp": "MH",
+    "marṭinik": "MQ",
+    "mauriss": "MU",
+    "mauriṭaniya": "MR",
+    "mayoṭṭ": "YT",
+    "meksīko": "MX",
+    "Melanesia": "054",
+    "micronesiaa": "FM",
+    "Micronesian Region": "057",
+    "Middle Africa": "017",
+    "mojambik": "MZ",
+    "molḍovaa": "MD",
+    "monako": "MC",
+    "mongolia": "MN",
+    "monṭenegro": "ME",
+    "monṭserrarṭ": "MS",
+    "morkko": "MA",
+    "myanmar (brma)": "MM",
+    "naigeria": "NG",
+    "naījr": "NE",
+    "namibia": "NA",
+    "nauru": "NR",
+    "nederlanḍs": "NL",
+    "nepal": "NP",
+    "nikaraguaa": "NI",
+    "niyu": "NU",
+    "norpok dīp": "NF",
+    "North America": "003",
+    "Northern Africa": "015",
+    "Northern America": "021",
+    "Northern Europe": "154",
+    "norvay": "NO",
+    "nyu jīlanḍ": "NZ",
+    "nyu keleḍoniya": "NC",
+    "Oceania": "009",
+    "oman": "OM",
+    "Outlying Oceania": "QO",
+    "pakistan": "PK",
+    "paklaṇd dīp": "FK",
+    "palau": "PW",
+    "palesṭiati handi": "PS",
+    "panema": "PA",
+    "papua nyu gini": "PG",
+    "pareguvai": "PY",
+    "pēro dīp": "FO",
+    "peru": "PE",
+    "piji": "FJ",
+    "pilippines": "PH",
+    "pinlaṇd": "FI",
+    "piṭkarn dīp": "PN",
+    "polanḍ": "PL",
+    "Polynesia": "061",
+    "portugal": "PT",
+    "prans": "FR",
+    "prenc": "PF",
+    "prenc guiyana": "GF",
+    "prēnch dakiṇ teritorī": "TF",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
+    "puerto rico": "PR",
+    "raji, purti": "001",
+    "riyuniyn": "RE",
+    "romaniya": "RO",
+    "russia": "RU",
+    "rvanḍa": "RW",
+    "saipras": "CY",
+    "samoaa": "WS",
+    "san marino": "SM",
+    "sao tom aḍe prinsipe": "ST",
+    "Sark": "CQ",
+    "saūdi arabiya": "SA",
+    "se barṭelemi": "BL",
+    "seint helena": "SH",
+    "seint kiṭs āḍe nebis": "KN",
+    "seint lusiya": "LC",
+    "seint martin": "MF",
+    "seint pierri ande mikelon": "PM",
+    "seint vinseṇṭ aḍe grenaḍi": "VC",
+    "senegal": "SN",
+    "serbia": "RS",
+    "seuṭa aḍe melila": "EA",
+    "sierra leyon": "SL",
+    "singapor": "SG",
+    "sint mārṭen": "SX",
+    "sīriya": "SY",
+    "siselles": "SC",
+    "slovakia": "SK",
+    "slovenia": "SI",
+    "soloman dīp": "SB",
+    "somaliya": "SO",
+    "South America": "005",
+    "Southeast Asia": "035",
+    "Southern Africa": "018",
+    "Southern Asia": "034",
+    "Southern Europe": "039",
+    "spein": "ES",
+    "sri lanka": "LK",
+    "Sub-Saharan Africa": "202",
+    "suḍan": "SD",
+    "surīname": "SR",
+    "svalbard aḍe jan mayen": "SJ",
+    "sviḍen": "SE",
+    "svitjerlaṇḍ": "CH",
+    "tailanḍ": "TH",
+    "taivan": "TW",
+    "tajākīstān": "TJ",
+    "ṭanjaniya": "TZ",
+    "ṭimor - leste": "TL",
+    "ṭogo": "TG",
+    "ṭokelau": "TK",
+    "ṭonga": "TO",
+    "ṭriniḍaḍ aḍe ṭobego": "TT",
+    "Tristan da Cunha": "TA",
+    "ṭunisiaa": "TN",
+    "turkī": "TR",
+    "turkmenīstān": "TM",
+    "turks aḍe keikes dīp": "TC",
+    "tuvala": "TV",
+    "ūjbekistaan": "UZ",
+    "uniṭeḍ kingḍom": "GB",
+    "United Nations": "UN",
+    "Unknown Region": "ZZ",
+    "ūrugve": "UY",
+    "uttar koriya": "KP",
+    "uttar mariyana dīp": "MP",
+    "uttar mesiḍoniya": "MK",
+    "vallis aḍe puṭuna": "WF",
+    "vanuaatu": "VU",
+    "vedakuṇpu sahara": "EH",
+    "venejuela": "VE",
+    "viyetnam": "VN",
+    "Western Africa": "011",
+    "Western Asia": "145",
+    "Western Europe": "155",
+    "yemen": "YE",
+    "yu.es. aautlaing dīp": "UM",
+    "yu.es. vrjin dīp": "VI",
+    "yūganḍa": "UG",
+    "yūkrain": "UA",
+    "yunaiṭeḍ stets": "US",
+    "बारत": "IN"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Deva/ctryreverse.json b/js/data/locale/kxv/Deva/ctryreverse.json
new file mode 100644
index 0000000000..bbb2e0c205
--- /dev/null
+++ b/js/data/locale/kxv/Deva/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "raji, purti",
+    "002": "Africa",
+    "003": "North America",
+    "005": "South America",
+    "009": "Oceania",
+    "011": "Western Africa",
+    "013": "Central America",
+    "014": "Eastern Africa",
+    "015": "Northern Africa",
+    "017": "Middle Africa",
+    "018": "Southern Africa",
+    "019": "Americas",
+    "021": "Northern America",
+    "029": "Caribbean",
+    "030": "Eastern Asia",
+    "034": "Southern Asia",
+    "035": "Southeast Asia",
+    "039": "Southern Europe",
+    "053": "Australasia",
+    "054": "Melanesia",
+    "057": "Micronesian Region",
+    "061": "Polynesia",
+    "142": "Asia",
+    "143": "Central Asia",
+    "145": "Western Asia",
+    "150": "Europe",
+    "151": "Eastern Europe",
+    "154": "Northern Europe",
+    "155": "Western Europe",
+    "202": "Sub-Saharan Africa",
+    "419": "laṭin amerika",
+    "AC": "Ascension Island",
+    "AD": "ānḍorā",
+    "AE": "aanḍiti arab emireṭs",
+    "AF": "aapganistan",
+    "AG": "eṇṭigaa aḍe barbuḍaa",
+    "AI": "anguila",
+    "AL": "albania",
+    "AM": "aarmenia",
+    "AO": "angola",
+    "AQ": "ānṭarkṭikā",
+    "AR": "aarhenṭina",
+    "AS": "amerikati samva",
+    "AT": "austria",
+    "AU": "astrelia",
+    "AW": "aruba",
+    "AX": "eleṇḍ dīp",
+    "AZ": "ajerbaijan",
+    "BA": "bajnia aḍe hertsegovina",
+    "BB": "barbaḍos",
+    "BD": "banglades",
+    "BE": "beljiym",
+    "BF": "burkina paso",
+    "BG": "bulgaria",
+    "BH": "bāren",
+    "BI": "buruṇḍī",
+    "BJ": "benīn",
+    "BL": "se barṭelemi",
+    "BM": "bermuḍā",
+    "BN": "brunae",
+    "BO": "boliviā",
+    "BQ": "karibiyn nedrlends",
+    "BR": "brājil",
+    "BS": "bāhāmās",
+    "BT": "buṭān",
+    "BV": "Bouvet Island",
+    "BW": "boṭsvana",
+    "BY": "belarūs",
+    "BZ": "belīj",
+    "CA": "kanaḍa",
+    "CC": "kokos keling dīp",
+    "CD": "kongo - kinsasa",
+    "CF": "madini aaprika republik",
+    "CG": "kongo - brajavil",
+    "CH": "svitjerlaṇḍ",
+    "CI": "koṭ ḍi vaa",
+    "CK": "kuk dīp",
+    "CL": "cili",
+    "CM": "kemarun",
+    "CN": "caina",
+    "CO": "kolmbiaa",
+    "CP": "Clipperton Island",
+    "CQ": "Sark",
+    "CR": "kosta rika",
+    "CU": "kyuba",
+    "CV": "kep vrḍi",
+    "CW": "kyurasao",
+    "CX": "kristmas dīp",
+    "CY": "saipras",
+    "CZ": "cekiya",
+    "DE": "jermanī",
+    "DG": "ḍiego garsia",
+    "DJ": "jibutī",
+    "DK": "ḍenmark",
+    "DM": "dominika",
+    "DO": "dominikan republik",
+    "DZ": "aljīriaa",
+    "EA": "seuṭa aḍe melila",
+    "EC": "ekvaḍor",
+    "EE": "esṭoniya",
+    "EG": "ījipṭ",
+    "EH": "vedakuṇpu sahara",
+    "ER": "īriṭriaa",
+    "ES": "spein",
+    "ET": "ītiyopiya",
+    "EU": "European Union",
+    "EZ": "Eurozone",
+    "FI": "pinlaṇd",
+    "FJ": "piji",
+    "FK": "paklaṇd dīp",
+    "FM": "micronesiaa",
+    "FO": "pēro dīp",
+    "FR": "prans",
+    "GA": "gbon",
+    "GB": "uniṭeḍ kingḍom",
+    "GD": "graneida",
+    "GE": "jeorjiaa",
+    "GF": "prenc guiyana",
+    "GG": "grnse",
+    "GH": "gana",
+    "GI": "jbralṭr",
+    "GL": "grīnlanḍ",
+    "GM": "gambia",
+    "GN": "gini",
+    "GP": "gvadelup",
+    "GQ": "ikveṭorial gini",
+    "GR": "grīs",
+    "GS": "dakiṇ jārjiā aḍe dakiṇ sandwich dīp",
+    "GT": "gvaṭemala",
+    "GU": "guām",
+    "GW": "gini-bisau",
+    "GY": "guyana",
+    "HK": "hong kong (sar) caina",
+    "HM": "Heard & McDonald Islands",
+    "HN": "honḍuras",
+    "HR": "kroesia",
+    "HT": "haiti",
+    "HU": "hungarī",
+    "IC": "kanari dīp",
+    "ID": "inḍonesiya",
+    "IE": "aayarlanḍ",
+    "IL": "israel",
+    "IM": "aail āp man",
+    "IN": "बारत",
+    "IO": "briṭis inḍiāti samudra handi",
+    "IQ": "irak",
+    "IR": "iran",
+    "IS": "aislanḍ",
+    "IT": "iṭalī",
+    "JE": "jersī",
+    "JM": "jamaika",
+    "JO": "jorḍan",
+    "JP": "japan",
+    "KE": "kenya",
+    "KG": "kirgistan",
+    "KH": "kamboḍia",
+    "KI": "kiribaṭi",
+    "KM": "komoros",
+    "KN": "seint kiṭs āḍe nebis",
+    "KP": "uttar koriya",
+    "KR": "dkiṇ koriyaa",
+    "KW": "kuvet",
+    "KY": "keimen dīp",
+    "KZ": "kajakstan",
+    "LA": "laos",
+    "LB": "lebanon",
+    "LC": "seint lusiya",
+    "LI": "likṭensṭein",
+    "LK": "sri lanka",
+    "LR": "laiberīya",
+    "LS": "lesotho",
+    "LT": "liṭuaania",
+    "LU": "lksemborg",
+    "LV": "laṭviya",
+    "LY": "libya",
+    "MA": "morkko",
+    "MC": "monako",
+    "MD": "molḍovaa",
+    "ME": "monṭenegro",
+    "MF": "seint martin",
+    "MG": "madagascar",
+    "MH": "marsall dīp",
+    "MK": "uttar mesiḍoniya",
+    "ML": "mali",
+    "MM": "myanmar (brma)",
+    "MN": "mongolia",
+    "MO": "makao sar cina",
+    "MP": "uttar mariyana dīp",
+    "MQ": "marṭinik",
+    "MR": "mauriṭaniya",
+    "MS": "monṭserrarṭ",
+    "MT": "malṭaa",
+    "MU": "mauriss",
+    "MV": "māldīp",
+    "MW": "malavī",
+    "MX": "meksīko",
+    "MY": "maleseāā",
+    "MZ": "mojambik",
+    "NA": "namibia",
+    "NC": "nyu keleḍoniya",
+    "NE": "naījr",
+    "NF": "norpok dīp",
+    "NG": "naigeria",
+    "NI": "nikaraguaa",
+    "NL": "nederlanḍs",
+    "NO": "norvay",
+    "NP": "nepal",
+    "NR": "nauru",
+    "NU": "niyu",
+    "NZ": "nyu jīlanḍ",
+    "OM": "oman",
+    "PA": "panema",
+    "PE": "peru",
+    "PF": "prenc",
+    "PG": "papua nyu gini",
+    "PH": "pilippines",
+    "PK": "pakistan",
+    "PL": "polanḍ",
+    "PM": "seint pierri ande mikelon",
+    "PN": "piṭkarn dīp",
+    "PR": "puerto rico",
+    "PS": "palesṭiati handi",
+    "PT": "portugal",
+    "PW": "palau",
+    "PY": "pareguvai",
+    "QA": "katar",
+    "QO": "Outlying Oceania",
+    "RE": "riyuniyn",
+    "RO": "romaniya",
+    "RS": "serbia",
+    "RU": "russia",
+    "RW": "rvanḍa",
+    "SA": "saūdi arabiya",
+    "SB": "soloman dīp",
+    "SC": "siselles",
+    "SD": "suḍan",
+    "SE": "sviḍen",
+    "SG": "singapor",
+    "SH": "seint helena",
+    "SI": "slovenia",
+    "SJ": "svalbard aḍe jan mayen",
+    "SK": "slovakia",
+    "SL": "sierra leyon",
+    "SM": "san marino",
+    "SN": "senegal",
+    "SO": "somaliya",
+    "SR": "surīname",
+    "SS": "dkiṇ sūdan",
+    "ST": "sao tom aḍe prinsipe",
+    "SV": "el salvador",
+    "SX": "sint mārṭen",
+    "SY": "sīriya",
+    "SZ": "esvaṭini",
+    "TA": "Tristan da Cunha",
+    "TC": "turks aḍe keikes dīp",
+    "TD": "cad",
+    "TF": "prēnch dakiṇ teritorī",
+    "TG": "ṭogo",
+    "TH": "tailanḍ",
+    "TJ": "tajākīstān",
+    "TK": "ṭokelau",
+    "TL": "ṭimor - leste",
+    "TM": "turkmenīstān",
+    "TN": "ṭunisiaa",
+    "TO": "ṭonga",
+    "TR": "turkī",
+    "TT": "ṭriniḍaḍ aḍe ṭobego",
+    "TV": "tuvala",
+    "TW": "taivan",
+    "TZ": "ṭanjaniya",
+    "UA": "yūkrain",
+    "UG": "yūganḍa",
+    "UM": "yu.es. aautlaing dīp",
+    "UN": "United Nations",
+    "US": "yunaiṭeḍ stets",
+    "UY": "ūrugve",
+    "UZ": "ūjbekistaan",
+    "VA": "bāṭikān",
+    "VC": "seint vinseṇṭ aḍe grenaḍi",
+    "VE": "venejuela",
+    "VG": "briṭis vrjin dīp",
+    "VI": "yu.es. vrjin dīp",
+    "VN": "viyetnam",
+    "VU": "vanuaatu",
+    "WF": "vallis aḍe puṭuna",
+    "WS": "samoaa",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
+    "XK": "kosovo",
+    "YE": "yemen",
+    "YT": "mayoṭṭ",
+    "ZA": "dkīṇ aaprika",
+    "ZM": "jambiya",
+    "ZW": "jimbabve",
+    "ZZ": "Unknown Region"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Deva/dateformats.json b/js/data/locale/kxv/Deva/dateformats.json
new file mode 100644
index 0000000000..deccc90da4
--- /dev/null
+++ b/js/data/locale/kxv/Deva/dateformats.json
@@ -0,0 +1,122 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
+            "l": {
+                "f": "LLLL",
+                "l": "LLLL",
+                "m": "LLL",
+                "s": "LL"
+            },
+            "m": {
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "order": "{date} {time}",
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            }
+        },
+        "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Deva/list.json b/js/data/locale/kxv/Deva/list.json
new file mode 100644
index 0000000000..103fd1d32b
--- /dev/null
+++ b/js/data/locale/kxv/Deva/list.json
@@ -0,0 +1,46 @@
+{
+    "or": {
+        "full": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        },
+        "long": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        },
+        "medium": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        },
+        "short": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        }
+    },
+    "standard": {
+        "full": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "long": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "medium": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "short": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        }
+    },
+    "unit": {
+        "short": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}",
+            "middle": "{0}, {1}",
+            "start": "{0}, {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Deva/numfmt.jf b/js/data/locale/kxv/Deva/numfmt.jf
new file mode 100644
index 0000000000..1d335591c5
--- /dev/null
+++ b/js/data/locale/kxv/Deva/numfmt.jf
@@ -0,0 +1,22 @@
+{
+    "generated": true,
+    "native_numfmt": {
+        "currencyFormats": {
+            "common": "{s}{n}",
+            "commonNegative": "-{s}{n}"
+        },
+        "decimalChar": ".",
+        "digits": "०१२३४५६७८९",
+        "exponential": "E",
+        "groupChar": ",",
+        "negativenumFmt": "-{n}",
+        "negativepctFmt": "-{n}%",
+        "pctChar": "%",
+        "pctFmt": "{n}%",
+        "prigroupSize": 3,
+        "roundingMode": "halfdown",
+        "script": "Deva",
+        "secgroupSize": 2,
+        "useNative": true
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Deva/sysres.json b/js/data/locale/kxv/Deva/sysres.json
new file mode 100644
index 0000000000..6aebc3f293
--- /dev/null
+++ b/js/data/locale/kxv/Deva/sysres.json
@@ -0,0 +1,160 @@
+{
+    "E0": "S",
+    "E1": "M",
+    "E2": "T",
+    "E3": "W",
+    "E4": "T",
+    "E5": "F",
+    "E6": "S",
+    "EE0": "आदि वारा",
+    "EE1": "साॅम्वारा",
+    "EE2": "मंगाड़ा",
+    "EE3": "पुद्दारा",
+    "EE4": "लाक्कि वारा",
+    "EE5": "सुकुरु वारा",
+    "EE6": "सान्नि वारा",
+    "EEE0": "आदि वारा",
+    "EEE1": "साॅम्वारा",
+    "EEE2": "मंगाड़ा",
+    "EEE3": "पुद्दारा",
+    "EEE4": "लाक्कि वारा",
+    "EEE5": "सुकुरु वारा",
+    "EEE6": "सान्नि वारा",
+    "EEEE0": "आदि वारा",
+    "EEEE1": "साॅम्वारा",
+    "EEEE2": "मंगाड़ा",
+    "EEEE3": "पुद्दारा",
+    "EEEE4": "लाक्कि वारा",
+    "EEEE5": "सुकुरु वारा",
+    "EEEE6": "सान्नि वारा",
+    "G-1": "BCE",
+    "G1": "CE",
+    "L1": "1",
+    "L10": "10",
+    "L11": "11",
+    "L12": "12",
+    "L2": "2",
+    "L3": "3",
+    "L4": "4",
+    "L5": "5",
+    "L6": "6",
+    "L7": "7",
+    "L8": "8",
+    "L9": "9",
+    "LL1": "पु",
+    "LL10": "दस",
+    "LL11": "दि",
+    "LL12": "पा",
+    "LL2": "मा",
+    "LL3": "पा",
+    "LL4": "हि",
+    "LL5": "बे",
+    "LL6": "जा",
+    "LL7": "आस",
+    "LL8": "स्",
+    "LL9": "बो",
+    "LLL1": "पुसु लेञ्जु",
+    "LLL10": "दसारा लेञ्जु",
+    "LLL11": "दिवी लेञ्जु",
+    "LLL12": "पान्डे लेञ्जु",
+    "LLL2": "माहाका लेञ्जु",
+    "LLL3": "पागुणी लेञ्जु",
+    "LLL4": "हिरे लेञ्जु",
+    "LLL5": "बेसे लेञ्जु",
+    "LLL6": "जाटा लेञ्जु",
+    "LLL7": "आसाड़ी लेञ्जु",
+    "LLL8": "स्राबाँ लेञ्जु",
+    "LLL9": "बोदो लेञ्जु",
+    "LLLL1": "पुसु लेञ्जु",
+    "LLLL10": "दसारा लेञ्जु",
+    "LLLL11": "दिवी लेञ्जु",
+    "LLLL12": "पान्डे लेञ्जु",
+    "LLLL2": "माहाका लेञ्जु",
+    "LLLL3": "पागुणी लेञ्जु",
+    "LLLL4": "हिरे लेञ्जु",
+    "LLLL5": "बेसे लेञ्जु",
+    "LLLL6": "जाटा लेञ्जु",
+    "LLLL7": "आसाड़ी लेञ्जु",
+    "LLLL8": "स्राबाँ लेञ्जु",
+    "LLLL9": "बोदो लेञ्जु",
+    "MMM1": "पुसु लेञ्जु",
+    "MMM10": "दसारा लेञ्जु",
+    "MMM11": "दिवी लेञ्जु",
+    "MMM12": "पान्डे लेञ्जु",
+    "MMM2": "माहाका लेञ्जु",
+    "MMM3": "पागुणी लेञ्जु",
+    "MMM4": "हिरे लेञ्जु",
+    "MMM5": "बेसे लेञ्जु",
+    "MMM6": "जाटा लेञ्जु",
+    "MMM7": "आसाड़ी लेञ्जु",
+    "MMM8": "स्राबाँ लेञ्जु",
+    "MMM9": "बोदो लेञ्जु",
+    "MMMM1": "पुसु लेञ्जु",
+    "MMMM10": "दसारा लेञ्जु",
+    "MMMM11": "दिवी लेञ्जु",
+    "MMMM12": "पान्डे लेञ्जु",
+    "MMMM2": "माहाका लेञ्जु",
+    "MMMM3": "पागुणी लेञ्जु",
+    "MMMM4": "हिरे लेञ्जु",
+    "MMMM5": "बेसे लेञ्जु",
+    "MMMM6": "जाटा लेञ्जु",
+    "MMMM7": "आसाड़ी लेञ्जु",
+    "MMMM8": "स्राबाँ लेञ्जु",
+    "MMMM9": "बोदो लेञ्जु",
+    "N1": "प",
+    "N10": "द",
+    "N11": "द",
+    "N12": "प",
+    "N2": "म",
+    "N3": "प",
+    "N4": "ह",
+    "N5": "ब",
+    "N6": "ज",
+    "N7": "आ",
+    "N8": "स",
+    "N9": "ब",
+    "NN1": "पु",
+    "NN10": "दस",
+    "NN11": "दि",
+    "NN12": "पा",
+    "NN2": "मा",
+    "NN3": "पा",
+    "NN4": "हि",
+    "NN5": "बे",
+    "NN6": "जा",
+    "NN7": "आस",
+    "NN8": "स्",
+    "NN9": "बो",
+    "a0": "ए एम",
+    "a1": "पी एम",
+    "c0": "S",
+    "c1": "M",
+    "c2": "T",
+    "c3": "W",
+    "c4": "T",
+    "c5": "F",
+    "c6": "S",
+    "cc0": "आदि वारा",
+    "cc1": "साॅम्वारा",
+    "cc2": "मंगाड़ा",
+    "cc3": "पुद्दारा",
+    "cc4": "लाक्कि वारा",
+    "cc5": "सुकुरु वारा",
+    "cc6": "सान्नि वारा",
+    "ccc0": "आदि वारा",
+    "ccc1": "साॅम्वारा",
+    "ccc2": "मंगाड़ा",
+    "ccc3": "पुद्दारा",
+    "ccc4": "लाक्कि वारा",
+    "ccc5": "सुकुरु वारा",
+    "ccc6": "सान्नि वारा",
+    "cccc0": "आदि वारा",
+    "cccc1": "साॅम्वारा",
+    "cccc2": "मंगाड़ा",
+    "cccc3": "पुद्दारा",
+    "cccc4": "लाक्कि वारा",
+    "cccc5": "सुकुरु वारा",
+    "cccc6": "सान्नि वारा",
+    "finalSeparatorShort": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Latn/ctrynames.json b/js/data/locale/kxv/Latn/ctrynames.json
new file mode 100644
index 0000000000..2149dda647
--- /dev/null
+++ b/js/data/locale/kxv/Latn/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "aail āp man": "IM",
+    "aanḍiti arab emireṭs": "AE",
+    "aapganistan": "AF",
+    "aarhenṭina": "AR",
+    "aarmenia": "AM",
+    "aayarlanḍ": "IE",
+    "Africa": "002",
+    "aislanḍ": "IS",
+    "ajerbaijan": "AZ",
+    "albania": "AL",
+    "aljīriaa": "DZ",
+    "Americas": "019",
+    "amerikati samva": "AS",
+    "ānḍorā": "AD",
+    "angola": "AO",
+    "anguila": "AI",
+    "ānṭarkṭikā": "AQ",
+    "aruba": "AW",
+    "Ascension Island": "AC",
+    "Asia": "142",
+    "astrelia": "AU",
+    "Australasia": "053",
+    "austria": "AT",
+    "bāhāmās": "BS",
+    "bajnia aḍe hertsegovina": "BA",
+    "banglades": "BD",
+    "barbaḍos": "BB",
+    "bāren": "BH",
+    "bāṭikān": "VA",
+    "belarūs": "BY",
+    "belīj": "BZ",
+    "beljiym": "BE",
+    "benīn": "BJ",
+    "bermuḍā": "BM",
+    "boliviā": "BO",
+    "boṭsvana": "BW",
+    "Bouvet Island": "BV",
+    "brājil": "BR",
+    "briṭis inḍiāti samudra handi": "IO",
+    "briṭis vrjin dīp": "VG",
+    "brunae": "BN",
+    "bulgaria": "BG",
+    "burkina paso": "BF",
+    "buruṇḍī": "BI",
+    "buṭān": "BT",
+    "cad": "TD",
+    "caina": "CN",
+    "Caribbean": "029",
+    "cekiya": "CZ",
+    "Central America": "013",
+    "Central Asia": "143",
+    "cili": "CL",
+    "Clipperton Island": "CP",
+    "dakiṇ jārjiā aḍe dakiṇ sandwich dīp": "GS",
+    "ḍenmark": "DK",
+    "ḍiego garsia": "DG",
+    "dkīṇ aaprika": "ZA",
+    "dkiṇ koriyaa": "KR",
+    "dkiṇ sūdan": "SS",
+    "dominika": "DM",
+    "dominikan republik": "DO",
+    "Eastern Africa": "014",
+    "Eastern Asia": "030",
+    "Eastern Europe": "151",
+    "ekvaḍor": "EC",
+    "el salvador": "SV",
+    "eleṇḍ dīp": "AX",
+    "eṇṭigaa aḍe barbuḍaa": "AG",
+    "esṭoniya": "EE",
+    "esvaṭini": "SZ",
+    "Europe": "150",
+    "European Union": "EU",
+    "Eurozone": "EZ",
+    "gambia": "GM",
+    "gana": "GH",
+    "gbon": "GA",
+    "gini": "GN",
+    "gini-bisau": "GW",
+    "graneida": "GD",
+    "grīnlanḍ": "GL",
+    "grīs": "GR",
+    "grnse": "GG",
+    "guām": "GU",
+    "guyana": "GY",
+    "gvadelup": "GP",
+    "gvaṭemala": "GT",
+    "haiti": "HT",
+    "Heard & McDonald Islands": "HM",
+    "honḍuras": "HN",
+    "hong kong (sar) caina": "HK",
+    "hungarī": "HU",
+    "ījipṭ": "EG",
+    "ikveṭorial gini": "GQ",
+    "inḍiā": "IN",
+    "inḍonesiya": "ID",
+    "irak": "IQ",
+    "iran": "IR",
+    "īriṭriaa": "ER",
+    "israel": "IL",
+    "iṭalī": "IT",
+    "ītiyopiya": "ET",
+    "jamaika": "JM",
+    "jambiya": "ZM",
+    "japan": "JP",
+    "jbralṭr": "GI",
+    "jeorjiaa": "GE",
+    "jermanī": "DE",
+    "jersī": "JE",
+    "jibutī": "DJ",
+    "jimbabve": "ZW",
+    "jorḍan": "JO",
+    "kajakstan": "KZ",
+    "kamboḍia": "KH",
+    "kanaḍa": "CA",
+    "kanari dīp": "IC",
+    "karibiyn nedrlends": "BQ",
+    "katar": "QA",
+    "keimen dīp": "KY",
+    "kemarun": "CM",
+    "kenya": "KE",
+    "kep vrḍi": "CV",
+    "kirgistan": "KG",
+    "kiribaṭi": "KI",
+    "kokos keling dīp": "CC",
+    "kolmbiaa": "CO",
+    "komoros": "KM",
+    "kongo - brajavil": "CG",
+    "kongo - kinsasa": "CD",
+    "kosovo": "XK",
+    "kosta rika": "CR",
+    "koṭ ḍi vaa": "CI",
+    "kristmas dīp": "CX",
+    "kroesia": "HR",
+    "kuk dīp": "CK",
+    "kuvet": "KW",
+    "kyuba": "CU",
+    "kyurasao": "CW",
+    "laiberīya": "LR",
+    "laos": "LA",
+    "laṭin amerika": "419",
+    "laṭviya": "LV",
+    "lebanon": "LB",
+    "lesotho": "LS",
+    "libya": "LY",
+    "likṭensṭein": "LI",
+    "liṭuaania": "LT",
+    "lksemborg": "LU",
+    "madagascar": "MG",
+    "madini aaprika republik": "CF",
+    "makao sar cina": "MO",
+    "malavī": "MW",
+    "māldīp": "MV",
+    "maleseāā": "MY",
+    "mali": "ML",
+    "malṭaa": "MT",
+    "marsall dīp": "MH",
+    "marṭinik": "MQ",
+    "mauriss": "MU",
+    "mauriṭaniya": "MR",
+    "mayoṭṭ": "YT",
+    "meksīko": "MX",
+    "Melanesia": "054",
+    "micronesiaa": "FM",
+    "Micronesian Region": "057",
+    "Middle Africa": "017",
+    "mojambik": "MZ",
+    "molḍovaa": "MD",
+    "monako": "MC",
+    "mongolia": "MN",
+    "monṭenegro": "ME",
+    "monṭserrarṭ": "MS",
+    "morkko": "MA",
+    "myanmar (brma)": "MM",
+    "naigeria": "NG",
+    "naījr": "NE",
+    "namibia": "NA",
+    "nauru": "NR",
+    "nederlanḍs": "NL",
+    "nepal": "NP",
+    "nikaraguaa": "NI",
+    "niyu": "NU",
+    "norpok dīp": "NF",
+    "North America": "003",
+    "Northern Africa": "015",
+    "Northern America": "021",
+    "Northern Europe": "154",
+    "norvay": "NO",
+    "nyu jīlanḍ": "NZ",
+    "nyu keleḍoniya": "NC",
+    "Oceania": "009",
+    "oman": "OM",
+    "Outlying Oceania": "QO",
+    "pakistan": "PK",
+    "paklaṇd dīp": "FK",
+    "palau": "PW",
+    "palesṭiati handi": "PS",
+    "panema": "PA",
+    "papua nyu gini": "PG",
+    "pareguvai": "PY",
+    "pēro dīp": "FO",
+    "peru": "PE",
+    "piji": "FJ",
+    "pilippines": "PH",
+    "pinlaṇd": "FI",
+    "piṭkarn dīp": "PN",
+    "polanḍ": "PL",
+    "Polynesia": "061",
+    "portugal": "PT",
+    "prans": "FR",
+    "prenc": "PF",
+    "prenc guiyana": "GF",
+    "prēnch dakiṇ teritorī": "TF",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
+    "puerto rico": "PR",
+    "raji, purti": "001",
+    "riyuniyn": "RE",
+    "romaniya": "RO",
+    "russia": "RU",
+    "rvanḍa": "RW",
+    "saipras": "CY",
+    "samoaa": "WS",
+    "san marino": "SM",
+    "sao tom aḍe prinsipe": "ST",
+    "Sark": "CQ",
+    "saūdi arabiya": "SA",
+    "se barṭelemi": "BL",
+    "seint helena": "SH",
+    "seint kiṭs āḍe nebis": "KN",
+    "seint lusiya": "LC",
+    "seint martin": "MF",
+    "seint pierri ande mikelon": "PM",
+    "seint vinseṇṭ aḍe grenaḍi": "VC",
+    "senegal": "SN",
+    "serbia": "RS",
+    "seuṭa aḍe melila": "EA",
+    "sierra leyon": "SL",
+    "singapor": "SG",
+    "sint mārṭen": "SX",
+    "sīriya": "SY",
+    "siselles": "SC",
+    "slovakia": "SK",
+    "slovenia": "SI",
+    "soloman dīp": "SB",
+    "somaliya": "SO",
+    "South America": "005",
+    "Southeast Asia": "035",
+    "Southern Africa": "018",
+    "Southern Asia": "034",
+    "Southern Europe": "039",
+    "spein": "ES",
+    "sri lanka": "LK",
+    "Sub-Saharan Africa": "202",
+    "suḍan": "SD",
+    "surīname": "SR",
+    "svalbard aḍe jan mayen": "SJ",
+    "sviḍen": "SE",
+    "svitjerlaṇḍ": "CH",
+    "tailanḍ": "TH",
+    "taivan": "TW",
+    "tajākīstān": "TJ",
+    "ṭanjaniya": "TZ",
+    "ṭimor - leste": "TL",
+    "ṭogo": "TG",
+    "ṭokelau": "TK",
+    "ṭonga": "TO",
+    "ṭriniḍaḍ aḍe ṭobego": "TT",
+    "Tristan da Cunha": "TA",
+    "ṭunisiaa": "TN",
+    "turkī": "TR",
+    "turkmenīstān": "TM",
+    "turks aḍe keikes dīp": "TC",
+    "tuvala": "TV",
+    "ūjbekistaan": "UZ",
+    "uniṭeḍ kingḍom": "GB",
+    "United Nations": "UN",
+    "Unknown Region": "ZZ",
+    "ūrugve": "UY",
+    "uttar koriya": "KP",
+    "uttar mariyana dīp": "MP",
+    "uttar mesiḍoniya": "MK",
+    "vallis aḍe puṭuna": "WF",
+    "vanuaatu": "VU",
+    "vedakuṇpu sahara": "EH",
+    "venejuela": "VE",
+    "viyetnam": "VN",
+    "Western Africa": "011",
+    "Western Asia": "145",
+    "Western Europe": "155",
+    "yemen": "YE",
+    "yu.es. aautlaing dīp": "UM",
+    "yu.es. vrjin dīp": "VI",
+    "yūganḍa": "UG",
+    "yūkrain": "UA",
+    "yunaiṭeḍ stets": "US"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Latn/ctryreverse.json b/js/data/locale/kxv/Latn/ctryreverse.json
new file mode 100644
index 0000000000..6d7e0dc400
--- /dev/null
+++ b/js/data/locale/kxv/Latn/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "raji, purti",
+    "002": "Africa",
+    "003": "North America",
+    "005": "South America",
+    "009": "Oceania",
+    "011": "Western Africa",
+    "013": "Central America",
+    "014": "Eastern Africa",
+    "015": "Northern Africa",
+    "017": "Middle Africa",
+    "018": "Southern Africa",
+    "019": "Americas",
+    "021": "Northern America",
+    "029": "Caribbean",
+    "030": "Eastern Asia",
+    "034": "Southern Asia",
+    "035": "Southeast Asia",
+    "039": "Southern Europe",
+    "053": "Australasia",
+    "054": "Melanesia",
+    "057": "Micronesian Region",
+    "061": "Polynesia",
+    "142": "Asia",
+    "143": "Central Asia",
+    "145": "Western Asia",
+    "150": "Europe",
+    "151": "Eastern Europe",
+    "154": "Northern Europe",
+    "155": "Western Europe",
+    "202": "Sub-Saharan Africa",
+    "419": "laṭin amerika",
+    "AC": "Ascension Island",
+    "AD": "ānḍorā",
+    "AE": "aanḍiti arab emireṭs",
+    "AF": "aapganistan",
+    "AG": "eṇṭigaa aḍe barbuḍaa",
+    "AI": "anguila",
+    "AL": "albania",
+    "AM": "aarmenia",
+    "AO": "angola",
+    "AQ": "ānṭarkṭikā",
+    "AR": "aarhenṭina",
+    "AS": "amerikati samva",
+    "AT": "austria",
+    "AU": "astrelia",
+    "AW": "aruba",
+    "AX": "eleṇḍ dīp",
+    "AZ": "ajerbaijan",
+    "BA": "bajnia aḍe hertsegovina",
+    "BB": "barbaḍos",
+    "BD": "banglades",
+    "BE": "beljiym",
+    "BF": "burkina paso",
+    "BG": "bulgaria",
+    "BH": "bāren",
+    "BI": "buruṇḍī",
+    "BJ": "benīn",
+    "BL": "se barṭelemi",
+    "BM": "bermuḍā",
+    "BN": "brunae",
+    "BO": "boliviā",
+    "BQ": "karibiyn nedrlends",
+    "BR": "brājil",
+    "BS": "bāhāmās",
+    "BT": "buṭān",
+    "BV": "Bouvet Island",
+    "BW": "boṭsvana",
+    "BY": "belarūs",
+    "BZ": "belīj",
+    "CA": "kanaḍa",
+    "CC": "kokos keling dīp",
+    "CD": "kongo - kinsasa",
+    "CF": "madini aaprika republik",
+    "CG": "kongo - brajavil",
+    "CH": "svitjerlaṇḍ",
+    "CI": "koṭ ḍi vaa",
+    "CK": "kuk dīp",
+    "CL": "cili",
+    "CM": "kemarun",
+    "CN": "caina",
+    "CO": "kolmbiaa",
+    "CP": "Clipperton Island",
+    "CQ": "Sark",
+    "CR": "kosta rika",
+    "CU": "kyuba",
+    "CV": "kep vrḍi",
+    "CW": "kyurasao",
+    "CX": "kristmas dīp",
+    "CY": "saipras",
+    "CZ": "cekiya",
+    "DE": "jermanī",
+    "DG": "ḍiego garsia",
+    "DJ": "jibutī",
+    "DK": "ḍenmark",
+    "DM": "dominika",
+    "DO": "dominikan republik",
+    "DZ": "aljīriaa",
+    "EA": "seuṭa aḍe melila",
+    "EC": "ekvaḍor",
+    "EE": "esṭoniya",
+    "EG": "ījipṭ",
+    "EH": "vedakuṇpu sahara",
+    "ER": "īriṭriaa",
+    "ES": "spein",
+    "ET": "ītiyopiya",
+    "EU": "European Union",
+    "EZ": "Eurozone",
+    "FI": "pinlaṇd",
+    "FJ": "piji",
+    "FK": "paklaṇd dīp",
+    "FM": "micronesiaa",
+    "FO": "pēro dīp",
+    "FR": "prans",
+    "GA": "gbon",
+    "GB": "uniṭeḍ kingḍom",
+    "GD": "graneida",
+    "GE": "jeorjiaa",
+    "GF": "prenc guiyana",
+    "GG": "grnse",
+    "GH": "gana",
+    "GI": "jbralṭr",
+    "GL": "grīnlanḍ",
+    "GM": "gambia",
+    "GN": "gini",
+    "GP": "gvadelup",
+    "GQ": "ikveṭorial gini",
+    "GR": "grīs",
+    "GS": "dakiṇ jārjiā aḍe dakiṇ sandwich dīp",
+    "GT": "gvaṭemala",
+    "GU": "guām",
+    "GW": "gini-bisau",
+    "GY": "guyana",
+    "HK": "hong kong (sar) caina",
+    "HM": "Heard & McDonald Islands",
+    "HN": "honḍuras",
+    "HR": "kroesia",
+    "HT": "haiti",
+    "HU": "hungarī",
+    "IC": "kanari dīp",
+    "ID": "inḍonesiya",
+    "IE": "aayarlanḍ",
+    "IL": "israel",
+    "IM": "aail āp man",
+    "IN": "inḍiā",
+    "IO": "briṭis inḍiāti samudra handi",
+    "IQ": "irak",
+    "IR": "iran",
+    "IS": "aislanḍ",
+    "IT": "iṭalī",
+    "JE": "jersī",
+    "JM": "jamaika",
+    "JO": "jorḍan",
+    "JP": "japan",
+    "KE": "kenya",
+    "KG": "kirgistan",
+    "KH": "kamboḍia",
+    "KI": "kiribaṭi",
+    "KM": "komoros",
+    "KN": "seint kiṭs āḍe nebis",
+    "KP": "uttar koriya",
+    "KR": "dkiṇ koriyaa",
+    "KW": "kuvet",
+    "KY": "keimen dīp",
+    "KZ": "kajakstan",
+    "LA": "laos",
+    "LB": "lebanon",
+    "LC": "seint lusiya",
+    "LI": "likṭensṭein",
+    "LK": "sri lanka",
+    "LR": "laiberīya",
+    "LS": "lesotho",
+    "LT": "liṭuaania",
+    "LU": "lksemborg",
+    "LV": "laṭviya",
+    "LY": "libya",
+    "MA": "morkko",
+    "MC": "monako",
+    "MD": "molḍovaa",
+    "ME": "monṭenegro",
+    "MF": "seint martin",
+    "MG": "madagascar",
+    "MH": "marsall dīp",
+    "MK": "uttar mesiḍoniya",
+    "ML": "mali",
+    "MM": "myanmar (brma)",
+    "MN": "mongolia",
+    "MO": "makao sar cina",
+    "MP": "uttar mariyana dīp",
+    "MQ": "marṭinik",
+    "MR": "mauriṭaniya",
+    "MS": "monṭserrarṭ",
+    "MT": "malṭaa",
+    "MU": "mauriss",
+    "MV": "māldīp",
+    "MW": "malavī",
+    "MX": "meksīko",
+    "MY": "maleseāā",
+    "MZ": "mojambik",
+    "NA": "namibia",
+    "NC": "nyu keleḍoniya",
+    "NE": "naījr",
+    "NF": "norpok dīp",
+    "NG": "naigeria",
+    "NI": "nikaraguaa",
+    "NL": "nederlanḍs",
+    "NO": "norvay",
+    "NP": "nepal",
+    "NR": "nauru",
+    "NU": "niyu",
+    "NZ": "nyu jīlanḍ",
+    "OM": "oman",
+    "PA": "panema",
+    "PE": "peru",
+    "PF": "prenc",
+    "PG": "papua nyu gini",
+    "PH": "pilippines",
+    "PK": "pakistan",
+    "PL": "polanḍ",
+    "PM": "seint pierri ande mikelon",
+    "PN": "piṭkarn dīp",
+    "PR": "puerto rico",
+    "PS": "palesṭiati handi",
+    "PT": "portugal",
+    "PW": "palau",
+    "PY": "pareguvai",
+    "QA": "katar",
+    "QO": "Outlying Oceania",
+    "RE": "riyuniyn",
+    "RO": "romaniya",
+    "RS": "serbia",
+    "RU": "russia",
+    "RW": "rvanḍa",
+    "SA": "saūdi arabiya",
+    "SB": "soloman dīp",
+    "SC": "siselles",
+    "SD": "suḍan",
+    "SE": "sviḍen",
+    "SG": "singapor",
+    "SH": "seint helena",
+    "SI": "slovenia",
+    "SJ": "svalbard aḍe jan mayen",
+    "SK": "slovakia",
+    "SL": "sierra leyon",
+    "SM": "san marino",
+    "SN": "senegal",
+    "SO": "somaliya",
+    "SR": "surīname",
+    "SS": "dkiṇ sūdan",
+    "ST": "sao tom aḍe prinsipe",
+    "SV": "el salvador",
+    "SX": "sint mārṭen",
+    "SY": "sīriya",
+    "SZ": "esvaṭini",
+    "TA": "Tristan da Cunha",
+    "TC": "turks aḍe keikes dīp",
+    "TD": "cad",
+    "TF": "prēnch dakiṇ teritorī",
+    "TG": "ṭogo",
+    "TH": "tailanḍ",
+    "TJ": "tajākīstān",
+    "TK": "ṭokelau",
+    "TL": "ṭimor - leste",
+    "TM": "turkmenīstān",
+    "TN": "ṭunisiaa",
+    "TO": "ṭonga",
+    "TR": "turkī",
+    "TT": "ṭriniḍaḍ aḍe ṭobego",
+    "TV": "tuvala",
+    "TW": "taivan",
+    "TZ": "ṭanjaniya",
+    "UA": "yūkrain",
+    "UG": "yūganḍa",
+    "UM": "yu.es. aautlaing dīp",
+    "UN": "United Nations",
+    "US": "yunaiṭeḍ stets",
+    "UY": "ūrugve",
+    "UZ": "ūjbekistaan",
+    "VA": "bāṭikān",
+    "VC": "seint vinseṇṭ aḍe grenaḍi",
+    "VE": "venejuela",
+    "VG": "briṭis vrjin dīp",
+    "VI": "yu.es. vrjin dīp",
+    "VN": "viyetnam",
+    "VU": "vanuaatu",
+    "WF": "vallis aḍe puṭuna",
+    "WS": "samoaa",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
+    "XK": "kosovo",
+    "YE": "yemen",
+    "YT": "mayoṭṭ",
+    "ZA": "dkīṇ aaprika",
+    "ZM": "jambiya",
+    "ZW": "jimbabve",
+    "ZZ": "Unknown Region"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Latn/dateformats.json b/js/data/locale/kxv/Latn/dateformats.json
new file mode 100644
index 0000000000..75571b2bc8
--- /dev/null
+++ b/js/data/locale/kxv/Latn/dateformats.json
@@ -0,0 +1,18 @@
+{
+    "gregorian": {
+        "date": {
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
+            "l": {
+                "f": "LLLL",
+                "l": "LLLL",
+                "m": "LLL",
+                "s": "L"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Latn/sysres.json b/js/data/locale/kxv/Latn/sysres.json
new file mode 100644
index 0000000000..c85d00b77e
--- /dev/null
+++ b/js/data/locale/kxv/Latn/sysres.json
@@ -0,0 +1,78 @@
+{
+    "L1": "pu",
+    "L10": "da",
+    "L11": "di",
+    "L12": "pa",
+    "L2": "ma",
+    "L3": "pa",
+    "L4": "hi",
+    "L5": "be",
+    "L6": "ja",
+    "L7": "aa",
+    "L8": "sra",
+    "L9": "b",
+    "LL1": "pu",
+    "LL10": "da",
+    "LL11": "di",
+    "LL12": "pa",
+    "LL2": "ma",
+    "LL3": "pa",
+    "LL4": "hi",
+    "LL5": "be",
+    "LL6": "ja",
+    "LL7": "aa",
+    "LL8": "sr",
+    "LL9": "ba",
+    "LLL1": "pusu",
+    "LLL10": "dasara",
+    "LLL11": "divi",
+    "LLL12": "pande",
+    "LLL2": "maha",
+    "LLL3": "pagu",
+    "LLL4": "hire",
+    "LLL5": "bese",
+    "LLL6": "jaṭṭa",
+    "LLL7": "aasaḍi",
+    "LLL8": "srabĩ",
+    "LLL9": "bado",
+    "LLLL1": "pusu lenju",
+    "LLLL10": "dasara lenju",
+    "LLLL11": "divi lenju",
+    "LLLL12": "pande lenju",
+    "LLLL2": "maha lenju",
+    "LLLL3": "pagu lenju",
+    "LLLL4": "hire lenju",
+    "LLLL5": "bese lenju",
+    "LLLL6": "jaṭṭa lenju",
+    "LLLL7": "aasaḍi lenju",
+    "LLLL8": "srabĩ lenju",
+    "LLLL9": "bado lenju",
+    "c0": "aa",
+    "c1": "s",
+    "c2": "ma",
+    "c3": "pu",
+    "c4": "la",
+    "c5": "su",
+    "c6": "sa",
+    "cc0": "aa",
+    "cc1": "s",
+    "cc2": "ma",
+    "cc3": "pu",
+    "cc4": "laki",
+    "cc5": "su",
+    "cc6": "sa",
+    "ccc0": "aadi",
+    "ccc1": "smba",
+    "ccc2": "manga",
+    "ccc3": "puda",
+    "ccc4": "laki",
+    "ccc5": "sukru",
+    "ccc6": "sani",
+    "cccc0": "aadi vara",
+    "cccc1": "smbara",
+    "cccc2": "mangaḍa",
+    "cccc3": "pudara",
+    "cccc4": "laki vara",
+    "cccc5": "sukru vara",
+    "cccc6": "sani vara"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Orya/ctrynames.json b/js/data/locale/kxv/Orya/ctrynames.json
new file mode 100644
index 0000000000..dfbc247729
--- /dev/null
+++ b/js/data/locale/kxv/Orya/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "aail āp man": "IM",
+    "aanḍiti arab emireṭs": "AE",
+    "aapganistan": "AF",
+    "aarhenṭina": "AR",
+    "aarmenia": "AM",
+    "aayarlanḍ": "IE",
+    "Africa": "002",
+    "aislanḍ": "IS",
+    "ajerbaijan": "AZ",
+    "albania": "AL",
+    "aljīriaa": "DZ",
+    "Americas": "019",
+    "amerikati samva": "AS",
+    "ānḍorā": "AD",
+    "angola": "AO",
+    "anguila": "AI",
+    "ānṭarkṭikā": "AQ",
+    "aruba": "AW",
+    "Ascension Island": "AC",
+    "Asia": "142",
+    "astrelia": "AU",
+    "Australasia": "053",
+    "austria": "AT",
+    "bāhāmās": "BS",
+    "bajnia aḍe hertsegovina": "BA",
+    "banglades": "BD",
+    "barbaḍos": "BB",
+    "bāren": "BH",
+    "bāṭikān": "VA",
+    "belarūs": "BY",
+    "belīj": "BZ",
+    "beljiym": "BE",
+    "benīn": "BJ",
+    "bermuḍā": "BM",
+    "boliviā": "BO",
+    "boṭsvana": "BW",
+    "Bouvet Island": "BV",
+    "brājil": "BR",
+    "briṭis inḍiāti samudra handi": "IO",
+    "briṭis vrjin dīp": "VG",
+    "brunae": "BN",
+    "bulgaria": "BG",
+    "burkina paso": "BF",
+    "buruṇḍī": "BI",
+    "buṭān": "BT",
+    "cad": "TD",
+    "caina": "CN",
+    "Caribbean": "029",
+    "cekiya": "CZ",
+    "Central America": "013",
+    "Central Asia": "143",
+    "cili": "CL",
+    "Clipperton Island": "CP",
+    "dakiṇ jārjiā aḍe dakiṇ sandwich dīp": "GS",
+    "ḍenmark": "DK",
+    "ḍiego garsia": "DG",
+    "dkīṇ aaprika": "ZA",
+    "dkiṇ koriyaa": "KR",
+    "dkiṇ sūdan": "SS",
+    "dominika": "DM",
+    "dominikan republik": "DO",
+    "Eastern Africa": "014",
+    "Eastern Asia": "030",
+    "Eastern Europe": "151",
+    "ekvaḍor": "EC",
+    "el salvador": "SV",
+    "eleṇḍ dīp": "AX",
+    "eṇṭigaa aḍe barbuḍaa": "AG",
+    "esṭoniya": "EE",
+    "esvaṭini": "SZ",
+    "Europe": "150",
+    "European Union": "EU",
+    "Eurozone": "EZ",
+    "gambia": "GM",
+    "gana": "GH",
+    "gbon": "GA",
+    "gini": "GN",
+    "gini-bisau": "GW",
+    "graneida": "GD",
+    "grīnlanḍ": "GL",
+    "grīs": "GR",
+    "grnse": "GG",
+    "guām": "GU",
+    "guyana": "GY",
+    "gvadelup": "GP",
+    "gvaṭemala": "GT",
+    "haiti": "HT",
+    "Heard & McDonald Islands": "HM",
+    "honḍuras": "HN",
+    "hong kong (sar) caina": "HK",
+    "hungarī": "HU",
+    "ījipṭ": "EG",
+    "ikveṭorial gini": "GQ",
+    "inḍonesiya": "ID",
+    "irak": "IQ",
+    "iran": "IR",
+    "īriṭriaa": "ER",
+    "israel": "IL",
+    "iṭalī": "IT",
+    "ītiyopiya": "ET",
+    "jamaika": "JM",
+    "jambiya": "ZM",
+    "japan": "JP",
+    "jbralṭr": "GI",
+    "jeorjiaa": "GE",
+    "jermanī": "DE",
+    "jersī": "JE",
+    "jibutī": "DJ",
+    "jimbabve": "ZW",
+    "jorḍan": "JO",
+    "kajakstan": "KZ",
+    "kamboḍia": "KH",
+    "kanaḍa": "CA",
+    "kanari dīp": "IC",
+    "karibiyn nedrlends": "BQ",
+    "katar": "QA",
+    "keimen dīp": "KY",
+    "kemarun": "CM",
+    "kenya": "KE",
+    "kep vrḍi": "CV",
+    "kirgistan": "KG",
+    "kiribaṭi": "KI",
+    "kokos keling dīp": "CC",
+    "kolmbiaa": "CO",
+    "komoros": "KM",
+    "kongo - brajavil": "CG",
+    "kongo - kinsasa": "CD",
+    "kosovo": "XK",
+    "kosta rika": "CR",
+    "koṭ ḍi vaa": "CI",
+    "kristmas dīp": "CX",
+    "kroesia": "HR",
+    "kuk dīp": "CK",
+    "kuvet": "KW",
+    "kyuba": "CU",
+    "kyurasao": "CW",
+    "laiberīya": "LR",
+    "laos": "LA",
+    "laṭin amerika": "419",
+    "laṭviya": "LV",
+    "lebanon": "LB",
+    "lesotho": "LS",
+    "libya": "LY",
+    "likṭensṭein": "LI",
+    "liṭuaania": "LT",
+    "lksemborg": "LU",
+    "madagascar": "MG",
+    "madini aaprika republik": "CF",
+    "makao sar cina": "MO",
+    "malavī": "MW",
+    "māldīp": "MV",
+    "maleseāā": "MY",
+    "mali": "ML",
+    "malṭaa": "MT",
+    "marsall dīp": "MH",
+    "marṭinik": "MQ",
+    "mauriss": "MU",
+    "mauriṭaniya": "MR",
+    "mayoṭṭ": "YT",
+    "meksīko": "MX",
+    "Melanesia": "054",
+    "micronesiaa": "FM",
+    "Micronesian Region": "057",
+    "Middle Africa": "017",
+    "mojambik": "MZ",
+    "molḍovaa": "MD",
+    "monako": "MC",
+    "mongolia": "MN",
+    "monṭenegro": "ME",
+    "monṭserrarṭ": "MS",
+    "morkko": "MA",
+    "myanmar (brma)": "MM",
+    "naigeria": "NG",
+    "naījr": "NE",
+    "namibia": "NA",
+    "nauru": "NR",
+    "nederlanḍs": "NL",
+    "nepal": "NP",
+    "nikaraguaa": "NI",
+    "niyu": "NU",
+    "norpok dīp": "NF",
+    "North America": "003",
+    "Northern Africa": "015",
+    "Northern America": "021",
+    "Northern Europe": "154",
+    "norvay": "NO",
+    "nyu jīlanḍ": "NZ",
+    "nyu keleḍoniya": "NC",
+    "Oceania": "009",
+    "oman": "OM",
+    "Outlying Oceania": "QO",
+    "pakistan": "PK",
+    "paklaṇd dīp": "FK",
+    "palau": "PW",
+    "palesṭiati handi": "PS",
+    "panema": "PA",
+    "papua nyu gini": "PG",
+    "pareguvai": "PY",
+    "pēro dīp": "FO",
+    "peru": "PE",
+    "piji": "FJ",
+    "pilippines": "PH",
+    "pinlaṇd": "FI",
+    "piṭkarn dīp": "PN",
+    "polanḍ": "PL",
+    "Polynesia": "061",
+    "portugal": "PT",
+    "prans": "FR",
+    "prenc": "PF",
+    "prenc guiyana": "GF",
+    "prēnch dakiṇ teritorī": "TF",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
+    "puerto rico": "PR",
+    "raji, purti": "001",
+    "riyuniyn": "RE",
+    "romaniya": "RO",
+    "russia": "RU",
+    "rvanḍa": "RW",
+    "saipras": "CY",
+    "samoaa": "WS",
+    "san marino": "SM",
+    "sao tom aḍe prinsipe": "ST",
+    "Sark": "CQ",
+    "saūdi arabiya": "SA",
+    "se barṭelemi": "BL",
+    "seint helena": "SH",
+    "seint kiṭs āḍe nebis": "KN",
+    "seint lusiya": "LC",
+    "seint martin": "MF",
+    "seint pierri ande mikelon": "PM",
+    "seint vinseṇṭ aḍe grenaḍi": "VC",
+    "senegal": "SN",
+    "serbia": "RS",
+    "seuṭa aḍe melila": "EA",
+    "sierra leyon": "SL",
+    "singapor": "SG",
+    "sint mārṭen": "SX",
+    "sīriya": "SY",
+    "siselles": "SC",
+    "slovakia": "SK",
+    "slovenia": "SI",
+    "soloman dīp": "SB",
+    "somaliya": "SO",
+    "South America": "005",
+    "Southeast Asia": "035",
+    "Southern Africa": "018",
+    "Southern Asia": "034",
+    "Southern Europe": "039",
+    "spein": "ES",
+    "sri lanka": "LK",
+    "Sub-Saharan Africa": "202",
+    "suḍan": "SD",
+    "surīname": "SR",
+    "svalbard aḍe jan mayen": "SJ",
+    "sviḍen": "SE",
+    "svitjerlaṇḍ": "CH",
+    "tailanḍ": "TH",
+    "taivan": "TW",
+    "tajākīstān": "TJ",
+    "ṭanjaniya": "TZ",
+    "ṭimor - leste": "TL",
+    "ṭogo": "TG",
+    "ṭokelau": "TK",
+    "ṭonga": "TO",
+    "ṭriniḍaḍ aḍe ṭobego": "TT",
+    "Tristan da Cunha": "TA",
+    "ṭunisiaa": "TN",
+    "turkī": "TR",
+    "turkmenīstān": "TM",
+    "turks aḍe keikes dīp": "TC",
+    "tuvala": "TV",
+    "ūjbekistaan": "UZ",
+    "uniṭeḍ kingḍom": "GB",
+    "United Nations": "UN",
+    "Unknown Region": "ZZ",
+    "ūrugve": "UY",
+    "uttar koriya": "KP",
+    "uttar mariyana dīp": "MP",
+    "uttar mesiḍoniya": "MK",
+    "vallis aḍe puṭuna": "WF",
+    "vanuaatu": "VU",
+    "vedakuṇpu sahara": "EH",
+    "venejuela": "VE",
+    "viyetnam": "VN",
+    "Western Africa": "011",
+    "Western Asia": "145",
+    "Western Europe": "155",
+    "yemen": "YE",
+    "yu.es. aautlaing dīp": "UM",
+    "yu.es. vrjin dīp": "VI",
+    "yūganḍa": "UG",
+    "yūkrain": "UA",
+    "yunaiṭeḍ stets": "US",
+    "ବାରତ": "IN"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Orya/ctryreverse.json b/js/data/locale/kxv/Orya/ctryreverse.json
new file mode 100644
index 0000000000..5628416c3c
--- /dev/null
+++ b/js/data/locale/kxv/Orya/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "raji, purti",
+    "002": "Africa",
+    "003": "North America",
+    "005": "South America",
+    "009": "Oceania",
+    "011": "Western Africa",
+    "013": "Central America",
+    "014": "Eastern Africa",
+    "015": "Northern Africa",
+    "017": "Middle Africa",
+    "018": "Southern Africa",
+    "019": "Americas",
+    "021": "Northern America",
+    "029": "Caribbean",
+    "030": "Eastern Asia",
+    "034": "Southern Asia",
+    "035": "Southeast Asia",
+    "039": "Southern Europe",
+    "053": "Australasia",
+    "054": "Melanesia",
+    "057": "Micronesian Region",
+    "061": "Polynesia",
+    "142": "Asia",
+    "143": "Central Asia",
+    "145": "Western Asia",
+    "150": "Europe",
+    "151": "Eastern Europe",
+    "154": "Northern Europe",
+    "155": "Western Europe",
+    "202": "Sub-Saharan Africa",
+    "419": "laṭin amerika",
+    "AC": "Ascension Island",
+    "AD": "ānḍorā",
+    "AE": "aanḍiti arab emireṭs",
+    "AF": "aapganistan",
+    "AG": "eṇṭigaa aḍe barbuḍaa",
+    "AI": "anguila",
+    "AL": "albania",
+    "AM": "aarmenia",
+    "AO": "angola",
+    "AQ": "ānṭarkṭikā",
+    "AR": "aarhenṭina",
+    "AS": "amerikati samva",
+    "AT": "austria",
+    "AU": "astrelia",
+    "AW": "aruba",
+    "AX": "eleṇḍ dīp",
+    "AZ": "ajerbaijan",
+    "BA": "bajnia aḍe hertsegovina",
+    "BB": "barbaḍos",
+    "BD": "banglades",
+    "BE": "beljiym",
+    "BF": "burkina paso",
+    "BG": "bulgaria",
+    "BH": "bāren",
+    "BI": "buruṇḍī",
+    "BJ": "benīn",
+    "BL": "se barṭelemi",
+    "BM": "bermuḍā",
+    "BN": "brunae",
+    "BO": "boliviā",
+    "BQ": "karibiyn nedrlends",
+    "BR": "brājil",
+    "BS": "bāhāmās",
+    "BT": "buṭān",
+    "BV": "Bouvet Island",
+    "BW": "boṭsvana",
+    "BY": "belarūs",
+    "BZ": "belīj",
+    "CA": "kanaḍa",
+    "CC": "kokos keling dīp",
+    "CD": "kongo - kinsasa",
+    "CF": "madini aaprika republik",
+    "CG": "kongo - brajavil",
+    "CH": "svitjerlaṇḍ",
+    "CI": "koṭ ḍi vaa",
+    "CK": "kuk dīp",
+    "CL": "cili",
+    "CM": "kemarun",
+    "CN": "caina",
+    "CO": "kolmbiaa",
+    "CP": "Clipperton Island",
+    "CQ": "Sark",
+    "CR": "kosta rika",
+    "CU": "kyuba",
+    "CV": "kep vrḍi",
+    "CW": "kyurasao",
+    "CX": "kristmas dīp",
+    "CY": "saipras",
+    "CZ": "cekiya",
+    "DE": "jermanī",
+    "DG": "ḍiego garsia",
+    "DJ": "jibutī",
+    "DK": "ḍenmark",
+    "DM": "dominika",
+    "DO": "dominikan republik",
+    "DZ": "aljīriaa",
+    "EA": "seuṭa aḍe melila",
+    "EC": "ekvaḍor",
+    "EE": "esṭoniya",
+    "EG": "ījipṭ",
+    "EH": "vedakuṇpu sahara",
+    "ER": "īriṭriaa",
+    "ES": "spein",
+    "ET": "ītiyopiya",
+    "EU": "European Union",
+    "EZ": "Eurozone",
+    "FI": "pinlaṇd",
+    "FJ": "piji",
+    "FK": "paklaṇd dīp",
+    "FM": "micronesiaa",
+    "FO": "pēro dīp",
+    "FR": "prans",
+    "GA": "gbon",
+    "GB": "uniṭeḍ kingḍom",
+    "GD": "graneida",
+    "GE": "jeorjiaa",
+    "GF": "prenc guiyana",
+    "GG": "grnse",
+    "GH": "gana",
+    "GI": "jbralṭr",
+    "GL": "grīnlanḍ",
+    "GM": "gambia",
+    "GN": "gini",
+    "GP": "gvadelup",
+    "GQ": "ikveṭorial gini",
+    "GR": "grīs",
+    "GS": "dakiṇ jārjiā aḍe dakiṇ sandwich dīp",
+    "GT": "gvaṭemala",
+    "GU": "guām",
+    "GW": "gini-bisau",
+    "GY": "guyana",
+    "HK": "hong kong (sar) caina",
+    "HM": "Heard & McDonald Islands",
+    "HN": "honḍuras",
+    "HR": "kroesia",
+    "HT": "haiti",
+    "HU": "hungarī",
+    "IC": "kanari dīp",
+    "ID": "inḍonesiya",
+    "IE": "aayarlanḍ",
+    "IL": "israel",
+    "IM": "aail āp man",
+    "IN": "ବାରତ",
+    "IO": "briṭis inḍiāti samudra handi",
+    "IQ": "irak",
+    "IR": "iran",
+    "IS": "aislanḍ",
+    "IT": "iṭalī",
+    "JE": "jersī",
+    "JM": "jamaika",
+    "JO": "jorḍan",
+    "JP": "japan",
+    "KE": "kenya",
+    "KG": "kirgistan",
+    "KH": "kamboḍia",
+    "KI": "kiribaṭi",
+    "KM": "komoros",
+    "KN": "seint kiṭs āḍe nebis",
+    "KP": "uttar koriya",
+    "KR": "dkiṇ koriyaa",
+    "KW": "kuvet",
+    "KY": "keimen dīp",
+    "KZ": "kajakstan",
+    "LA": "laos",
+    "LB": "lebanon",
+    "LC": "seint lusiya",
+    "LI": "likṭensṭein",
+    "LK": "sri lanka",
+    "LR": "laiberīya",
+    "LS": "lesotho",
+    "LT": "liṭuaania",
+    "LU": "lksemborg",
+    "LV": "laṭviya",
+    "LY": "libya",
+    "MA": "morkko",
+    "MC": "monako",
+    "MD": "molḍovaa",
+    "ME": "monṭenegro",
+    "MF": "seint martin",
+    "MG": "madagascar",
+    "MH": "marsall dīp",
+    "MK": "uttar mesiḍoniya",
+    "ML": "mali",
+    "MM": "myanmar (brma)",
+    "MN": "mongolia",
+    "MO": "makao sar cina",
+    "MP": "uttar mariyana dīp",
+    "MQ": "marṭinik",
+    "MR": "mauriṭaniya",
+    "MS": "monṭserrarṭ",
+    "MT": "malṭaa",
+    "MU": "mauriss",
+    "MV": "māldīp",
+    "MW": "malavī",
+    "MX": "meksīko",
+    "MY": "maleseāā",
+    "MZ": "mojambik",
+    "NA": "namibia",
+    "NC": "nyu keleḍoniya",
+    "NE": "naījr",
+    "NF": "norpok dīp",
+    "NG": "naigeria",
+    "NI": "nikaraguaa",
+    "NL": "nederlanḍs",
+    "NO": "norvay",
+    "NP": "nepal",
+    "NR": "nauru",
+    "NU": "niyu",
+    "NZ": "nyu jīlanḍ",
+    "OM": "oman",
+    "PA": "panema",
+    "PE": "peru",
+    "PF": "prenc",
+    "PG": "papua nyu gini",
+    "PH": "pilippines",
+    "PK": "pakistan",
+    "PL": "polanḍ",
+    "PM": "seint pierri ande mikelon",
+    "PN": "piṭkarn dīp",
+    "PR": "puerto rico",
+    "PS": "palesṭiati handi",
+    "PT": "portugal",
+    "PW": "palau",
+    "PY": "pareguvai",
+    "QA": "katar",
+    "QO": "Outlying Oceania",
+    "RE": "riyuniyn",
+    "RO": "romaniya",
+    "RS": "serbia",
+    "RU": "russia",
+    "RW": "rvanḍa",
+    "SA": "saūdi arabiya",
+    "SB": "soloman dīp",
+    "SC": "siselles",
+    "SD": "suḍan",
+    "SE": "sviḍen",
+    "SG": "singapor",
+    "SH": "seint helena",
+    "SI": "slovenia",
+    "SJ": "svalbard aḍe jan mayen",
+    "SK": "slovakia",
+    "SL": "sierra leyon",
+    "SM": "san marino",
+    "SN": "senegal",
+    "SO": "somaliya",
+    "SR": "surīname",
+    "SS": "dkiṇ sūdan",
+    "ST": "sao tom aḍe prinsipe",
+    "SV": "el salvador",
+    "SX": "sint mārṭen",
+    "SY": "sīriya",
+    "SZ": "esvaṭini",
+    "TA": "Tristan da Cunha",
+    "TC": "turks aḍe keikes dīp",
+    "TD": "cad",
+    "TF": "prēnch dakiṇ teritorī",
+    "TG": "ṭogo",
+    "TH": "tailanḍ",
+    "TJ": "tajākīstān",
+    "TK": "ṭokelau",
+    "TL": "ṭimor - leste",
+    "TM": "turkmenīstān",
+    "TN": "ṭunisiaa",
+    "TO": "ṭonga",
+    "TR": "turkī",
+    "TT": "ṭriniḍaḍ aḍe ṭobego",
+    "TV": "tuvala",
+    "TW": "taivan",
+    "TZ": "ṭanjaniya",
+    "UA": "yūkrain",
+    "UG": "yūganḍa",
+    "UM": "yu.es. aautlaing dīp",
+    "UN": "United Nations",
+    "US": "yunaiṭeḍ stets",
+    "UY": "ūrugve",
+    "UZ": "ūjbekistaan",
+    "VA": "bāṭikān",
+    "VC": "seint vinseṇṭ aḍe grenaḍi",
+    "VE": "venejuela",
+    "VG": "briṭis vrjin dīp",
+    "VI": "yu.es. vrjin dīp",
+    "VN": "viyetnam",
+    "VU": "vanuaatu",
+    "WF": "vallis aḍe puṭuna",
+    "WS": "samoaa",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
+    "XK": "kosovo",
+    "YE": "yemen",
+    "YT": "mayoṭṭ",
+    "ZA": "dkīṇ aaprika",
+    "ZM": "jambiya",
+    "ZW": "jimbabve",
+    "ZZ": "Unknown Region"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Orya/dateformats.json b/js/data/locale/kxv/Orya/dateformats.json
new file mode 100644
index 0000000000..deccc90da4
--- /dev/null
+++ b/js/data/locale/kxv/Orya/dateformats.json
@@ -0,0 +1,122 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
+            "l": {
+                "f": "LLLL",
+                "l": "LLLL",
+                "m": "LLL",
+                "s": "LL"
+            },
+            "m": {
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "order": "{date} {time}",
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            }
+        },
+        "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Orya/list.json b/js/data/locale/kxv/Orya/list.json
new file mode 100644
index 0000000000..103fd1d32b
--- /dev/null
+++ b/js/data/locale/kxv/Orya/list.json
@@ -0,0 +1,46 @@
+{
+    "or": {
+        "full": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        },
+        "long": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        },
+        "medium": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        },
+        "short": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        }
+    },
+    "standard": {
+        "full": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "long": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "medium": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "short": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        }
+    },
+    "unit": {
+        "short": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}",
+            "middle": "{0}, {1}",
+            "start": "{0}, {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Orya/numfmt.jf b/js/data/locale/kxv/Orya/numfmt.jf
new file mode 100644
index 0000000000..9c05d18537
--- /dev/null
+++ b/js/data/locale/kxv/Orya/numfmt.jf
@@ -0,0 +1,22 @@
+{
+    "generated": true,
+    "native_numfmt": {
+        "currencyFormats": {
+            "common": "{s}{n}",
+            "commonNegative": "-{s}{n}"
+        },
+        "decimalChar": ".",
+        "digits": "୦୧୨୩୪୫୬୭୮୯",
+        "exponential": "E",
+        "groupChar": ",",
+        "negativenumFmt": "-{n}",
+        "negativepctFmt": "-{n}%",
+        "pctChar": "%",
+        "pctFmt": "{n}%",
+        "prigroupSize": 3,
+        "roundingMode": "halfdown",
+        "script": "Orya",
+        "secgroupSize": 2,
+        "useNative": true
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Orya/sysres.json b/js/data/locale/kxv/Orya/sysres.json
new file mode 100644
index 0000000000..9ebc69b093
--- /dev/null
+++ b/js/data/locale/kxv/Orya/sysres.json
@@ -0,0 +1,160 @@
+{
+    "E0": "S",
+    "E1": "M",
+    "E2": "T",
+    "E3": "W",
+    "E4": "T",
+    "E5": "F",
+    "E6": "S",
+    "EE0": "ଆଦି ୱାରା",
+    "EE1": "ସମ୍ବାରା",
+    "EE2": "ମାଙ୍ଗାଡ଼ା",
+    "EE3": "ପୁଦାରା",
+    "EE4": "ଲାକି ୱାରା",
+    "EE5": "ସୁକ୍ରୁ ୱାରା",
+    "EE6": "ସାନି ୱାରା",
+    "EEE0": "ଆଦି ୱାରା",
+    "EEE1": "ସମ୍ବାରା",
+    "EEE2": "ମାଙ୍ଗାଡ଼ା",
+    "EEE3": "ପୁଦାରା",
+    "EEE4": "ଲାକି ୱାରା",
+    "EEE5": "ସୁକ୍ରୁ ୱାରା",
+    "EEE6": "ସାନି ୱାରା",
+    "EEEE0": "ଆଦି ୱାରା",
+    "EEEE1": "ସମ୍ବାରା",
+    "EEEE2": "ମାଙ୍ଗାଡ଼ା",
+    "EEEE3": "ପୁଦାରା",
+    "EEEE4": "ଲାକି ୱାରା",
+    "EEEE5": "ସୁକ୍ରୁ ୱାରା",
+    "EEEE6": "ସାନି ୱାରା",
+    "G-1": "BCE",
+    "G1": "CE",
+    "L1": "1",
+    "L10": "10",
+    "L11": "11",
+    "L12": "12",
+    "L2": "2",
+    "L3": "3",
+    "L4": "4",
+    "L5": "5",
+    "L6": "6",
+    "L7": "7",
+    "L8": "8",
+    "L9": "9",
+    "LL1": "ପୁ",
+    "LL10": "ଦା",
+    "LL11": "ଦି",
+    "LL12": "ପା",
+    "LL2": "ମା",
+    "LL3": "ପା",
+    "LL4": "ହି",
+    "LL5": "ବେ",
+    "LL6": "ଜା",
+    "LL7": "ଆସ",
+    "LL8": "ସ୍",
+    "LL9": "ବଦ",
+    "LLL1": "ପୁସୁ ଲେଞ୍ଜୁ",
+    "LLL10": "ଦାସାରା ଲେଞ୍ଜୁ",
+    "LLL11": "ଦିୱିଡ଼ି ଲେଞ୍ଜୁ",
+    "LLL12": "ପାଣ୍ଡେ ଲେଞ୍ଜୁ",
+    "LLL2": "ମାହାକା ଲେଞ୍ଜୁ",
+    "LLL3": "ପାଗୁଣି ଲେଞ୍ଜୁ",
+    "LLL4": "ହିରେ ଲେଞ୍ଜୁ",
+    "LLL5": "ବେସେ ଲେଞ୍ଜୁ",
+    "LLL6": "ଜାଟା ଲେଞ୍ଜୁ",
+    "LLL7": "ଆସାଡ଼ି ଲେଞ୍ଜୁ",
+    "LLL8": "ସ୍ରାବାଁ ଲେଞ୍ଜୁ",
+    "LLL9": "ବଦ ଲେଞ୍ଜୁ",
+    "LLLL1": "ପୁସୁ ଲେଞ୍ଜୁ",
+    "LLLL10": "ଦାସାରା ଲେଞ୍ଜୁ",
+    "LLLL11": "ଦିୱିଡ଼ି ଲେଞ୍ଜୁ",
+    "LLLL12": "ପାଣ୍ଡେ ଲେଞ୍ଜୁ",
+    "LLLL2": "ମାହାକା ଲେଞ୍ଜୁ",
+    "LLLL3": "ପାଗୁଣି ଲେଞ୍ଜୁ",
+    "LLLL4": "ହିରେ ଲେଞ୍ଜୁ",
+    "LLLL5": "ବେସେ ଲେଞ୍ଜୁ",
+    "LLLL6": "ଜାଟା ଲେଞ୍ଜୁ",
+    "LLLL7": "ଆସାଡ଼ି ଲେଞ୍ଜୁ",
+    "LLLL8": "ସ୍ରାବାଁ ଲେଞ୍ଜୁ",
+    "LLLL9": "ବଦ ଲେଞ୍ଜୁ",
+    "MMM1": "ପୁସୁ ଲେଞ୍ଜୁ",
+    "MMM10": "ଦାସାରା ଲେଞ୍ଜୁ",
+    "MMM11": "ଦିୱିଡ଼ି ଲେଞ୍ଜୁ",
+    "MMM12": "ପାଣ୍ଡେ ଲେଞ୍ଜୁ",
+    "MMM2": "ମାହାକା ଲେଞ୍ଜୁ",
+    "MMM3": "ପାଗୁଣି ଲେଞ୍ଜୁ",
+    "MMM4": "ହିରେ ଲେଞ୍ଜୁ",
+    "MMM5": "ବେସେ ଲେଞ୍ଜୁ",
+    "MMM6": "ଜାଟା ଲେଞ୍ଜୁ",
+    "MMM7": "ଆସାଡ଼ି ଲେଞ୍ଜୁ",
+    "MMM8": "ସ୍ରାବାଁ ଲେଞ୍ଜୁ",
+    "MMM9": "ବଦ ଲେଞ୍ଜୁ",
+    "MMMM1": "ପୁସୁ ଲେଞ୍ଜୁ",
+    "MMMM10": "ଦାସାରା ଲେଞ୍ଜୁ",
+    "MMMM11": "ଦିୱିଡ଼ି ଲେଞ୍ଜୁ",
+    "MMMM12": "ପାଣ୍ଡେ ଲେଞ୍ଜୁ",
+    "MMMM2": "ମାହାକା ଲେଞ୍ଜୁ",
+    "MMMM3": "ପାଗୁଣି ଲେଞ୍ଜୁ",
+    "MMMM4": "ହିରେ ଲେଞ୍ଜୁ",
+    "MMMM5": "ବେସେ ଲେଞ୍ଜୁ",
+    "MMMM6": "ଜାଟା ଲେଞ୍ଜୁ",
+    "MMMM7": "ଆସାଡ଼ି ଲେଞ୍ଜୁ",
+    "MMMM8": "ସ୍ରାବାଁ ଲେଞ୍ଜୁ",
+    "MMMM9": "ବଦ ଲେଞ୍ଜୁ",
+    "N1": "ପ",
+    "N10": "ଦ",
+    "N11": "ଦ",
+    "N12": "ପ",
+    "N2": "ମ",
+    "N3": "ପ",
+    "N4": "ହ",
+    "N5": "ବ",
+    "N6": "ଜ",
+    "N7": "ଆ",
+    "N8": "ସ",
+    "N9": "ବ",
+    "NN1": "ପୁ",
+    "NN10": "ଦା",
+    "NN11": "ଦି",
+    "NN12": "ପା",
+    "NN2": "ମା",
+    "NN3": "ପା",
+    "NN4": "ହି",
+    "NN5": "ବେ",
+    "NN6": "ଜା",
+    "NN7": "ଆସ",
+    "NN8": "ସ୍",
+    "NN9": "ବଦ",
+    "a0": "ଏ ଏମ",
+    "a1": "ପି ଏମ",
+    "c0": "S",
+    "c1": "M",
+    "c2": "T",
+    "c3": "W",
+    "c4": "T",
+    "c5": "F",
+    "c6": "S",
+    "cc0": "ଆଦି ୱାରା",
+    "cc1": "ସମ୍ବାରା",
+    "cc2": "ମାଙ୍ଗାଡ଼ା",
+    "cc3": "ପୁଦାରା",
+    "cc4": "ଲାକି ୱାରା",
+    "cc5": "ସୁକ୍ରୁ ୱାରା",
+    "cc6": "ସାନି ୱାରା",
+    "ccc0": "ଆଦି ୱାରା",
+    "ccc1": "ସମ୍ବାରା",
+    "ccc2": "ମାଙ୍ଗାଡ଼ା",
+    "ccc3": "ପୁଦାରା",
+    "ccc4": "ଲାକି ୱାରା",
+    "ccc5": "ସୁକ୍ରୁ ୱାରା",
+    "ccc6": "ସାନି ୱାରା",
+    "cccc0": "ଆଦି ୱାରା",
+    "cccc1": "ସମ୍ବାରା",
+    "cccc2": "ମାଙ୍ଗାଡ଼ା",
+    "cccc3": "ପୁଦାରା",
+    "cccc4": "ଲାକି ୱାରା",
+    "cccc5": "ସୁକ୍ରୁ ୱାରା",
+    "cccc6": "ସାନି ୱାରା",
+    "finalSeparatorShort": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Telu/ctrynames.json b/js/data/locale/kxv/Telu/ctrynames.json
new file mode 100644
index 0000000000..9b8a02c498
--- /dev/null
+++ b/js/data/locale/kxv/Telu/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "aail āp man": "IM",
+    "aanḍiti arab emireṭs": "AE",
+    "aapganistan": "AF",
+    "aarhenṭina": "AR",
+    "aarmenia": "AM",
+    "aayarlanḍ": "IE",
+    "Africa": "002",
+    "aislanḍ": "IS",
+    "ajerbaijan": "AZ",
+    "albania": "AL",
+    "aljīriaa": "DZ",
+    "Americas": "019",
+    "amerikati samva": "AS",
+    "ānḍorā": "AD",
+    "angola": "AO",
+    "anguila": "AI",
+    "ānṭarkṭikā": "AQ",
+    "aruba": "AW",
+    "Ascension Island": "AC",
+    "Asia": "142",
+    "astrelia": "AU",
+    "Australasia": "053",
+    "austria": "AT",
+    "bāhāmās": "BS",
+    "bajnia aḍe hertsegovina": "BA",
+    "banglades": "BD",
+    "barbaḍos": "BB",
+    "bāren": "BH",
+    "bāṭikān": "VA",
+    "belarūs": "BY",
+    "belīj": "BZ",
+    "beljiym": "BE",
+    "benīn": "BJ",
+    "bermuḍā": "BM",
+    "boliviā": "BO",
+    "boṭsvana": "BW",
+    "Bouvet Island": "BV",
+    "brājil": "BR",
+    "briṭis inḍiāti samudra handi": "IO",
+    "briṭis vrjin dīp": "VG",
+    "brunae": "BN",
+    "bulgaria": "BG",
+    "burkina paso": "BF",
+    "buruṇḍī": "BI",
+    "buṭān": "BT",
+    "cad": "TD",
+    "caina": "CN",
+    "Caribbean": "029",
+    "cekiya": "CZ",
+    "Central America": "013",
+    "Central Asia": "143",
+    "cili": "CL",
+    "Clipperton Island": "CP",
+    "dakiṇ jārjiā aḍe dakiṇ sandwich dīp": "GS",
+    "ḍenmark": "DK",
+    "ḍiego garsia": "DG",
+    "dkīṇ aaprika": "ZA",
+    "dkiṇ koriyaa": "KR",
+    "dkiṇ sūdan": "SS",
+    "dominika": "DM",
+    "dominikan republik": "DO",
+    "Eastern Africa": "014",
+    "Eastern Asia": "030",
+    "Eastern Europe": "151",
+    "ekvaḍor": "EC",
+    "el salvador": "SV",
+    "eleṇḍ dīp": "AX",
+    "eṇṭigaa aḍe barbuḍaa": "AG",
+    "esṭoniya": "EE",
+    "esvaṭini": "SZ",
+    "Europe": "150",
+    "European Union": "EU",
+    "Eurozone": "EZ",
+    "gambia": "GM",
+    "gana": "GH",
+    "gbon": "GA",
+    "gini": "GN",
+    "gini-bisau": "GW",
+    "graneida": "GD",
+    "grīnlanḍ": "GL",
+    "grīs": "GR",
+    "grnse": "GG",
+    "guām": "GU",
+    "guyana": "GY",
+    "gvadelup": "GP",
+    "gvaṭemala": "GT",
+    "haiti": "HT",
+    "Heard & McDonald Islands": "HM",
+    "honḍuras": "HN",
+    "hong kong (sar) caina": "HK",
+    "hungarī": "HU",
+    "ījipṭ": "EG",
+    "ikveṭorial gini": "GQ",
+    "inḍonesiya": "ID",
+    "irak": "IQ",
+    "iran": "IR",
+    "īriṭriaa": "ER",
+    "israel": "IL",
+    "iṭalī": "IT",
+    "ītiyopiya": "ET",
+    "jamaika": "JM",
+    "jambiya": "ZM",
+    "japan": "JP",
+    "jbralṭr": "GI",
+    "jeorjiaa": "GE",
+    "jermanī": "DE",
+    "jersī": "JE",
+    "jibutī": "DJ",
+    "jimbabve": "ZW",
+    "jorḍan": "JO",
+    "kajakstan": "KZ",
+    "kamboḍia": "KH",
+    "kanaḍa": "CA",
+    "kanari dīp": "IC",
+    "karibiyn nedrlends": "BQ",
+    "katar": "QA",
+    "keimen dīp": "KY",
+    "kemarun": "CM",
+    "kenya": "KE",
+    "kep vrḍi": "CV",
+    "kirgistan": "KG",
+    "kiribaṭi": "KI",
+    "kokos keling dīp": "CC",
+    "kolmbiaa": "CO",
+    "komoros": "KM",
+    "kongo - brajavil": "CG",
+    "kongo - kinsasa": "CD",
+    "kosovo": "XK",
+    "kosta rika": "CR",
+    "koṭ ḍi vaa": "CI",
+    "kristmas dīp": "CX",
+    "kroesia": "HR",
+    "kuk dīp": "CK",
+    "kuvet": "KW",
+    "kyuba": "CU",
+    "kyurasao": "CW",
+    "laiberīya": "LR",
+    "laos": "LA",
+    "laṭin amerika": "419",
+    "laṭviya": "LV",
+    "lebanon": "LB",
+    "lesotho": "LS",
+    "libya": "LY",
+    "likṭensṭein": "LI",
+    "liṭuaania": "LT",
+    "lksemborg": "LU",
+    "madagascar": "MG",
+    "madini aaprika republik": "CF",
+    "makao sar cina": "MO",
+    "malavī": "MW",
+    "māldīp": "MV",
+    "maleseāā": "MY",
+    "mali": "ML",
+    "malṭaa": "MT",
+    "marsall dīp": "MH",
+    "marṭinik": "MQ",
+    "mauriss": "MU",
+    "mauriṭaniya": "MR",
+    "mayoṭṭ": "YT",
+    "meksīko": "MX",
+    "Melanesia": "054",
+    "micronesiaa": "FM",
+    "Micronesian Region": "057",
+    "Middle Africa": "017",
+    "mojambik": "MZ",
+    "molḍovaa": "MD",
+    "monako": "MC",
+    "mongolia": "MN",
+    "monṭenegro": "ME",
+    "monṭserrarṭ": "MS",
+    "morkko": "MA",
+    "myanmar (brma)": "MM",
+    "naigeria": "NG",
+    "naījr": "NE",
+    "namibia": "NA",
+    "nauru": "NR",
+    "nederlanḍs": "NL",
+    "nepal": "NP",
+    "nikaraguaa": "NI",
+    "niyu": "NU",
+    "norpok dīp": "NF",
+    "North America": "003",
+    "Northern Africa": "015",
+    "Northern America": "021",
+    "Northern Europe": "154",
+    "norvay": "NO",
+    "nyu jīlanḍ": "NZ",
+    "nyu keleḍoniya": "NC",
+    "Oceania": "009",
+    "oman": "OM",
+    "Outlying Oceania": "QO",
+    "pakistan": "PK",
+    "paklaṇd dīp": "FK",
+    "palau": "PW",
+    "palesṭiati handi": "PS",
+    "panema": "PA",
+    "papua nyu gini": "PG",
+    "pareguvai": "PY",
+    "pēro dīp": "FO",
+    "peru": "PE",
+    "piji": "FJ",
+    "pilippines": "PH",
+    "pinlaṇd": "FI",
+    "piṭkarn dīp": "PN",
+    "polanḍ": "PL",
+    "Polynesia": "061",
+    "portugal": "PT",
+    "prans": "FR",
+    "prenc": "PF",
+    "prenc guiyana": "GF",
+    "prēnch dakiṇ teritorī": "TF",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
+    "puerto rico": "PR",
+    "raji, purti": "001",
+    "riyuniyn": "RE",
+    "romaniya": "RO",
+    "russia": "RU",
+    "rvanḍa": "RW",
+    "saipras": "CY",
+    "samoaa": "WS",
+    "san marino": "SM",
+    "sao tom aḍe prinsipe": "ST",
+    "Sark": "CQ",
+    "saūdi arabiya": "SA",
+    "se barṭelemi": "BL",
+    "seint helena": "SH",
+    "seint kiṭs āḍe nebis": "KN",
+    "seint lusiya": "LC",
+    "seint martin": "MF",
+    "seint pierri ande mikelon": "PM",
+    "seint vinseṇṭ aḍe grenaḍi": "VC",
+    "senegal": "SN",
+    "serbia": "RS",
+    "seuṭa aḍe melila": "EA",
+    "sierra leyon": "SL",
+    "singapor": "SG",
+    "sint mārṭen": "SX",
+    "sīriya": "SY",
+    "siselles": "SC",
+    "slovakia": "SK",
+    "slovenia": "SI",
+    "soloman dīp": "SB",
+    "somaliya": "SO",
+    "South America": "005",
+    "Southeast Asia": "035",
+    "Southern Africa": "018",
+    "Southern Asia": "034",
+    "Southern Europe": "039",
+    "spein": "ES",
+    "sri lanka": "LK",
+    "Sub-Saharan Africa": "202",
+    "suḍan": "SD",
+    "surīname": "SR",
+    "svalbard aḍe jan mayen": "SJ",
+    "sviḍen": "SE",
+    "svitjerlaṇḍ": "CH",
+    "tailanḍ": "TH",
+    "taivan": "TW",
+    "tajākīstān": "TJ",
+    "ṭanjaniya": "TZ",
+    "ṭimor - leste": "TL",
+    "ṭogo": "TG",
+    "ṭokelau": "TK",
+    "ṭonga": "TO",
+    "ṭriniḍaḍ aḍe ṭobego": "TT",
+    "Tristan da Cunha": "TA",
+    "ṭunisiaa": "TN",
+    "turkī": "TR",
+    "turkmenīstān": "TM",
+    "turks aḍe keikes dīp": "TC",
+    "tuvala": "TV",
+    "ūjbekistaan": "UZ",
+    "uniṭeḍ kingḍom": "GB",
+    "United Nations": "UN",
+    "Unknown Region": "ZZ",
+    "ūrugve": "UY",
+    "uttar koriya": "KP",
+    "uttar mariyana dīp": "MP",
+    "uttar mesiḍoniya": "MK",
+    "vallis aḍe puṭuna": "WF",
+    "vanuaatu": "VU",
+    "vedakuṇpu sahara": "EH",
+    "venejuela": "VE",
+    "viyetnam": "VN",
+    "Western Africa": "011",
+    "Western Asia": "145",
+    "Western Europe": "155",
+    "yemen": "YE",
+    "yu.es. aautlaing dīp": "UM",
+    "yu.es. vrjin dīp": "VI",
+    "yūganḍa": "UG",
+    "yūkrain": "UA",
+    "yunaiṭeḍ stets": "US",
+    "బారతదెసాం": "IN"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Telu/ctryreverse.json b/js/data/locale/kxv/Telu/ctryreverse.json
new file mode 100644
index 0000000000..c46fe739c9
--- /dev/null
+++ b/js/data/locale/kxv/Telu/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "raji, purti",
+    "002": "Africa",
+    "003": "North America",
+    "005": "South America",
+    "009": "Oceania",
+    "011": "Western Africa",
+    "013": "Central America",
+    "014": "Eastern Africa",
+    "015": "Northern Africa",
+    "017": "Middle Africa",
+    "018": "Southern Africa",
+    "019": "Americas",
+    "021": "Northern America",
+    "029": "Caribbean",
+    "030": "Eastern Asia",
+    "034": "Southern Asia",
+    "035": "Southeast Asia",
+    "039": "Southern Europe",
+    "053": "Australasia",
+    "054": "Melanesia",
+    "057": "Micronesian Region",
+    "061": "Polynesia",
+    "142": "Asia",
+    "143": "Central Asia",
+    "145": "Western Asia",
+    "150": "Europe",
+    "151": "Eastern Europe",
+    "154": "Northern Europe",
+    "155": "Western Europe",
+    "202": "Sub-Saharan Africa",
+    "419": "laṭin amerika",
+    "AC": "Ascension Island",
+    "AD": "ānḍorā",
+    "AE": "aanḍiti arab emireṭs",
+    "AF": "aapganistan",
+    "AG": "eṇṭigaa aḍe barbuḍaa",
+    "AI": "anguila",
+    "AL": "albania",
+    "AM": "aarmenia",
+    "AO": "angola",
+    "AQ": "ānṭarkṭikā",
+    "AR": "aarhenṭina",
+    "AS": "amerikati samva",
+    "AT": "austria",
+    "AU": "astrelia",
+    "AW": "aruba",
+    "AX": "eleṇḍ dīp",
+    "AZ": "ajerbaijan",
+    "BA": "bajnia aḍe hertsegovina",
+    "BB": "barbaḍos",
+    "BD": "banglades",
+    "BE": "beljiym",
+    "BF": "burkina paso",
+    "BG": "bulgaria",
+    "BH": "bāren",
+    "BI": "buruṇḍī",
+    "BJ": "benīn",
+    "BL": "se barṭelemi",
+    "BM": "bermuḍā",
+    "BN": "brunae",
+    "BO": "boliviā",
+    "BQ": "karibiyn nedrlends",
+    "BR": "brājil",
+    "BS": "bāhāmās",
+    "BT": "buṭān",
+    "BV": "Bouvet Island",
+    "BW": "boṭsvana",
+    "BY": "belarūs",
+    "BZ": "belīj",
+    "CA": "kanaḍa",
+    "CC": "kokos keling dīp",
+    "CD": "kongo - kinsasa",
+    "CF": "madini aaprika republik",
+    "CG": "kongo - brajavil",
+    "CH": "svitjerlaṇḍ",
+    "CI": "koṭ ḍi vaa",
+    "CK": "kuk dīp",
+    "CL": "cili",
+    "CM": "kemarun",
+    "CN": "caina",
+    "CO": "kolmbiaa",
+    "CP": "Clipperton Island",
+    "CQ": "Sark",
+    "CR": "kosta rika",
+    "CU": "kyuba",
+    "CV": "kep vrḍi",
+    "CW": "kyurasao",
+    "CX": "kristmas dīp",
+    "CY": "saipras",
+    "CZ": "cekiya",
+    "DE": "jermanī",
+    "DG": "ḍiego garsia",
+    "DJ": "jibutī",
+    "DK": "ḍenmark",
+    "DM": "dominika",
+    "DO": "dominikan republik",
+    "DZ": "aljīriaa",
+    "EA": "seuṭa aḍe melila",
+    "EC": "ekvaḍor",
+    "EE": "esṭoniya",
+    "EG": "ījipṭ",
+    "EH": "vedakuṇpu sahara",
+    "ER": "īriṭriaa",
+    "ES": "spein",
+    "ET": "ītiyopiya",
+    "EU": "European Union",
+    "EZ": "Eurozone",
+    "FI": "pinlaṇd",
+    "FJ": "piji",
+    "FK": "paklaṇd dīp",
+    "FM": "micronesiaa",
+    "FO": "pēro dīp",
+    "FR": "prans",
+    "GA": "gbon",
+    "GB": "uniṭeḍ kingḍom",
+    "GD": "graneida",
+    "GE": "jeorjiaa",
+    "GF": "prenc guiyana",
+    "GG": "grnse",
+    "GH": "gana",
+    "GI": "jbralṭr",
+    "GL": "grīnlanḍ",
+    "GM": "gambia",
+    "GN": "gini",
+    "GP": "gvadelup",
+    "GQ": "ikveṭorial gini",
+    "GR": "grīs",
+    "GS": "dakiṇ jārjiā aḍe dakiṇ sandwich dīp",
+    "GT": "gvaṭemala",
+    "GU": "guām",
+    "GW": "gini-bisau",
+    "GY": "guyana",
+    "HK": "hong kong (sar) caina",
+    "HM": "Heard & McDonald Islands",
+    "HN": "honḍuras",
+    "HR": "kroesia",
+    "HT": "haiti",
+    "HU": "hungarī",
+    "IC": "kanari dīp",
+    "ID": "inḍonesiya",
+    "IE": "aayarlanḍ",
+    "IL": "israel",
+    "IM": "aail āp man",
+    "IN": "బారతదెసాం",
+    "IO": "briṭis inḍiāti samudra handi",
+    "IQ": "irak",
+    "IR": "iran",
+    "IS": "aislanḍ",
+    "IT": "iṭalī",
+    "JE": "jersī",
+    "JM": "jamaika",
+    "JO": "jorḍan",
+    "JP": "japan",
+    "KE": "kenya",
+    "KG": "kirgistan",
+    "KH": "kamboḍia",
+    "KI": "kiribaṭi",
+    "KM": "komoros",
+    "KN": "seint kiṭs āḍe nebis",
+    "KP": "uttar koriya",
+    "KR": "dkiṇ koriyaa",
+    "KW": "kuvet",
+    "KY": "keimen dīp",
+    "KZ": "kajakstan",
+    "LA": "laos",
+    "LB": "lebanon",
+    "LC": "seint lusiya",
+    "LI": "likṭensṭein",
+    "LK": "sri lanka",
+    "LR": "laiberīya",
+    "LS": "lesotho",
+    "LT": "liṭuaania",
+    "LU": "lksemborg",
+    "LV": "laṭviya",
+    "LY": "libya",
+    "MA": "morkko",
+    "MC": "monako",
+    "MD": "molḍovaa",
+    "ME": "monṭenegro",
+    "MF": "seint martin",
+    "MG": "madagascar",
+    "MH": "marsall dīp",
+    "MK": "uttar mesiḍoniya",
+    "ML": "mali",
+    "MM": "myanmar (brma)",
+    "MN": "mongolia",
+    "MO": "makao sar cina",
+    "MP": "uttar mariyana dīp",
+    "MQ": "marṭinik",
+    "MR": "mauriṭaniya",
+    "MS": "monṭserrarṭ",
+    "MT": "malṭaa",
+    "MU": "mauriss",
+    "MV": "māldīp",
+    "MW": "malavī",
+    "MX": "meksīko",
+    "MY": "maleseāā",
+    "MZ": "mojambik",
+    "NA": "namibia",
+    "NC": "nyu keleḍoniya",
+    "NE": "naījr",
+    "NF": "norpok dīp",
+    "NG": "naigeria",
+    "NI": "nikaraguaa",
+    "NL": "nederlanḍs",
+    "NO": "norvay",
+    "NP": "nepal",
+    "NR": "nauru",
+    "NU": "niyu",
+    "NZ": "nyu jīlanḍ",
+    "OM": "oman",
+    "PA": "panema",
+    "PE": "peru",
+    "PF": "prenc",
+    "PG": "papua nyu gini",
+    "PH": "pilippines",
+    "PK": "pakistan",
+    "PL": "polanḍ",
+    "PM": "seint pierri ande mikelon",
+    "PN": "piṭkarn dīp",
+    "PR": "puerto rico",
+    "PS": "palesṭiati handi",
+    "PT": "portugal",
+    "PW": "palau",
+    "PY": "pareguvai",
+    "QA": "katar",
+    "QO": "Outlying Oceania",
+    "RE": "riyuniyn",
+    "RO": "romaniya",
+    "RS": "serbia",
+    "RU": "russia",
+    "RW": "rvanḍa",
+    "SA": "saūdi arabiya",
+    "SB": "soloman dīp",
+    "SC": "siselles",
+    "SD": "suḍan",
+    "SE": "sviḍen",
+    "SG": "singapor",
+    "SH": "seint helena",
+    "SI": "slovenia",
+    "SJ": "svalbard aḍe jan mayen",
+    "SK": "slovakia",
+    "SL": "sierra leyon",
+    "SM": "san marino",
+    "SN": "senegal",
+    "SO": "somaliya",
+    "SR": "surīname",
+    "SS": "dkiṇ sūdan",
+    "ST": "sao tom aḍe prinsipe",
+    "SV": "el salvador",
+    "SX": "sint mārṭen",
+    "SY": "sīriya",
+    "SZ": "esvaṭini",
+    "TA": "Tristan da Cunha",
+    "TC": "turks aḍe keikes dīp",
+    "TD": "cad",
+    "TF": "prēnch dakiṇ teritorī",
+    "TG": "ṭogo",
+    "TH": "tailanḍ",
+    "TJ": "tajākīstān",
+    "TK": "ṭokelau",
+    "TL": "ṭimor - leste",
+    "TM": "turkmenīstān",
+    "TN": "ṭunisiaa",
+    "TO": "ṭonga",
+    "TR": "turkī",
+    "TT": "ṭriniḍaḍ aḍe ṭobego",
+    "TV": "tuvala",
+    "TW": "taivan",
+    "TZ": "ṭanjaniya",
+    "UA": "yūkrain",
+    "UG": "yūganḍa",
+    "UM": "yu.es. aautlaing dīp",
+    "UN": "United Nations",
+    "US": "yunaiṭeḍ stets",
+    "UY": "ūrugve",
+    "UZ": "ūjbekistaan",
+    "VA": "bāṭikān",
+    "VC": "seint vinseṇṭ aḍe grenaḍi",
+    "VE": "venejuela",
+    "VG": "briṭis vrjin dīp",
+    "VI": "yu.es. vrjin dīp",
+    "VN": "viyetnam",
+    "VU": "vanuaatu",
+    "WF": "vallis aḍe puṭuna",
+    "WS": "samoaa",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
+    "XK": "kosovo",
+    "YE": "yemen",
+    "YT": "mayoṭṭ",
+    "ZA": "dkīṇ aaprika",
+    "ZM": "jambiya",
+    "ZW": "jimbabve",
+    "ZZ": "Unknown Region"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Telu/dateformats.json b/js/data/locale/kxv/Telu/dateformats.json
new file mode 100644
index 0000000000..deccc90da4
--- /dev/null
+++ b/js/data/locale/kxv/Telu/dateformats.json
@@ -0,0 +1,122 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
+            "l": {
+                "f": "LLLL",
+                "l": "LLLL",
+                "m": "LLL",
+                "s": "LL"
+            },
+            "m": {
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "order": "{date} {time}",
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            }
+        },
+        "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Telu/list.json b/js/data/locale/kxv/Telu/list.json
new file mode 100644
index 0000000000..103fd1d32b
--- /dev/null
+++ b/js/data/locale/kxv/Telu/list.json
@@ -0,0 +1,46 @@
+{
+    "or": {
+        "full": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        },
+        "long": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        },
+        "medium": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        },
+        "short": {
+            "2": "{0} or {1}",
+            "end": "{0}, or {1}"
+        }
+    },
+    "standard": {
+        "full": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "long": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "medium": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "short": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}"
+        }
+    },
+    "unit": {
+        "short": {
+            "2": "{0}, {1}",
+            "end": "{0}, {1}",
+            "middle": "{0}, {1}",
+            "start": "{0}, {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Telu/numfmt.jf b/js/data/locale/kxv/Telu/numfmt.jf
new file mode 100644
index 0000000000..905d7ca5ab
--- /dev/null
+++ b/js/data/locale/kxv/Telu/numfmt.jf
@@ -0,0 +1,22 @@
+{
+    "generated": true,
+    "native_numfmt": {
+        "currencyFormats": {
+            "common": "{s}{n}",
+            "commonNegative": "-{s}{n}"
+        },
+        "decimalChar": ".",
+        "digits": "౦౧౨౩౪౫౬౭౮౯",
+        "exponential": "E",
+        "groupChar": ",",
+        "negativenumFmt": "-{n}",
+        "negativepctFmt": "-{n}%",
+        "pctChar": "%",
+        "pctFmt": "{n}%",
+        "prigroupSize": 3,
+        "roundingMode": "halfdown",
+        "script": "Telu",
+        "secgroupSize": 2,
+        "useNative": true
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/Telu/sysres.json b/js/data/locale/kxv/Telu/sysres.json
new file mode 100644
index 0000000000..c7329d21f3
--- /dev/null
+++ b/js/data/locale/kxv/Telu/sysres.json
@@ -0,0 +1,160 @@
+{
+    "E0": "S",
+    "E1": "M",
+    "E2": "T",
+    "E3": "W",
+    "E4": "T",
+    "E5": "F",
+    "E6": "S",
+    "EE0": "వారమి",
+    "EE1": "నమారా",
+    "EE2": "మాంగాడా",
+    "EE3": "వుదారా",
+    "EE4": "లాకివరా",
+    "EE5": "నుక్ వరా",
+    "EE6": "సానివరా",
+    "EEE0": "వారమి",
+    "EEE1": "నమారా",
+    "EEE2": "మాంగాడా",
+    "EEE3": "వుదారా",
+    "EEE4": "లాకివరా",
+    "EEE5": "నుక్ వరా",
+    "EEE6": "సానివరా",
+    "EEEE0": "వారమి",
+    "EEEE1": "నమారా",
+    "EEEE2": "మాంగాడా",
+    "EEEE3": "వుదారా",
+    "EEEE4": "లాకివరా",
+    "EEEE5": "నుక్ వరా",
+    "EEEE6": "సానివరా",
+    "G-1": "BCE",
+    "G1": "CE",
+    "L1": "1",
+    "L10": "10",
+    "L11": "11",
+    "L12": "12",
+    "L2": "2",
+    "L3": "3",
+    "L4": "4",
+    "L5": "5",
+    "L6": "6",
+    "L7": "7",
+    "L8": "8",
+    "L9": "9",
+    "LL1": "మా",
+    "LL10": "ది",
+    "LL11": "పా",
+    "LL12": "పు",
+    "LL2": "గు",
+    "LL3": "హి",
+    "LL4": "బె",
+    "LL5": "లం",
+    "LL6": "రా",
+    "LL7": "బా",
+    "LL8": "బా",
+    "LL9": "అస",
+    "LLL1": "మాగ",
+    "LLL10": "దివెడి",
+    "LLL11": "పాండు",
+    "LLL12": "పుసు",
+    "LLL2": "గుండు",
+    "LLL3": "హిరెఇ",
+    "LLL4": "బెసెకి",
+    "LLL5": "లండి",
+    "LLL6": "రాత",
+    "LLL7": "బాన్దపాణా",
+    "LLL8": "బార్సి",
+    "LLL9": "అస్ర",
+    "LLLL1": "మాగ",
+    "LLLL10": "దివెడి",
+    "LLLL11": "పాండు",
+    "LLLL12": "పుసు",
+    "LLLL2": "గుండు",
+    "LLLL3": "హిరెఇ",
+    "LLLL4": "బెసెకి",
+    "LLLL5": "లండి",
+    "LLLL6": "రాత",
+    "LLLL7": "బాన్దపాణా",
+    "LLLL8": "బార్సి",
+    "LLLL9": "అస్ర",
+    "MMM1": "మాగ",
+    "MMM10": "దివెడి",
+    "MMM11": "పాండు",
+    "MMM12": "పుసు",
+    "MMM2": "గుండు",
+    "MMM3": "హిరెఇ",
+    "MMM4": "బెసెకి",
+    "MMM5": "లండి",
+    "MMM6": "రాత",
+    "MMM7": "బాన్దపాణా",
+    "MMM8": "బార్సి",
+    "MMM9": "అస్ర",
+    "MMMM1": "మాగ",
+    "MMMM10": "దివెడి",
+    "MMMM11": "పాండు",
+    "MMMM12": "పుసు",
+    "MMMM2": "గుండు",
+    "MMMM3": "హిరెఇ",
+    "MMMM4": "బెసెకి",
+    "MMMM5": "లండి",
+    "MMMM6": "రాత",
+    "MMMM7": "బాన్దపాణా",
+    "MMMM8": "బార్సి",
+    "MMMM9": "అస్ర",
+    "N1": "మ",
+    "N10": "ద",
+    "N11": "ప",
+    "N12": "ప",
+    "N2": "గ",
+    "N3": "హ",
+    "N4": "బ",
+    "N5": "ల",
+    "N6": "ర",
+    "N7": "బ",
+    "N8": "బ",
+    "N9": "అ",
+    "NN1": "మా",
+    "NN10": "ది",
+    "NN11": "పా",
+    "NN12": "పు",
+    "NN2": "గు",
+    "NN3": "హి",
+    "NN4": "బె",
+    "NN5": "లం",
+    "NN6": "రా",
+    "NN7": "బా",
+    "NN8": "బా",
+    "NN9": "అస",
+    "a0": "ఎ ఎమ్",
+    "a1": "పి ఎమ్",
+    "c0": "S",
+    "c1": "M",
+    "c2": "T",
+    "c3": "W",
+    "c4": "T",
+    "c5": "F",
+    "c6": "S",
+    "cc0": "వారమి",
+    "cc1": "నమారా",
+    "cc2": "మాంగాడా",
+    "cc3": "వుదారా",
+    "cc4": "లాకివరా",
+    "cc5": "నుక్ వరా",
+    "cc6": "సానివరా",
+    "ccc0": "వారమి",
+    "ccc1": "నమారా",
+    "ccc2": "మాంగాడా",
+    "ccc3": "వుదారా",
+    "ccc4": "లాకివరా",
+    "ccc5": "నుక్ వరా",
+    "ccc6": "సానివరా",
+    "cccc0": "వారమి",
+    "cccc1": "నమారా",
+    "cccc2": "మాంగాడా",
+    "cccc3": "వుదారా",
+    "cccc4": "లాకివరా",
+    "cccc5": "నుక్ వరా",
+    "cccc6": "సానివరా",
+    "finalSeparatorShort": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/ctrynames.json b/js/data/locale/kxv/ctrynames.json
new file mode 100644
index 0000000000..2149dda647
--- /dev/null
+++ b/js/data/locale/kxv/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "aail āp man": "IM",
+    "aanḍiti arab emireṭs": "AE",
+    "aapganistan": "AF",
+    "aarhenṭina": "AR",
+    "aarmenia": "AM",
+    "aayarlanḍ": "IE",
+    "Africa": "002",
+    "aislanḍ": "IS",
+    "ajerbaijan": "AZ",
+    "albania": "AL",
+    "aljīriaa": "DZ",
+    "Americas": "019",
+    "amerikati samva": "AS",
+    "ānḍorā": "AD",
+    "angola": "AO",
+    "anguila": "AI",
+    "ānṭarkṭikā": "AQ",
+    "aruba": "AW",
+    "Ascension Island": "AC",
+    "Asia": "142",
+    "astrelia": "AU",
+    "Australasia": "053",
+    "austria": "AT",
+    "bāhāmās": "BS",
+    "bajnia aḍe hertsegovina": "BA",
+    "banglades": "BD",
+    "barbaḍos": "BB",
+    "bāren": "BH",
+    "bāṭikān": "VA",
+    "belarūs": "BY",
+    "belīj": "BZ",
+    "beljiym": "BE",
+    "benīn": "BJ",
+    "bermuḍā": "BM",
+    "boliviā": "BO",
+    "boṭsvana": "BW",
+    "Bouvet Island": "BV",
+    "brājil": "BR",
+    "briṭis inḍiāti samudra handi": "IO",
+    "briṭis vrjin dīp": "VG",
+    "brunae": "BN",
+    "bulgaria": "BG",
+    "burkina paso": "BF",
+    "buruṇḍī": "BI",
+    "buṭān": "BT",
+    "cad": "TD",
+    "caina": "CN",
+    "Caribbean": "029",
+    "cekiya": "CZ",
+    "Central America": "013",
+    "Central Asia": "143",
+    "cili": "CL",
+    "Clipperton Island": "CP",
+    "dakiṇ jārjiā aḍe dakiṇ sandwich dīp": "GS",
+    "ḍenmark": "DK",
+    "ḍiego garsia": "DG",
+    "dkīṇ aaprika": "ZA",
+    "dkiṇ koriyaa": "KR",
+    "dkiṇ sūdan": "SS",
+    "dominika": "DM",
+    "dominikan republik": "DO",
+    "Eastern Africa": "014",
+    "Eastern Asia": "030",
+    "Eastern Europe": "151",
+    "ekvaḍor": "EC",
+    "el salvador": "SV",
+    "eleṇḍ dīp": "AX",
+    "eṇṭigaa aḍe barbuḍaa": "AG",
+    "esṭoniya": "EE",
+    "esvaṭini": "SZ",
+    "Europe": "150",
+    "European Union": "EU",
+    "Eurozone": "EZ",
+    "gambia": "GM",
+    "gana": "GH",
+    "gbon": "GA",
+    "gini": "GN",
+    "gini-bisau": "GW",
+    "graneida": "GD",
+    "grīnlanḍ": "GL",
+    "grīs": "GR",
+    "grnse": "GG",
+    "guām": "GU",
+    "guyana": "GY",
+    "gvadelup": "GP",
+    "gvaṭemala": "GT",
+    "haiti": "HT",
+    "Heard & McDonald Islands": "HM",
+    "honḍuras": "HN",
+    "hong kong (sar) caina": "HK",
+    "hungarī": "HU",
+    "ījipṭ": "EG",
+    "ikveṭorial gini": "GQ",
+    "inḍiā": "IN",
+    "inḍonesiya": "ID",
+    "irak": "IQ",
+    "iran": "IR",
+    "īriṭriaa": "ER",
+    "israel": "IL",
+    "iṭalī": "IT",
+    "ītiyopiya": "ET",
+    "jamaika": "JM",
+    "jambiya": "ZM",
+    "japan": "JP",
+    "jbralṭr": "GI",
+    "jeorjiaa": "GE",
+    "jermanī": "DE",
+    "jersī": "JE",
+    "jibutī": "DJ",
+    "jimbabve": "ZW",
+    "jorḍan": "JO",
+    "kajakstan": "KZ",
+    "kamboḍia": "KH",
+    "kanaḍa": "CA",
+    "kanari dīp": "IC",
+    "karibiyn nedrlends": "BQ",
+    "katar": "QA",
+    "keimen dīp": "KY",
+    "kemarun": "CM",
+    "kenya": "KE",
+    "kep vrḍi": "CV",
+    "kirgistan": "KG",
+    "kiribaṭi": "KI",
+    "kokos keling dīp": "CC",
+    "kolmbiaa": "CO",
+    "komoros": "KM",
+    "kongo - brajavil": "CG",
+    "kongo - kinsasa": "CD",
+    "kosovo": "XK",
+    "kosta rika": "CR",
+    "koṭ ḍi vaa": "CI",
+    "kristmas dīp": "CX",
+    "kroesia": "HR",
+    "kuk dīp": "CK",
+    "kuvet": "KW",
+    "kyuba": "CU",
+    "kyurasao": "CW",
+    "laiberīya": "LR",
+    "laos": "LA",
+    "laṭin amerika": "419",
+    "laṭviya": "LV",
+    "lebanon": "LB",
+    "lesotho": "LS",
+    "libya": "LY",
+    "likṭensṭein": "LI",
+    "liṭuaania": "LT",
+    "lksemborg": "LU",
+    "madagascar": "MG",
+    "madini aaprika republik": "CF",
+    "makao sar cina": "MO",
+    "malavī": "MW",
+    "māldīp": "MV",
+    "maleseāā": "MY",
+    "mali": "ML",
+    "malṭaa": "MT",
+    "marsall dīp": "MH",
+    "marṭinik": "MQ",
+    "mauriss": "MU",
+    "mauriṭaniya": "MR",
+    "mayoṭṭ": "YT",
+    "meksīko": "MX",
+    "Melanesia": "054",
+    "micronesiaa": "FM",
+    "Micronesian Region": "057",
+    "Middle Africa": "017",
+    "mojambik": "MZ",
+    "molḍovaa": "MD",
+    "monako": "MC",
+    "mongolia": "MN",
+    "monṭenegro": "ME",
+    "monṭserrarṭ": "MS",
+    "morkko": "MA",
+    "myanmar (brma)": "MM",
+    "naigeria": "NG",
+    "naījr": "NE",
+    "namibia": "NA",
+    "nauru": "NR",
+    "nederlanḍs": "NL",
+    "nepal": "NP",
+    "nikaraguaa": "NI",
+    "niyu": "NU",
+    "norpok dīp": "NF",
+    "North America": "003",
+    "Northern Africa": "015",
+    "Northern America": "021",
+    "Northern Europe": "154",
+    "norvay": "NO",
+    "nyu jīlanḍ": "NZ",
+    "nyu keleḍoniya": "NC",
+    "Oceania": "009",
+    "oman": "OM",
+    "Outlying Oceania": "QO",
+    "pakistan": "PK",
+    "paklaṇd dīp": "FK",
+    "palau": "PW",
+    "palesṭiati handi": "PS",
+    "panema": "PA",
+    "papua nyu gini": "PG",
+    "pareguvai": "PY",
+    "pēro dīp": "FO",
+    "peru": "PE",
+    "piji": "FJ",
+    "pilippines": "PH",
+    "pinlaṇd": "FI",
+    "piṭkarn dīp": "PN",
+    "polanḍ": "PL",
+    "Polynesia": "061",
+    "portugal": "PT",
+    "prans": "FR",
+    "prenc": "PF",
+    "prenc guiyana": "GF",
+    "prēnch dakiṇ teritorī": "TF",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
+    "puerto rico": "PR",
+    "raji, purti": "001",
+    "riyuniyn": "RE",
+    "romaniya": "RO",
+    "russia": "RU",
+    "rvanḍa": "RW",
+    "saipras": "CY",
+    "samoaa": "WS",
+    "san marino": "SM",
+    "sao tom aḍe prinsipe": "ST",
+    "Sark": "CQ",
+    "saūdi arabiya": "SA",
+    "se barṭelemi": "BL",
+    "seint helena": "SH",
+    "seint kiṭs āḍe nebis": "KN",
+    "seint lusiya": "LC",
+    "seint martin": "MF",
+    "seint pierri ande mikelon": "PM",
+    "seint vinseṇṭ aḍe grenaḍi": "VC",
+    "senegal": "SN",
+    "serbia": "RS",
+    "seuṭa aḍe melila": "EA",
+    "sierra leyon": "SL",
+    "singapor": "SG",
+    "sint mārṭen": "SX",
+    "sīriya": "SY",
+    "siselles": "SC",
+    "slovakia": "SK",
+    "slovenia": "SI",
+    "soloman dīp": "SB",
+    "somaliya": "SO",
+    "South America": "005",
+    "Southeast Asia": "035",
+    "Southern Africa": "018",
+    "Southern Asia": "034",
+    "Southern Europe": "039",
+    "spein": "ES",
+    "sri lanka": "LK",
+    "Sub-Saharan Africa": "202",
+    "suḍan": "SD",
+    "surīname": "SR",
+    "svalbard aḍe jan mayen": "SJ",
+    "sviḍen": "SE",
+    "svitjerlaṇḍ": "CH",
+    "tailanḍ": "TH",
+    "taivan": "TW",
+    "tajākīstān": "TJ",
+    "ṭanjaniya": "TZ",
+    "ṭimor - leste": "TL",
+    "ṭogo": "TG",
+    "ṭokelau": "TK",
+    "ṭonga": "TO",
+    "ṭriniḍaḍ aḍe ṭobego": "TT",
+    "Tristan da Cunha": "TA",
+    "ṭunisiaa": "TN",
+    "turkī": "TR",
+    "turkmenīstān": "TM",
+    "turks aḍe keikes dīp": "TC",
+    "tuvala": "TV",
+    "ūjbekistaan": "UZ",
+    "uniṭeḍ kingḍom": "GB",
+    "United Nations": "UN",
+    "Unknown Region": "ZZ",
+    "ūrugve": "UY",
+    "uttar koriya": "KP",
+    "uttar mariyana dīp": "MP",
+    "uttar mesiḍoniya": "MK",
+    "vallis aḍe puṭuna": "WF",
+    "vanuaatu": "VU",
+    "vedakuṇpu sahara": "EH",
+    "venejuela": "VE",
+    "viyetnam": "VN",
+    "Western Africa": "011",
+    "Western Asia": "145",
+    "Western Europe": "155",
+    "yemen": "YE",
+    "yu.es. aautlaing dīp": "UM",
+    "yu.es. vrjin dīp": "VI",
+    "yūganḍa": "UG",
+    "yūkrain": "UA",
+    "yunaiṭeḍ stets": "US"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/ctryreverse.json b/js/data/locale/kxv/ctryreverse.json
new file mode 100644
index 0000000000..6d7e0dc400
--- /dev/null
+++ b/js/data/locale/kxv/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "raji, purti",
+    "002": "Africa",
+    "003": "North America",
+    "005": "South America",
+    "009": "Oceania",
+    "011": "Western Africa",
+    "013": "Central America",
+    "014": "Eastern Africa",
+    "015": "Northern Africa",
+    "017": "Middle Africa",
+    "018": "Southern Africa",
+    "019": "Americas",
+    "021": "Northern America",
+    "029": "Caribbean",
+    "030": "Eastern Asia",
+    "034": "Southern Asia",
+    "035": "Southeast Asia",
+    "039": "Southern Europe",
+    "053": "Australasia",
+    "054": "Melanesia",
+    "057": "Micronesian Region",
+    "061": "Polynesia",
+    "142": "Asia",
+    "143": "Central Asia",
+    "145": "Western Asia",
+    "150": "Europe",
+    "151": "Eastern Europe",
+    "154": "Northern Europe",
+    "155": "Western Europe",
+    "202": "Sub-Saharan Africa",
+    "419": "laṭin amerika",
+    "AC": "Ascension Island",
+    "AD": "ānḍorā",
+    "AE": "aanḍiti arab emireṭs",
+    "AF": "aapganistan",
+    "AG": "eṇṭigaa aḍe barbuḍaa",
+    "AI": "anguila",
+    "AL": "albania",
+    "AM": "aarmenia",
+    "AO": "angola",
+    "AQ": "ānṭarkṭikā",
+    "AR": "aarhenṭina",
+    "AS": "amerikati samva",
+    "AT": "austria",
+    "AU": "astrelia",
+    "AW": "aruba",
+    "AX": "eleṇḍ dīp",
+    "AZ": "ajerbaijan",
+    "BA": "bajnia aḍe hertsegovina",
+    "BB": "barbaḍos",
+    "BD": "banglades",
+    "BE": "beljiym",
+    "BF": "burkina paso",
+    "BG": "bulgaria",
+    "BH": "bāren",
+    "BI": "buruṇḍī",
+    "BJ": "benīn",
+    "BL": "se barṭelemi",
+    "BM": "bermuḍā",
+    "BN": "brunae",
+    "BO": "boliviā",
+    "BQ": "karibiyn nedrlends",
+    "BR": "brājil",
+    "BS": "bāhāmās",
+    "BT": "buṭān",
+    "BV": "Bouvet Island",
+    "BW": "boṭsvana",
+    "BY": "belarūs",
+    "BZ": "belīj",
+    "CA": "kanaḍa",
+    "CC": "kokos keling dīp",
+    "CD": "kongo - kinsasa",
+    "CF": "madini aaprika republik",
+    "CG": "kongo - brajavil",
+    "CH": "svitjerlaṇḍ",
+    "CI": "koṭ ḍi vaa",
+    "CK": "kuk dīp",
+    "CL": "cili",
+    "CM": "kemarun",
+    "CN": "caina",
+    "CO": "kolmbiaa",
+    "CP": "Clipperton Island",
+    "CQ": "Sark",
+    "CR": "kosta rika",
+    "CU": "kyuba",
+    "CV": "kep vrḍi",
+    "CW": "kyurasao",
+    "CX": "kristmas dīp",
+    "CY": "saipras",
+    "CZ": "cekiya",
+    "DE": "jermanī",
+    "DG": "ḍiego garsia",
+    "DJ": "jibutī",
+    "DK": "ḍenmark",
+    "DM": "dominika",
+    "DO": "dominikan republik",
+    "DZ": "aljīriaa",
+    "EA": "seuṭa aḍe melila",
+    "EC": "ekvaḍor",
+    "EE": "esṭoniya",
+    "EG": "ījipṭ",
+    "EH": "vedakuṇpu sahara",
+    "ER": "īriṭriaa",
+    "ES": "spein",
+    "ET": "ītiyopiya",
+    "EU": "European Union",
+    "EZ": "Eurozone",
+    "FI": "pinlaṇd",
+    "FJ": "piji",
+    "FK": "paklaṇd dīp",
+    "FM": "micronesiaa",
+    "FO": "pēro dīp",
+    "FR": "prans",
+    "GA": "gbon",
+    "GB": "uniṭeḍ kingḍom",
+    "GD": "graneida",
+    "GE": "jeorjiaa",
+    "GF": "prenc guiyana",
+    "GG": "grnse",
+    "GH": "gana",
+    "GI": "jbralṭr",
+    "GL": "grīnlanḍ",
+    "GM": "gambia",
+    "GN": "gini",
+    "GP": "gvadelup",
+    "GQ": "ikveṭorial gini",
+    "GR": "grīs",
+    "GS": "dakiṇ jārjiā aḍe dakiṇ sandwich dīp",
+    "GT": "gvaṭemala",
+    "GU": "guām",
+    "GW": "gini-bisau",
+    "GY": "guyana",
+    "HK": "hong kong (sar) caina",
+    "HM": "Heard & McDonald Islands",
+    "HN": "honḍuras",
+    "HR": "kroesia",
+    "HT": "haiti",
+    "HU": "hungarī",
+    "IC": "kanari dīp",
+    "ID": "inḍonesiya",
+    "IE": "aayarlanḍ",
+    "IL": "israel",
+    "IM": "aail āp man",
+    "IN": "inḍiā",
+    "IO": "briṭis inḍiāti samudra handi",
+    "IQ": "irak",
+    "IR": "iran",
+    "IS": "aislanḍ",
+    "IT": "iṭalī",
+    "JE": "jersī",
+    "JM": "jamaika",
+    "JO": "jorḍan",
+    "JP": "japan",
+    "KE": "kenya",
+    "KG": "kirgistan",
+    "KH": "kamboḍia",
+    "KI": "kiribaṭi",
+    "KM": "komoros",
+    "KN": "seint kiṭs āḍe nebis",
+    "KP": "uttar koriya",
+    "KR": "dkiṇ koriyaa",
+    "KW": "kuvet",
+    "KY": "keimen dīp",
+    "KZ": "kajakstan",
+    "LA": "laos",
+    "LB": "lebanon",
+    "LC": "seint lusiya",
+    "LI": "likṭensṭein",
+    "LK": "sri lanka",
+    "LR": "laiberīya",
+    "LS": "lesotho",
+    "LT": "liṭuaania",
+    "LU": "lksemborg",
+    "LV": "laṭviya",
+    "LY": "libya",
+    "MA": "morkko",
+    "MC": "monako",
+    "MD": "molḍovaa",
+    "ME": "monṭenegro",
+    "MF": "seint martin",
+    "MG": "madagascar",
+    "MH": "marsall dīp",
+    "MK": "uttar mesiḍoniya",
+    "ML": "mali",
+    "MM": "myanmar (brma)",
+    "MN": "mongolia",
+    "MO": "makao sar cina",
+    "MP": "uttar mariyana dīp",
+    "MQ": "marṭinik",
+    "MR": "mauriṭaniya",
+    "MS": "monṭserrarṭ",
+    "MT": "malṭaa",
+    "MU": "mauriss",
+    "MV": "māldīp",
+    "MW": "malavī",
+    "MX": "meksīko",
+    "MY": "maleseāā",
+    "MZ": "mojambik",
+    "NA": "namibia",
+    "NC": "nyu keleḍoniya",
+    "NE": "naījr",
+    "NF": "norpok dīp",
+    "NG": "naigeria",
+    "NI": "nikaraguaa",
+    "NL": "nederlanḍs",
+    "NO": "norvay",
+    "NP": "nepal",
+    "NR": "nauru",
+    "NU": "niyu",
+    "NZ": "nyu jīlanḍ",
+    "OM": "oman",
+    "PA": "panema",
+    "PE": "peru",
+    "PF": "prenc",
+    "PG": "papua nyu gini",
+    "PH": "pilippines",
+    "PK": "pakistan",
+    "PL": "polanḍ",
+    "PM": "seint pierri ande mikelon",
+    "PN": "piṭkarn dīp",
+    "PR": "puerto rico",
+    "PS": "palesṭiati handi",
+    "PT": "portugal",
+    "PW": "palau",
+    "PY": "pareguvai",
+    "QA": "katar",
+    "QO": "Outlying Oceania",
+    "RE": "riyuniyn",
+    "RO": "romaniya",
+    "RS": "serbia",
+    "RU": "russia",
+    "RW": "rvanḍa",
+    "SA": "saūdi arabiya",
+    "SB": "soloman dīp",
+    "SC": "siselles",
+    "SD": "suḍan",
+    "SE": "sviḍen",
+    "SG": "singapor",
+    "SH": "seint helena",
+    "SI": "slovenia",
+    "SJ": "svalbard aḍe jan mayen",
+    "SK": "slovakia",
+    "SL": "sierra leyon",
+    "SM": "san marino",
+    "SN": "senegal",
+    "SO": "somaliya",
+    "SR": "surīname",
+    "SS": "dkiṇ sūdan",
+    "ST": "sao tom aḍe prinsipe",
+    "SV": "el salvador",
+    "SX": "sint mārṭen",
+    "SY": "sīriya",
+    "SZ": "esvaṭini",
+    "TA": "Tristan da Cunha",
+    "TC": "turks aḍe keikes dīp",
+    "TD": "cad",
+    "TF": "prēnch dakiṇ teritorī",
+    "TG": "ṭogo",
+    "TH": "tailanḍ",
+    "TJ": "tajākīstān",
+    "TK": "ṭokelau",
+    "TL": "ṭimor - leste",
+    "TM": "turkmenīstān",
+    "TN": "ṭunisiaa",
+    "TO": "ṭonga",
+    "TR": "turkī",
+    "TT": "ṭriniḍaḍ aḍe ṭobego",
+    "TV": "tuvala",
+    "TW": "taivan",
+    "TZ": "ṭanjaniya",
+    "UA": "yūkrain",
+    "UG": "yūganḍa",
+    "UM": "yu.es. aautlaing dīp",
+    "UN": "United Nations",
+    "US": "yunaiṭeḍ stets",
+    "UY": "ūrugve",
+    "UZ": "ūjbekistaan",
+    "VA": "bāṭikān",
+    "VC": "seint vinseṇṭ aḍe grenaḍi",
+    "VE": "venejuela",
+    "VG": "briṭis vrjin dīp",
+    "VI": "yu.es. vrjin dīp",
+    "VN": "viyetnam",
+    "VU": "vanuaatu",
+    "WF": "vallis aḍe puṭuna",
+    "WS": "samoaa",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
+    "XK": "kosovo",
+    "YE": "yemen",
+    "YT": "mayoṭṭ",
+    "ZA": "dkīṇ aaprika",
+    "ZM": "jambiya",
+    "ZW": "jimbabve",
+    "ZZ": "Unknown Region"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/dateformats.json b/js/data/locale/kxv/dateformats.json
new file mode 100644
index 0000000000..ae45084678
--- /dev/null
+++ b/js/data/locale/kxv/dateformats.json
@@ -0,0 +1,123 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "d"
+            },
+            "dm": {
+                "l": "d MMMM",
+                "m": "d MMM"
+            },
+            "dmw": {
+                "f": "EEEE, d MMMM",
+                "l": "EEE, d MMMM",
+                "m": "EE, d MMM",
+                "s": "E, d/M"
+            },
+            "dmwy": {
+                "f": "EEEE, d MMMM yyyy",
+                "l": "EEE, d MMMM yyyy",
+                "m": "EE, d MMM yyyy",
+                "s": "E, d/M/yy"
+            },
+            "dmy": {
+                "l": "d MMMM yyyy",
+                "m": "d MMM yyyy"
+            },
+            "dw": {
+                "f": "EEEE, d",
+                "l": "EEE, d",
+                "m": "EE, d",
+                "s": "E, d"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM"
+            },
+            "my": {
+                "l": "MMMM yyyy",
+                "m": "MMM yyyy"
+            }
+        },
+        "order": {
+            "f": "{date} 'aã' {time}",
+            "l": "{date} 'aã' {time}",
+            "m": "{date}, {time}",
+            "s": "{date}, {time}"
+        },
+        "range": {
+            "c00": {
+                "f": "{sd} {sm} {sy} aã {st} – {et}",
+                "l": "{sd} {sm} {sy} aã {st} – {et}",
+                "m": "{sd} {sm} {sy}, {st} – {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {et}"
+            },
+            "c01": {
+                "f": "{sd} {sm} {sy} aã {st} – {ed} {em} {ey} aã {et}",
+                "l": "{sd} {sm} {sy} aã {st} – {ed} {em} {ey} aã {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c02": {
+                "f": "{sd} {sm} {sy} aã {st} – {ed} {em} {ey} aã {et}",
+                "l": "{sd} {sm} {sy} aã {st} – {ed} {em} {ey} aã {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c03": {
+                "f": "{sd} {sm} {sy} aã {st} – {ed} {em} {ey} aã {et}",
+                "l": "{sd} {sm} {sy} aã {st} – {ed} {em} {ey} aã {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c10": {
+                "f": "{sd} – {ed} {em} {ey}",
+                "l": "{sd} – {ed} {em} {ey}",
+                "m": "{sd} – {ed} {em} {ey}",
+                "s": "{sd} – {ed}/{em}/{ey}"
+            },
+            "c11": {
+                "f": "{sd} {sm} – {ed} {em} {ey}",
+                "l": "{sd} {sm} – {ed} {em} {ey}",
+                "m": "{sd} {sm} – {ed} {em} {ey}",
+                "s": "{sd}/{sm} – {ed}/{em}/{ey}"
+            },
+            "c12": {
+                "m": "{sd} {sm} {sy} – {ed} {em} {ey}"
+            },
+            "c20": {
+                "m": "{sm} {sy} – {em} {ey}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/langname.jf b/js/data/locale/kxv/langname.jf
new file mode 100644
index 0000000000..a14595c236
--- /dev/null
+++ b/js/data/locale/kxv/langname.jf
@@ -0,0 +1,4 @@
+{
+    "generated": true,
+    "language.name": "Kuvi"
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/list.json b/js/data/locale/kxv/list.json
new file mode 100644
index 0000000000..faf02876b5
--- /dev/null
+++ b/js/data/locale/kxv/list.json
@@ -0,0 +1,46 @@
+{
+    "or": {
+        "full": {
+            "2": "{0} aaḍẽ {1}",
+            "end": "{0}, aadtẽ {1}"
+        },
+        "long": {
+            "2": "{0} aaḍẽ {1}",
+            "end": "{0}, aadtẽ {1}"
+        },
+        "medium": {
+            "2": "{0} aaḍẽ {1}",
+            "end": "{0}, aadtẽ {1}"
+        },
+        "short": {
+            "2": "{0} aaḍẽ {1}",
+            "end": "{0}, aadtẽ {1}"
+        }
+    },
+    "standard": {
+        "full": {
+            "2": "{0} aḍe {1}",
+            "end": "{0}, aḍe {1}"
+        },
+        "long": {
+            "2": "{0} aḍe {1}",
+            "end": "{0}, aḍe {1}"
+        },
+        "medium": {
+            "2": "{0} aḍe {1}",
+            "end": "{0}, aḍe {1}"
+        },
+        "short": {
+            "2": "{0} aḍe {1}",
+            "end": "{0}, aḍe {1}"
+        }
+    },
+    "unit": {
+        "short": {
+            "2": "{0} {1}",
+            "end": "{0} {1}",
+            "middle": "{0} {1}",
+            "start": "{0} {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/numfmt.jf b/js/data/locale/kxv/numfmt.jf
new file mode 100644
index 0000000000..9ac63474cc
--- /dev/null
+++ b/js/data/locale/kxv/numfmt.jf
@@ -0,0 +1,10 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "common": "{s}{n}",
+            "commonNegative": "-{s}{n}"
+        },
+        "secgroupSize": 2
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/scripts.jf b/js/data/locale/kxv/scripts.jf
new file mode 100644
index 0000000000..2a4c18d694
--- /dev/null
+++ b/js/data/locale/kxv/scripts.jf
@@ -0,0 +1,9 @@
+{
+    "generated": true,
+    "scripts": [
+        "Latn",
+        "Deva",
+        "Orya",
+        "Telu"
+    ]
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/sysres.json b/js/data/locale/kxv/sysres.json
new file mode 100644
index 0000000000..54f02d3cff
--- /dev/null
+++ b/js/data/locale/kxv/sysres.json
@@ -0,0 +1,161 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "E0": "aa",
+    "E1": "s",
+    "E2": "ma",
+    "E3": "pu",
+    "E4": "la",
+    "E5": "su",
+    "E6": "sa",
+    "EE0": "aa",
+    "EE1": "s",
+    "EE2": "ma",
+    "EE3": "pu",
+    "EE4": "laki",
+    "EE5": "su",
+    "EE6": "sa",
+    "EEE0": "aadi",
+    "EEE1": "smba",
+    "EEE2": "manga",
+    "EEE3": "puda",
+    "EEE4": "laki",
+    "EEE5": "sukru",
+    "EEE6": "sani",
+    "EEEE0": "aadi vara",
+    "EEEE1": "smbara",
+    "EEEE2": "mangaḍa",
+    "EEEE3": "pudara",
+    "EEEE4": "laki vara",
+    "EEEE5": "sukru vara",
+    "EEEE6": "sani vara",
+    "G-1": "bce",
+    "G1": "ce",
+    "MMM1": "pusu",
+    "MMM10": "dasara",
+    "MMM11": "divi",
+    "MMM12": "pande",
+    "MMM2": "maha",
+    "MMM3": "pagu",
+    "MMM4": "hire",
+    "MMM5": "bese",
+    "MMM6": "jaṭṭa",
+    "MMM7": "aasaḍi",
+    "MMM8": "srabĩ",
+    "MMM9": "bado",
+    "MMMM1": "pusu lenju",
+    "MMMM10": "dasara lenju",
+    "MMMM11": "divi lenju",
+    "MMMM12": "pande lenju",
+    "MMMM2": "maha lenju",
+    "MMMM3": "pagu lenju",
+    "MMMM4": "hire lenju",
+    "MMMM5": "bese lenju",
+    "MMMM6": "jaṭṭa lenju",
+    "MMMM7": "aasaḍi lenju",
+    "MMMM8": "srabĩ lenju",
+    "MMMM9": "bado lenju",
+    "N1": "p",
+    "N10": "d",
+    "N11": "d",
+    "N12": "p",
+    "N2": "m",
+    "N3": "p",
+    "N4": "h",
+    "N5": "b",
+    "N6": "j",
+    "N7": "a",
+    "N8": "s",
+    "N9": "b",
+    "NN1": "pu",
+    "NN10": "da",
+    "NN11": "di",
+    "NN12": "pa",
+    "NN2": "ma",
+    "NN3": "pa",
+    "NN4": "hi",
+    "NN5": "be",
+    "NN6": "ja",
+    "NN7": "aa",
+    "NN8": "sr",
+    "NN9": "ba",
+    "a0": "am",
+    "a1": "pm",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": " ",
+    "separatorMedium": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/kxv/unitfmt.json b/js/data/locale/kxv/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/kxv/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/ky/unitfmt.json b/js/data/locale/ky/unitfmt.json
index 5edad9d0e4..6a067f4208 100644
--- a/js/data/locale/ky/unitfmt.json
+++ b/js/data/locale/ky/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} атмосфера|#{n} атм",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} бит",
             "bit-per-second": "#секундуна {n} бит",
             "british-thermal-unit": "#{n} Британдык жылуулук бирдиги",
@@ -43,8 +44,8 @@
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dot": "#{n} графикалык чекит",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "one#сантиметрге {n} чекит|#сантиметрге {n} чекиттер",
+            "dot-per-inch": "one#дюйм үчүн чекит|#{n} дюйм үчүн чекит",
             "dram": "#{n} драм",
             "drop": "#{n} дроп",
             "dunam": "#{n} dunam",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} атм",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} бит",
             "bit-per-second": "#{n} бит/сек",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,8 @@
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dot": "#{n} графикалык чекит",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
             "drop": "#{n} дроп",
             "dunam": "#{n} dunam",
diff --git a/js/data/locale/la/unitfmt.json b/js/data/locale/la/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/la/unitfmt.json
+++ b/js/data/locale/la/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/lag/ctrynames.json b/js/data/locale/lag/ctrynames.json
index c6b41b2d5a..9950ca72ff 100644
--- a/js/data/locale/lag/ctrynames.json
+++ b/js/data/locale/lag/ctrynames.json
@@ -36,6 +36,7 @@
     "Botiswáana": "BW",
     "Bouvet Island": "BV",
     "Brasíili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Bukíini": "MG",
     "Bukinafáaso": "BF",
     "Buligaría": "BG",
@@ -98,7 +99,6 @@
     "Isle of Man": "IM",
     "Itália": "IT",
     "Ivori Kositi": "CI",
-    "Ɨsɨ yʉ Ʉɨngeréesa irivii ra Híindi": "IO",
     "Jamáika": "JM",
     "Jamuhúuri ya Chéeki": "CZ",
     "Jamuhúuri ya Dominɨka": "DO",
diff --git a/js/data/locale/lag/ctryreverse.json b/js/data/locale/lag/ctryreverse.json
index 296bb09b24..2d943186d0 100644
--- a/js/data/locale/lag/ctryreverse.json
+++ b/js/data/locale/lag/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isiraéeli",
     "IM": "Isle of Man",
     "IN": "Índia",
-    "IO": "Ɨsɨ yʉ Ʉɨngeréesa irivii ra Híindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iráaki",
     "IR": "Ʉajéemi",
     "IS": "Aisiláandi",
diff --git a/js/data/locale/lag/unitfmt.json b/js/data/locale/lag/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/lag/unitfmt.json
+++ b/js/data/locale/lag/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/lb/ctrynames.json b/js/data/locale/lb/ctrynames.json
index b3d6db598e..f84b3120bb 100644
--- a/js/data/locale/lb/ctrynames.json
+++ b/js/data/locale/lb/ctrynames.json
@@ -37,7 +37,7 @@
     "Bouvetinsel": "BV",
     "Brasilien": "BR",
     "Britesch Joffereninselen": "VG",
-    "Britescht Territorium am Indeschen Ozean": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bulgarien": "BG",
     "Burkina Faso": "BF",
diff --git a/js/data/locale/lb/ctryreverse.json b/js/data/locale/lb/ctryreverse.json
index 4cb1932e11..4ab17a7af0 100644
--- a/js/data/locale/lb/ctryreverse.json
+++ b/js/data/locale/lb/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Isle of Man",
     "IN": "Indien",
-    "IO": "Britescht Territorium am Indeschen Ozean",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Island",
diff --git a/js/data/locale/lb/sysres.json b/js/data/locale/lb/sysres.json
index ea5715f9f5..ed19d8efc6 100644
--- a/js/data/locale/lb/sysres.json
+++ b/js/data/locale/lb/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#an {num} Sek.|#a(n) {num} Sek.",
     "#in {num}w": "one#an {num} W.|#a(n) {num} W.",
     "#in {num}y": "one#an {num} J.|#a(n) {num} J.",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} D|#{num} D",
     "#{num}d ago": "one#virun {num} D.|#viru(n) {num} D.",
     "#{num}h": "one#{num} st|#{num} st",
@@ -196,10 +196,10 @@
     "cccc6": "Samschdeg",
     "durationLongDays": "one#{num} D|#{num} D",
     "durationMediumHours": "one#{num} st|#{num} st",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} W|#{num} W",
     "durationMediumYears": "one#{num} J|#{num} J",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} min|#{num} min",
     "durationShortMonths": "one#{num} M|#{num} M",
     "finalSeparatorFull": ", ",
diff --git a/js/data/locale/lb/unitfmt.json b/js/data/locale/lb/unitfmt.json
index f5a201695f..8cdbcebba2 100644
--- a/js/data/locale/lb/unitfmt.json
+++ b/js/data/locale/lb/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "one#{n} Bit|#{n} Bits",
             "bit-per-second": "#{n} Bits pro Sekonn",
             "british-thermal-unit": "#{n} Btu",
@@ -53,7 +54,6 @@
             "fathom": "one#{n} Nautesche Fuedem|#{n} Nautesch Fiedem",
             "fluid-ounce": "one#{n} Flësseg-Onz|#{n} Flësseg-Onzen",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "one#{n} Liewensmëttelkalorie|#{n} Liewensmëttelkalorien",
             "foot": "#{n} Fouss",
             "foot-per-second": "#{n} Fouss pro Sekonn",
             "furlong": "one#{n} Furlong|#{n} Furlongs",
@@ -213,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/Sek.",
             "british-thermal-unit": "#{n} Btu",
@@ -256,7 +257,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/Sek.",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/lg/ctrynames.json b/js/data/locale/lg/ctrynames.json
index b15001388b..cc5d38bb4e 100644
--- a/js/data/locale/lg/ctrynames.json
+++ b/js/data/locale/lg/ctrynames.json
@@ -32,7 +32,6 @@
     "Beremuda": "BM",
     "Bizanga by’eSolomooni": "SB",
     "Bizinga by’e Kepu Veredi": "CV",
-    "Bizinga by’eCago": "IO",
     "Bizinga by’eFalikalandi": "FK",
     "Bizinga by’eKomoro": "KM",
     "Bizinga by’eMalidive": "MV",
@@ -48,6 +47,7 @@
     "Botiswana": "BW",
     "Bouvet Island": "BV",
     "Boziniya Hezegovina": "BA",
+    "British Indian Ocean Territory": "IO",
     "Bubirigi": "BE",
     "Budaaki": "DE",
     "Bufalansa": "FR",
diff --git a/js/data/locale/lg/ctryreverse.json b/js/data/locale/lg/ctryreverse.json
index 2de982b627..b25b303bbd 100644
--- a/js/data/locale/lg/ctryreverse.json
+++ b/js/data/locale/lg/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Yisirayeri",
     "IM": "Isle of Man",
     "IN": "Buyindi",
-    "IO": "Bizinga by’eCago",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Yiraaka",
     "IR": "Yiraani",
     "IS": "Ayisirandi",
diff --git a/js/data/locale/lg/unitfmt.json b/js/data/locale/lg/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/lg/unitfmt.json
+++ b/js/data/locale/lg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/lij/numfmt.jf b/js/data/locale/lij/numfmt.jf
index 8f7a2a778e..d4b6f1bbeb 100644
--- a/js/data/locale/lij/numfmt.jf
+++ b/js/data/locale/lij/numfmt.jf
@@ -1,6 +1,10 @@
 {
     "generated": true,
     "numfmt": {
+        "currencyFormats": {
+            "common": "{n} {s}",
+            "commonNegative": "-{n} {s}"
+        },
         "decimalChar": ",",
         "groupChar": "."
     }
diff --git a/js/data/locale/lij/sysres.json b/js/data/locale/lij/sysres.json
index 9fe1ed5608..e397906d25 100644
--- a/js/data/locale/lij/sysres.json
+++ b/js/data/locale/lij/sysres.json
@@ -67,66 +67,75 @@
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
     "B1": "AM",
     "B5": "PM",
-    "EE0": "Sun",
-    "EE1": "Mon",
-    "EE2": "Tue",
-    "EE3": "Wed",
-    "EE4": "Thu",
-    "EE5": "Fri",
-    "EE6": "Sat",
-    "EEEE0": "Sun",
-    "EEEE1": "Mon",
-    "EEEE2": "Tue",
-    "EEEE3": "Wed",
-    "EEEE4": "Thu",
-    "EEEE5": "Fri",
-    "EEEE6": "Sat",
-    "MMM1": "M01",
-    "MMM10": "M10",
-    "MMM11": "M11",
-    "MMM12": "M12",
-    "MMM2": "M02",
-    "MMM3": "M03",
-    "MMM4": "M04",
-    "MMM5": "M05",
-    "MMM6": "M06",
-    "MMM7": "M07",
-    "MMM8": "M08",
-    "MMM9": "M09",
-    "MMMM1": "M01",
-    "MMMM10": "M10",
-    "MMMM11": "M11",
-    "MMMM12": "M12",
-    "MMMM2": "M02",
-    "MMMM3": "M03",
-    "MMMM4": "M04",
-    "MMMM5": "M05",
-    "MMMM6": "M06",
-    "MMMM7": "M07",
-    "MMMM8": "M08",
-    "MMMM9": "M09",
-    "N1": "M",
-    "N10": "M",
-    "N11": "M",
-    "N12": "M",
-    "N2": "M",
-    "N4": "M",
-    "N6": "M",
-    "N7": "M",
-    "N8": "M",
-    "N9": "M",
-    "NN1": "M0",
-    "NN10": "M1",
-    "NN11": "M1",
-    "NN12": "M1",
-    "NN2": "M0",
-    "NN3": "M0",
-    "NN4": "M0",
-    "NN5": "M0",
-    "NN6": "M0",
-    "NN7": "M0",
-    "NN8": "M0",
-    "NN9": "M0",
+    "EE0": "domenega",
+    "EE1": "lunesdì",
+    "EE2": "mätesdì",
+    "EE3": "mäcordì",
+    "EE4": "zeuggia",
+    "EE5": "venardì",
+    "EE6": "sabbo",
+    "EEE0": "domenega",
+    "EEE1": "lunesdì",
+    "EEE2": "mätesdì",
+    "EEE3": "mäcordì",
+    "EEE4": "zeuggia",
+    "EEE5": "venardì",
+    "EEE6": "sabbo",
+    "EEEE0": "domenega",
+    "EEEE1": "lunesdì",
+    "EEEE2": "mätesdì",
+    "EEEE3": "mäcordì",
+    "EEEE4": "zeuggia",
+    "EEEE5": "venardì",
+    "EEEE6": "sabbo",
+    "MMM1": "de zenâ",
+    "MMM10": "d’ottobre",
+    "MMM11": "de novembre",
+    "MMM12": "de dexembre",
+    "MMM2": "de frevâ",
+    "MMM3": "de marso",
+    "MMM4": "d’arvî",
+    "MMM5": "de mazzo",
+    "MMM6": "de zugno",
+    "MMM7": "de luggio",
+    "MMM8": "d’agosto",
+    "MMM9": "de settembre",
+    "MMMM1": "de zenâ",
+    "MMMM10": "d’ottobre",
+    "MMMM11": "de novembre",
+    "MMMM12": "de dexembre",
+    "MMMM2": "de frevâ",
+    "MMMM3": "de marso",
+    "MMMM4": "d’arvî",
+    "MMMM5": "de mazzo",
+    "MMMM6": "de zugno",
+    "MMMM7": "de luggio",
+    "MMMM8": "d’agosto",
+    "MMMM9": "de settembre",
+    "N1": "d",
+    "N10": "d",
+    "N11": "d",
+    "N12": "d",
+    "N2": "d",
+    "N3": "d",
+    "N4": "d",
+    "N5": "d",
+    "N6": "d",
+    "N7": "d",
+    "N8": "d",
+    "N9": "d",
+    "NN1": "de",
+    "NN10": "d’",
+    "NN11": "de",
+    "NN12": "de",
+    "NN2": "de",
+    "NN3": "de",
+    "NN4": "d’",
+    "NN5": "de",
+    "NN6": "de",
+    "NN7": "de",
+    "NN8": "d’",
+    "NN9": "de",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
     "durationMediumMillis": "#{num} ms",
diff --git a/js/data/locale/lij/unitfmt.json b/js/data/locale/lij/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/lij/unitfmt.json
+++ b/js/data/locale/lij/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/lkt/unitfmt.json b/js/data/locale/lkt/unitfmt.json
index 55f78c1d61..31b0fc5143 100644
--- a/js/data/locale/lkt/unitfmt.json
+++ b/js/data/locale/lkt/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mdf/ctrynames.json b/js/data/locale/lmo/ctrynames.json
similarity index 99%
rename from js/data/locale/mdf/ctrynames.json
rename to js/data/locale/lmo/ctrynames.json
index 3cf0212256..e747076699 100644
--- a/js/data/locale/mdf/ctrynames.json
+++ b/js/data/locale/lmo/ctrynames.json
@@ -127,7 +127,7 @@
     "Ireland": "IE",
     "Isle of Man": "IM",
     "Israel": "IL",
-    "Italy": "IT",
+    "Italia": "IT",
     "Jamaica": "JM",
     "Japan": "JP",
     "Jersey": "JE",
@@ -218,6 +218,7 @@
     "Samoa": "WS",
     "San Marino": "SM",
     "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
     "Saudi Arabia": "SA",
     "Senegal": "SN",
     "Serbia": "RS",
@@ -265,7 +266,7 @@
     "Trinidad & Tobago": "TT",
     "Tristan da Cunha": "TA",
     "Tunisia": "TN",
-    "Turkey": "TR",
+    "Türkiye": "TR",
     "Turkmenistan": "TM",
     "Turks & Caicos Islands": "TC",
     "Tuvalu": "TV",
diff --git a/js/data/locale/ann/ctryreverse.json b/js/data/locale/lmo/ctryreverse.json
similarity index 99%
rename from js/data/locale/ann/ctryreverse.json
rename to js/data/locale/lmo/ctryreverse.json
index 1a338682b8..8dd04e4e87 100644
--- a/js/data/locale/ann/ctryreverse.json
+++ b/js/data/locale/lmo/ctryreverse.json
@@ -81,6 +81,7 @@
     "CN": "China",
     "CO": "Colombia",
     "CP": "Clipperton Island",
+    "CQ": "Sark",
     "CR": "Costa Rica",
     "CU": "Cuba",
     "CV": "Cape Verde",
@@ -146,7 +147,7 @@
     "IQ": "Iraq",
     "IR": "Iran",
     "IS": "Iceland",
-    "IT": "Italy",
+    "IT": "Italia",
     "JE": "Jersey",
     "JM": "Jamaica",
     "JO": "Jordan",
@@ -263,7 +264,7 @@
     "TM": "Turkmenistan",
     "TN": "Tunisia",
     "TO": "Tonga",
-    "TR": "Turkey",
+    "TR": "Türkiye",
     "TT": "Trinidad & Tobago",
     "TV": "Tuvalu",
     "TW": "Taiwan",
diff --git a/js/data/locale/lmo/numfmt.jf b/js/data/locale/lmo/numfmt.jf
new file mode 100644
index 0000000000..5f3ed9b875
--- /dev/null
+++ b/js/data/locale/lmo/numfmt.jf
@@ -0,0 +1,7 @@
+{
+    "generated": true,
+    "numfmt": {
+        "decimalChar": ",",
+        "groupChar": "’"
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/lmo/sysres.json b/js/data/locale/lmo/sysres.json
index 03ebba6582..779f0d5dc6 100644
--- a/js/data/locale/lmo/sysres.json
+++ b/js/data/locale/lmo/sysres.json
@@ -65,66 +65,77 @@
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 year|#in {num} years": "#+{num} y",
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "EE0": "Sun",
-    "EE1": "Mon",
-    "EE2": "Tue",
-    "EE3": "Wed",
-    "EE4": "Thu",
-    "EE5": "Fri",
-    "EE6": "Sat",
-    "EEEE0": "Sun",
-    "EEEE1": "Mon",
-    "EEEE2": "Tue",
-    "EEEE3": "Wed",
-    "EEEE4": "Thu",
-    "EEEE5": "Fri",
-    "EEEE6": "Sat",
-    "MMM1": "M01",
-    "MMM10": "M10",
-    "MMM11": "M11",
-    "MMM12": "M12",
-    "MMM2": "M02",
-    "MMM3": "M03",
-    "MMM4": "M04",
-    "MMM5": "M05",
-    "MMM6": "M06",
-    "MMM7": "M07",
-    "MMM8": "M08",
-    "MMM9": "M09",
-    "MMMM1": "M01",
-    "MMMM10": "M10",
-    "MMMM11": "M11",
-    "MMMM12": "M12",
-    "MMMM2": "M02",
-    "MMMM3": "M03",
-    "MMMM4": "M04",
-    "MMMM5": "M05",
-    "MMMM6": "M06",
-    "MMMM7": "M07",
-    "MMMM8": "M08",
-    "MMMM9": "M09",
-    "N1": "M",
-    "N10": "M",
-    "N11": "M",
-    "N12": "M",
-    "N2": "M",
-    "N4": "M",
-    "N6": "M",
-    "N7": "M",
-    "N8": "M",
-    "N9": "M",
-    "NN1": "M0",
-    "NN10": "M1",
-    "NN11": "M1",
-    "NN12": "M1",
-    "NN2": "M0",
-    "NN3": "M0",
-    "NN4": "M0",
-    "NN5": "M0",
-    "NN6": "M0",
-    "NN7": "M0",
-    "NN8": "M0",
-    "NN9": "M0",
+    "EE0": "domenega",
+    "EE1": "lundì",
+    "EE2": "mardì",
+    "EE3": "mercoldì",
+    "EE4": "sgiovedì",
+    "EE5": "venerdì",
+    "EE6": "sabet",
+    "EEE0": "domenega",
+    "EEE1": "lundì",
+    "EEE2": "mardì",
+    "EEE3": "mercoldì",
+    "EEE4": "sgiovedì",
+    "EEE5": "venerdì",
+    "EEE6": "sabet",
+    "EEEE0": "domenega",
+    "EEEE1": "lundì",
+    "EEEE2": "mardì",
+    "EEEE3": "mercoldì",
+    "EEEE4": "sgiovedì",
+    "EEEE5": "venerdì",
+    "EEEE6": "sabet",
+    "MMM1": "sginer",
+    "MMM10": "otover",
+    "MMM11": "november",
+    "MMM12": "dicember",
+    "MMM2": "fevrer",
+    "MMM3": "marz",
+    "MMM4": "avril",
+    "MMM5": "masg",
+    "MMM6": "sgiugn",
+    "MMM7": "luj",
+    "MMM8": "avost",
+    "MMM9": "setember",
+    "MMMM1": "sginer",
+    "MMMM10": "otover",
+    "MMMM11": "november",
+    "MMMM12": "dicember",
+    "MMMM2": "fevrer",
+    "MMMM3": "marz",
+    "MMMM4": "avril",
+    "MMMM5": "masg",
+    "MMMM6": "sgiugn",
+    "MMMM7": "luj",
+    "MMMM8": "avost",
+    "MMMM9": "setember",
+    "N1": "s",
+    "N10": "o",
+    "N11": "n",
+    "N12": "d",
+    "N2": "f",
+    "N3": "m",
+    "N4": "a",
+    "N5": "m",
+    "N6": "s",
+    "N7": "l",
+    "N8": "a",
+    "N9": "s",
+    "NN1": "sg",
+    "NN10": "ot",
+    "NN11": "no",
+    "NN12": "di",
+    "NN2": "fe",
+    "NN3": "ma",
+    "NN4": "av",
+    "NN5": "ma",
+    "NN6": "sg",
+    "NN7": "lu",
+    "NN8": "av",
+    "NN9": "se",
+    "a0": "del matin",
+    "a1": "de sira",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
     "durationMediumMillis": "#{num} ms",
diff --git a/js/data/locale/lmo/unitfmt.json b/js/data/locale/lmo/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/lmo/unitfmt.json
+++ b/js/data/locale/lmo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ln/AO/ctrynames.json b/js/data/locale/ln/AO/ctrynames.json
index a269ee0469..eec6aa0951 100644
--- a/js/data/locale/ln/AO/ctrynames.json
+++ b/js/data/locale/ln/AO/ctrynames.json
@@ -49,6 +49,7 @@
     "Bouvet Island": "BV",
     "Brezílɛ": "BR",
     "Brineyi": "BN",
+    "British Indian Ocean Territory": "IO",
     "Bukina Faso": "BF",
     "Burundi": "BI",
     "Butáni": "BT",
@@ -147,7 +148,6 @@
     "Likisambulu": "LU",
     "Lishɛteni": "LI",
     "Litwani": "LT",
-    "Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya": "IO",
     "Macao SAR China": "MO",
     "Madagasikari": "MG",
     "Madívɛ": "MV",
diff --git a/js/data/locale/ln/AO/ctryreverse.json b/js/data/locale/ln/AO/ctryreverse.json
index c6c66de8ff..29e6597bc4 100644
--- a/js/data/locale/ln/AO/ctryreverse.json
+++ b/js/data/locale/ln/AO/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirayelɛ",
     "IM": "Isle of Man",
     "IN": "Índɛ",
-    "IO": "Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irâ",
     "IS": "Isilandɛ",
diff --git a/js/data/locale/ln/CF/ctrynames.json b/js/data/locale/ln/CF/ctrynames.json
index a269ee0469..eec6aa0951 100644
--- a/js/data/locale/ln/CF/ctrynames.json
+++ b/js/data/locale/ln/CF/ctrynames.json
@@ -49,6 +49,7 @@
     "Bouvet Island": "BV",
     "Brezílɛ": "BR",
     "Brineyi": "BN",
+    "British Indian Ocean Territory": "IO",
     "Bukina Faso": "BF",
     "Burundi": "BI",
     "Butáni": "BT",
@@ -147,7 +148,6 @@
     "Likisambulu": "LU",
     "Lishɛteni": "LI",
     "Litwani": "LT",
-    "Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya": "IO",
     "Macao SAR China": "MO",
     "Madagasikari": "MG",
     "Madívɛ": "MV",
diff --git a/js/data/locale/ln/CF/ctryreverse.json b/js/data/locale/ln/CF/ctryreverse.json
index c6c66de8ff..29e6597bc4 100644
--- a/js/data/locale/ln/CF/ctryreverse.json
+++ b/js/data/locale/ln/CF/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirayelɛ",
     "IM": "Isle of Man",
     "IN": "Índɛ",
-    "IO": "Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irâ",
     "IS": "Isilandɛ",
diff --git a/js/data/locale/ln/CG/ctrynames.json b/js/data/locale/ln/CG/ctrynames.json
index a269ee0469..eec6aa0951 100644
--- a/js/data/locale/ln/CG/ctrynames.json
+++ b/js/data/locale/ln/CG/ctrynames.json
@@ -49,6 +49,7 @@
     "Bouvet Island": "BV",
     "Brezílɛ": "BR",
     "Brineyi": "BN",
+    "British Indian Ocean Territory": "IO",
     "Bukina Faso": "BF",
     "Burundi": "BI",
     "Butáni": "BT",
@@ -147,7 +148,6 @@
     "Likisambulu": "LU",
     "Lishɛteni": "LI",
     "Litwani": "LT",
-    "Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya": "IO",
     "Macao SAR China": "MO",
     "Madagasikari": "MG",
     "Madívɛ": "MV",
diff --git a/js/data/locale/ln/CG/ctryreverse.json b/js/data/locale/ln/CG/ctryreverse.json
index c6c66de8ff..29e6597bc4 100644
--- a/js/data/locale/ln/CG/ctryreverse.json
+++ b/js/data/locale/ln/CG/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirayelɛ",
     "IM": "Isle of Man",
     "IN": "Índɛ",
-    "IO": "Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irâ",
     "IS": "Isilandɛ",
diff --git a/js/data/locale/ln/ctrynames.json b/js/data/locale/ln/ctrynames.json
index a269ee0469..eec6aa0951 100644
--- a/js/data/locale/ln/ctrynames.json
+++ b/js/data/locale/ln/ctrynames.json
@@ -49,6 +49,7 @@
     "Bouvet Island": "BV",
     "Brezílɛ": "BR",
     "Brineyi": "BN",
+    "British Indian Ocean Territory": "IO",
     "Bukina Faso": "BF",
     "Burundi": "BI",
     "Butáni": "BT",
@@ -147,7 +148,6 @@
     "Likisambulu": "LU",
     "Lishɛteni": "LI",
     "Litwani": "LT",
-    "Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya": "IO",
     "Macao SAR China": "MO",
     "Madagasikari": "MG",
     "Madívɛ": "MV",
diff --git a/js/data/locale/ln/ctryreverse.json b/js/data/locale/ln/ctryreverse.json
index c6c66de8ff..29e6597bc4 100644
--- a/js/data/locale/ln/ctryreverse.json
+++ b/js/data/locale/ln/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirayelɛ",
     "IM": "Isle of Man",
     "IN": "Índɛ",
-    "IO": "Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irâ",
     "IS": "Isilandɛ",
diff --git a/js/data/locale/ln/unitfmt.json b/js/data/locale/ln/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ln/unitfmt.json
+++ b/js/data/locale/ln/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/lo/ctrynames.json b/js/data/locale/lo/ctrynames.json
index da8f7eb02a..b4c68cf997 100644
--- a/js/data/locale/lo/ctrynames.json
+++ b/js/data/locale/lo/ctrynames.json
@@ -22,8 +22,8 @@
     "ເກົາຫລີໃຕ້": "KR",
     "ເກົາຫລີເໜືອ": "KP",
     "ຂົງເຂດທີ່ບໍ່ຮູ້ຈັກ": "ZZ",
-    "ເຂດແດນທາງໃຕ້ຂອຝຮັ່ງ": "TF",
-    "ເຂດແດນອັງກິດໃນມະຫາສະມຸດອິນເດຍ": "IO",
+    "ເຂດແດນທາງໃຕ້ຂອງຝຮັ່ງ": "TF",
+    "ເຂດແດນອັງກິດໃນມະຫາສະໝຸດອິນເດຍ": "IO",
     "ເຂດໄມໂຄຣເນຊຽນ": "057",
     "ເຂດຢູໂຣບ": "EZ",
     "ເຂດຫ່າງໄກໂອຊີເນຍ": "QO",
@@ -241,8 +241,8 @@
     "ອາຊີກາງ": "143",
     "ອາຊີຕາເວັນຕົກ": "145",
     "ອາຊີຕາເວັນອອກ": "030",
-    "ອາຊີຕາເວັນອອກສ່ຽງໄຕ້": "035",
-    "ອາຊີໄຕ້": "034",
+    "ອາຊີຕາເວັນອອກສຽງໃຕ້": "035",
+    "ອາຊີໃຕ້": "034",
     "ອາເຊີໄບຈານ": "AZ",
     "ອາຟການິດສະຖານ": "AF",
     "ອາຟຣິກາ": "002",
diff --git a/js/data/locale/lo/ctryreverse.json b/js/data/locale/lo/ctryreverse.json
index 283a23cab9..f49d679c00 100644
--- a/js/data/locale/lo/ctryreverse.json
+++ b/js/data/locale/lo/ctryreverse.json
@@ -14,8 +14,8 @@
     "021": "ພາກເໜືອອາເມລີກາ",
     "029": "ຄາຣິບບຽນ",
     "030": "ອາຊີຕາເວັນອອກ",
-    "034": "ອາຊີໄຕ້",
-    "035": "ອາຊີຕາເວັນອອກສ່ຽງໄຕ້",
+    "034": "ອາຊີໃຕ້",
+    "035": "ອາຊີຕາເວັນອອກສຽງໃຕ້",
     "039": "ຢູໂຣບໃຕ້",
     "053": "ໂອດສະຕາລີ",
     "054": "ເມລານີເຊຍ",
@@ -143,7 +143,7 @@
     "IL": "ອິສຣາເອວ",
     "IM": "ເອວ ອອບ ແມນ",
     "IN": "ອິນເດຍ",
-    "IO": "ເຂດແດນອັງກິດໃນມະຫາສະມຸດອິນເດຍ",
+    "IO": "ເຂດແດນອັງກິດໃນມະຫາສະໝຸດອິນເດຍ",
     "IQ": "ອີຣັກ",
     "IR": "ອີຣານ",
     "IS": "ໄອສແລນ",
@@ -255,7 +255,7 @@
     "TA": "ທຣິສຕັນ ດາ ກັນຮາ",
     "TC": "ໝູ່ເກາະ ເທີກ ແລະ ໄຄໂຄສ",
     "TD": "ຊາດ",
-    "TF": "ເຂດແດນທາງໃຕ້ຂອຝຮັ່ງ",
+    "TF": "ເຂດແດນທາງໃຕ້ຂອງຝຮັ່ງ",
     "TG": "ໂຕໂກ",
     "TH": "ໄທ",
     "TJ": "ທາຈິກິດສະຖານ",
diff --git a/js/data/locale/lo/unitfmt.json b/js/data/locale/lo/unitfmt.json
index 8354e4451f..ac443dac75 100644
--- a/js/data/locale/lo/unitfmt.json
+++ b/js/data/locale/lo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmospheres",
             "bar": "#{n} bar",
             "barrel": "#{n} ບາ​ເຣວ",
+            "beaufort": "#{n} ໂບຝອດ",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit ຕໍ່ວິນາທີ",
             "british-thermal-unit": "#{n} ຫົວ​ໜ່ວຍ​ວັດ​ແທກ​ປະ​ລິ​ມານ​ຄວາມ​ຮ້ອນ​ຂ​ອງ​ອັງ​ກິດ",
@@ -43,8 +44,8 @@
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dot": "#{n} ດັອດ",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} ແດຣມ",
             "drop": "#{n} ຢອດ",
             "dunam": "#{n} ດູ​ນຳ",
@@ -121,7 +122,7 @@
             "megapixel": "#{n} MP",
             "megawatt": "#{n} MW",
             "meter": "#{n} ແມັດ",
-            "meter-per-second": "#{n} ແມັດຕໍ່ນາທີ",
+            "meter-per-second": "#{n} ແມັດຕໍ່ວິນາທີ",
             "meter-per-square-second": "#{n} ແມັດຕໍ່ວິນາທີກໍາລັງສອງ",
             "microgram": "#{n} μg",
             "micrometer": "#{n} micrometers",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/ວິ",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,8 @@
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dot": "#{n} ດັອດ",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dr fl",
             "drop": "#{n} ຢອດ",
             "dunam": "#{n} ດູ​ນຳ",
@@ -327,7 +329,7 @@
             "megapixel": "#{n} MP",
             "megawatt": "#{n} MW",
             "meter": "#{n} ມ",
-            "meter-per-second": "#{n} ມ/ນທ.",
+            "meter-per-second": "#{n} ມ/ວ",
             "meter-per-square-second": "#{n} ມ/ວນທ²",
             "microgram": "#{n} μg",
             "micrometer": "#{n} μm",
diff --git a/js/data/locale/localematch.json b/js/data/locale/localematch.json
index 0a8543295e..4629bbd806 100644
--- a/js/data/locale/localematch.json
+++ b/js/data/locale/localematch.json
@@ -30,6 +30,7 @@
         "155": "de-Latn-DE",
         "202": "en-Latn-NG",
         "419": "es-Latn-419",
+        "AC": "en-Latn-AC",
         "AD": "ca-Latn-AD",
         "AE": "ar-Arab-AE",
         "AF": "fa-Arab-AF",
@@ -38,7 +39,7 @@
         "AL": "sq-Latn-AL",
         "AM": "hy-Armn-AM",
         "AO": "pt-Latn-AO",
-        "AQ": "und-Latn-AQ",
+        "AQ": "en-Latn-AQ",
         "AR": "es-Latn-AR",
         "AS": "sm-Latn-AS",
         "AT": "de-Latn-AT",
@@ -53,7 +54,7 @@
         "Ahom": "aho-Ahom-IN",
         "Arab": "ar-Arab-EG",
         "Arab-AE": "ar-Arab-AE",
-        "Arab-AF": "ps-Arab-AF",
+        "Arab-AF": "fa-Arab-AF",
         "Arab-BH": "ar-Arab-BH",
         "Arab-CC": "ms-Arab-CC",
         "Arab-CN": "ug-Arab-CN",
@@ -115,7 +116,7 @@
         "BR": "pt-Latn-BR",
         "BS": "en-Latn-BS",
         "BT": "dz-Tibt-BT",
-        "BV": "und-Latn-BV",
+        "BV": "en-Latn-BV",
         "BW": "en-Latn-BW",
         "BY": "be-Cyrl-BY",
         "BZ": "en-Latn-BZ",
@@ -132,7 +133,7 @@
         "Bugi": "bug-Bugi-ID",
         "Buhd": "bku-Buhd-PH",
         "CA": "en-Latn-CA",
-        "CC": "en-Latn-CC",
+        "CC": "ms-Arab-CC",
         "CD": "sw-Latn-CD",
         "CF": "fr-Latn-CF",
         "CG": "fr-Latn-CG",
@@ -143,7 +144,8 @@
         "CM": "fr-Latn-CM",
         "CN": "zh-Hans-CN",
         "CO": "es-Latn-CO",
-        "CP": "und-Latn-CP",
+        "CP": "en-Latn-CP",
+        "CQ": "en-Latn-CQ",
         "CR": "es-Latn-CR",
         "CU": "es-Latn-CU",
         "CV": "pt-Latn-CV",
@@ -158,8 +160,6 @@
         "Cher": "chr-Cher-US",
         "Chrs": "xco-Chrs-UZ",
         "Copt": "cop-Copt-EG",
-        "Cpmn": "und-Cpmn-CY",
-        "Cpmn-CY": "und-Cpmn-CY",
         "Cprt": "grc-Cprt-CY",
         "Cyrl": "ru-Cyrl-RU",
         "Cyrl-AL": "mk-Cyrl-AL",
@@ -211,8 +211,6 @@
         "ER": "ti-Ethi-ER",
         "ES": "es-Latn-ES",
         "ET": "am-Ethi-ET",
-        "EU": "en-Latn-IE",
-        "EZ": "de-Latn-EZ",
         "Egyp": "egy-Egyp-EG",
         "Elba": "sq-Elba-AL",
         "Elym": "arc-Elym-IR",
@@ -239,7 +237,7 @@
         "GP": "fr-Latn-GP",
         "GQ": "es-Latn-GQ",
         "GR": "el-Grek-GR",
-        "GS": "und-Latn-GS",
+        "GS": "en-Latn-GS",
         "GT": "es-Latn-GT",
         "GU": "en-Latn-GU",
         "GW": "pt-Latn-GW",
@@ -261,7 +259,7 @@
         "Guru": "pa-Guru-IN",
         "Guru-IN": "pa-Guru-IN",
         "HK": "zh-Hant-HK",
-        "HM": "und-Latn-HM",
+        "HM": "en-Latn-HM",
         "HN": "es-Latn-HN",
         "HR": "hr-Latn-HR",
         "HT": "ht-Latn-HT",
@@ -282,7 +280,7 @@
         "Hebr-US": "yi-Hebr-US",
         "Hira": "ja-Hira-JP",
         "Hluw": "hlu-Hluw-TR",
-        "Hmng": "hnj-Hmng-LA",
+        "Hmng": "hnj-Hmng-US",
         "Hmnp": "hnj-Hmnp-US",
         "Hrkt": "ja-Hrkt-JP",
         "Hrkt-JP": "ja-Hrkt-JP",
@@ -357,6 +355,7 @@
         "Laoo-US": "hnj-Laoo-US",
         "Laoo-VN": "hnj-Laoo-VN",
         "Latn": "en-Latn-US",
+        "Latn-419": "es-Latn-419",
         "Latn-AD": "ca-Latn-AD",
         "Latn-AF": "tk-Latn-AF",
         "Latn-AG": "en-Latn-AG",
@@ -375,13 +374,13 @@
         "Latn-BB": "en-Latn-BB",
         "Latn-BE": "nl-Latn-BE",
         "Latn-BF": "fr-Latn-BF",
-        "Latn-BI": "fr-Latn-BI",
+        "Latn-BI": "rn-Latn-BI",
         "Latn-BJ": "fr-Latn-BJ",
         "Latn-BL": "fr-Latn-BL",
         "Latn-BM": "en-Latn-BM",
-        "Latn-BN": "id-Latn-BN",
+        "Latn-BN": "ms-Latn-BN",
         "Latn-BO": "es-Latn-BO",
-        "Latn-BQ": "nl-Latn-BQ",
+        "Latn-BQ": "pap-Latn-BQ",
         "Latn-BR": "pt-Latn-BR",
         "Latn-BS": "en-Latn-BS",
         "Latn-BV": "no-Latn-BV",
@@ -389,7 +388,7 @@
         "Latn-BZ": "en-Latn-BZ",
         "Latn-CA": "en-Latn-CA",
         "Latn-CC": "en-Latn-CC",
-        "Latn-CD": "fr-Latn-CD",
+        "Latn-CD": "sw-Latn-CD",
         "Latn-CF": "fr-Latn-CF",
         "Latn-CG": "fr-Latn-CG",
         "Latn-CH": "de-Latn-CH",
@@ -402,13 +401,13 @@
         "Latn-CR": "es-Latn-CR",
         "Latn-CU": "es-Latn-CU",
         "Latn-CV": "pt-Latn-CV",
-        "Latn-CW": "nl-Latn-CW",
+        "Latn-CW": "pap-Latn-CW",
         "Latn-CX": "en-Latn-CX",
         "Latn-CY": "tr-Latn-CY",
         "Latn-CZ": "cs-Latn-CZ",
         "Latn-DE": "de-Latn-DE",
         "Latn-DG": "en-Latn-DG",
-        "Latn-DJ": "so-Latn-DJ",
+        "Latn-DJ": "aa-Latn-DJ",
         "Latn-DK": "da-Latn-DK",
         "Latn-DM": "en-Latn-DM",
         "Latn-DO": "es-Latn-DO",
@@ -430,7 +429,7 @@
         "Latn-GE": "ku-Latn-GE",
         "Latn-GF": "fr-Latn-GF",
         "Latn-GG": "en-Latn-GG",
-        "Latn-GH": "en-Latn-GH",
+        "Latn-GH": "ak-Latn-GH",
         "Latn-GI": "en-Latn-GI",
         "Latn-GL": "kl-Latn-GL",
         "Latn-GM": "en-Latn-GM",
@@ -446,7 +445,7 @@
         "Latn-HM": "en-Latn-HM",
         "Latn-HN": "es-Latn-HN",
         "Latn-HR": "hr-Latn-HR",
-        "Latn-HT": "fr-Latn-HT",
+        "Latn-HT": "ht-Latn-HT",
         "Latn-HU": "hu-Latn-HU",
         "Latn-IC": "es-Latn-IC",
         "Latn-ID": "id-Latn-ID",
@@ -460,7 +459,7 @@
         "Latn-JE": "en-Latn-JE",
         "Latn-JM": "en-Latn-JM",
         "Latn-JP": "en-Latn-JP",
-        "Latn-KE": "en-Latn-KE",
+        "Latn-KE": "sw-Latn-KE",
         "Latn-KI": "en-Latn-KI",
         "Latn-KM": "fr-Latn-KM",
         "Latn-KN": "en-Latn-KN",
@@ -472,67 +471,68 @@
         "Latn-LR": "en-Latn-LR",
         "Latn-LS": "st-Latn-LS",
         "Latn-LT": "lt-Latn-LT",
-        "Latn-LU": "lb-Latn-LU",
+        "Latn-LU": "fr-Latn-LU",
         "Latn-LV": "lv-Latn-LV",
         "Latn-MA": "fr-Latn-MA",
         "Latn-MC": "fr-Latn-MC",
         "Latn-MD": "ro-Latn-MD",
-        "Latn-ME": "hr-Latn-ME",
+        "Latn-ME": "sr-Latn-ME",
         "Latn-MF": "fr-Latn-MF",
         "Latn-MG": "mg-Latn-MG",
         "Latn-MH": "en-Latn-MH",
         "Latn-MK": "sq-Latn-MK",
-        "Latn-ML": "fr-Latn-ML",
+        "Latn-ML": "bm-Latn-ML",
         "Latn-MM": "kac-Latn-MM",
         "Latn-MO": "pt-Latn-MO",
         "Latn-MP": "en-Latn-MP",
         "Latn-MQ": "fr-Latn-MQ",
         "Latn-MR": "fr-Latn-MR",
         "Latn-MS": "en-Latn-MS",
-        "Latn-MT": "en-Latn-MT",
-        "Latn-MU": "en-Latn-MU",
+        "Latn-MT": "mt-Latn-MT",
+        "Latn-MU": "mfe-Latn-MU",
         "Latn-MW": "en-Latn-MW",
         "Latn-MX": "es-Latn-MX",
         "Latn-MY": "ms-Latn-MY",
         "Latn-MZ": "pt-Latn-MZ",
-        "Latn-NA": "en-Latn-NA",
+        "Latn-NA": "af-Latn-NA",
         "Latn-NC": "fr-Latn-NC",
-        "Latn-NE": "fr-Latn-NE",
+        "Latn-NE": "ha-Latn-NE",
         "Latn-NF": "en-Latn-NF",
         "Latn-NG": "en-Latn-NG",
         "Latn-NI": "es-Latn-NI",
         "Latn-NL": "nl-Latn-NL",
-        "Latn-NO": "no-Latn-NO",
+        "Latn-NO": "nb-Latn-NO",
         "Latn-NR": "na-Latn-NR",
         "Latn-NU": "en-Latn-NU",
         "Latn-NZ": "en-Latn-NZ",
         "Latn-PA": "es-Latn-PA",
         "Latn-PE": "es-Latn-PE",
         "Latn-PF": "fr-Latn-PF",
-        "Latn-PG": "en-Latn-PG",
-        "Latn-PH": "tl-Latn-PH",
+        "Latn-PG": "tpi-Latn-PG",
+        "Latn-PH": "fil-Latn-PH",
         "Latn-PK": "en-Latn-PK",
         "Latn-PL": "pl-Latn-PL",
         "Latn-PM": "fr-Latn-PM",
         "Latn-PN": "en-Latn-PN",
         "Latn-PR": "es-Latn-PR",
         "Latn-PT": "pt-Latn-PT",
-        "Latn-PW": "en-Latn-PW",
-        "Latn-PY": "es-Latn-PY",
+        "Latn-PW": "pau-Latn-PW",
+        "Latn-PY": "gn-Latn-PY",
         "Latn-RE": "fr-Latn-RE",
         "Latn-RO": "ro-Latn-RO",
+        "Latn-RS": "sr-Latn-RS",
         "Latn-RU": "krl-Latn-RU",
         "Latn-RW": "rw-Latn-RW",
         "Latn-SB": "en-Latn-SB",
-        "Latn-SC": "crs-Latn-SC",
+        "Latn-SC": "fr-Latn-SC",
         "Latn-SD": "en-Latn-SD",
         "Latn-SE": "sv-Latn-SE",
         "Latn-SG": "en-Latn-SG",
         "Latn-SH": "en-Latn-SH",
         "Latn-SI": "sl-Latn-SI",
-        "Latn-SJ": "no-Latn-SJ",
+        "Latn-SJ": "nb-Latn-SJ",
         "Latn-SK": "sk-Latn-SK",
-        "Latn-SL": "en-Latn-SL",
+        "Latn-SL": "kri-Latn-SL",
         "Latn-SM": "it-Latn-SM",
         "Latn-SN": "fr-Latn-SN",
         "Latn-SO": "so-Latn-SO",
@@ -544,20 +544,21 @@
         "Latn-SY": "fr-Latn-SY",
         "Latn-SZ": "ss-Latn-SZ",
         "Latn-TC": "en-Latn-TC",
+        "Latn-TD": "fr-Latn-TD",
         "Latn-TF": "fr-Latn-TF",
         "Latn-TG": "fr-Latn-TG",
-        "Latn-TK": "en-Latn-TK",
-        "Latn-TL": "tet-Latn-TL",
+        "Latn-TK": "tkl-Latn-TK",
+        "Latn-TL": "pt-Latn-TL",
         "Latn-TM": "tk-Latn-TM",
         "Latn-TN": "fr-Latn-TN",
         "Latn-TO": "to-Latn-TO",
         "Latn-TR": "tr-Latn-TR",
         "Latn-TT": "en-Latn-TT",
-        "Latn-TV": "en-Latn-TV",
+        "Latn-TV": "tvl-Latn-TV",
         "Latn-TW": "trv-Latn-TW",
         "Latn-TZ": "sw-Latn-TZ",
         "Latn-UA": "pl-Latn-UA",
-        "Latn-UG": "en-Latn-UG",
+        "Latn-UG": "sw-Latn-UG",
         "Latn-UM": "en-Latn-UM",
         "Latn-US": "en-Latn-US",
         "Latn-UY": "es-Latn-UY",
@@ -575,7 +576,7 @@
         "Latn-XX": "zxx-Latn-XX",
         "Latn-YT": "fr-Latn-YT",
         "Latn-ZA": "en-Latn-ZA",
-        "Latn-ZM": "en-Latn-ZM",
+        "Latn-ZM": "bem-Latn-ZM",
         "Latn-ZW": "sn-Latn-ZW",
         "Lepc": "lep-Lepc-IN",
         "Limb": "lif-Limb-IN",
@@ -634,7 +635,7 @@
         "NL": "nl-Latn-NL",
         "NO": "nb-Latn-NO",
         "NP": "ne-Deva-NP",
-        "NR": "na-Latn-NR",
+        "NR": "en-Latn-NR",
         "NU": "en-Latn-NU",
         "NZ": "en-Latn-NZ",
         "Nagm": "unr-Nagm-IN",
@@ -651,7 +652,6 @@
         "Orya": "or-Orya-IN",
         "Osge": "osa-Osge-US",
         "Osma": "so-Osma-SO",
-        "Ougr": "oui-Ougr-143",
         "PA": "es-Latn-PA",
         "PE": "es-Latn-PE",
         "PF": "fr-Latn-PF",
@@ -678,7 +678,6 @@
         "Plrd": "hmd-Plrd-CN",
         "Prti": "xpr-Prti-IR",
         "QA": "ar-Arab-QA",
-        "QO": "en-Latn-DG",
         "RE": "fr-Latn-RE",
         "RO": "ro-Latn-RO",
         "RS": "sr-Cyrl-RS",
@@ -697,17 +696,17 @@
         "SI": "sl-Latn-SI",
         "SJ": "nb-Latn-SJ",
         "SK": "sk-Latn-SK",
-        "SL": "en-Latn-SL",
+        "SL": "kri-Latn-SL",
         "SM": "it-Latn-SM",
         "SN": "fr-Latn-SN",
         "SO": "so-Latn-SO",
         "SR": "nl-Latn-SR",
-        "SS": "en-Latn-SS",
+        "SS": "ar-Arab-SS",
         "ST": "pt-Latn-ST",
         "SV": "es-Latn-SV",
         "SX": "en-Latn-SX",
         "SY": "ar-Arab-SY",
-        "SZ": "ss-Latn-SZ",
+        "SZ": "en-Latn-SZ",
         "Samr": "smp-Samr-IL",
         "Sarb": "xsa-Sarb-YE",
         "Saur": "saz-Saur-IN",
@@ -725,6 +724,7 @@
         "Sund": "su-Sund-ID",
         "Sylo": "syl-Sylo-BD",
         "Syrc": "syr-Syrc-IQ",
+        "TA": "en-Latn-TA",
         "TC": "en-Latn-TC",
         "TD": "fr-Latn-TD",
         "TF": "fr-Latn-TF",
@@ -791,7 +791,7 @@
         "Yezi": "ku-Yezi-GE",
         "Yiii": "ii-Yiii-CN",
         "ZA": "en-Latn-ZA",
-        "ZM": "en-Latn-ZM",
+        "ZM": "bem-Latn-ZM",
         "ZW": "sn-Latn-ZW",
         "Zanb": "cmg-Zanb-MN",
         "aa": "aa-Latn-ET",
@@ -824,12 +824,12 @@
         "aah": "aah-Latn-PG",
         "aah-Latn": "aah-Latn-PG",
         "aah-PG": "aah-Latn-PG",
-        "aai": "aai-Latn-ZZ",
-        "aai-Latn": "aai-Latn-ZZ",
-        "aai-ZZ": "aai-Latn-ZZ",
-        "aak": "aak-Latn-ZZ",
-        "aak-Latn": "aak-Latn-ZZ",
-        "aak-ZZ": "aak-Latn-ZZ",
+        "aai": "aai-Latn-PG",
+        "aai-Latn": "aai-Latn-PG",
+        "aai-PG": "aai-Latn-PG",
+        "aak": "aak-Latn-PG",
+        "aak-Latn": "aak-Latn-PG",
+        "aak-PG": "aak-Latn-PG",
         "aal": "aal-Latn-CM",
         "aal-CM": "aal-Latn-CM",
         "aal-Latn": "aal-Latn-CM",
@@ -851,9 +851,9 @@
         "aat": "aat-Grek-GR",
         "aat-GR": "aat-Grek-GR",
         "aat-Grek": "aat-Grek-GR",
-        "aau": "aau-Latn-ZZ",
-        "aau-Latn": "aau-Latn-ZZ",
-        "aau-ZZ": "aau-Latn-ZZ",
+        "aau": "aau-Latn-PG",
+        "aau-Latn": "aau-Latn-PG",
+        "aau-PG": "aau-Latn-PG",
         "aaw": "aaw-Latn-PG",
         "aaw-Latn": "aaw-Latn-PG",
         "aaw-PG": "aaw-Latn-PG",
@@ -890,9 +890,9 @@
         "abh": "abh-Arab-TJ",
         "abh-Arab": "abh-Arab-TJ",
         "abh-TJ": "abh-Arab-TJ",
-        "abi": "abi-Latn-ZZ",
-        "abi-Latn": "abi-Latn-ZZ",
-        "abi-ZZ": "abi-Latn-ZZ",
+        "abi": "abi-Latn-CI",
+        "abi-CI": "abi-Latn-CI",
+        "abi-Latn": "abi-Latn-CI",
         "abl": "abl-Rjng-ID",
         "abl-ID": "abl-Rjng-ID",
         "abl-Latn": "abl-Latn-ID",
@@ -909,18 +909,15 @@
         "abp": "abp-Latn-PH",
         "abp-Latn": "abp-Latn-PH",
         "abp-PH": "abp-Latn-PH",
-        "abq": "abq-Cyrl-ZZ",
-        "abq-Cyrl": "abq-Cyrl-ZZ",
-        "abq-ZZ": "abq-Cyrl-ZZ",
         "abr": "abr-Latn-GH",
         "abr-GH": "abr-Latn-GH",
         "abr-Latn": "abr-Latn-GH",
         "abs": "abs-Latn-ID",
         "abs-ID": "abs-Latn-ID",
         "abs-Latn": "abs-Latn-ID",
-        "abt": "abt-Latn-ZZ",
-        "abt-Latn": "abt-Latn-ZZ",
-        "abt-ZZ": "abt-Latn-ZZ",
+        "abt": "abt-Latn-PG",
+        "abt-Latn": "abt-Latn-PG",
+        "abt-PG": "abt-Latn-PG",
         "abu": "abu-Latn-CI",
         "abu-CI": "abu-Latn-CI",
         "abu-Latn": "abu-Latn-CI",
@@ -933,9 +930,9 @@
         "abx": "abx-Latn-PH",
         "abx-Latn": "abx-Latn-PH",
         "abx-PH": "abx-Latn-PH",
-        "aby": "aby-Latn-ZZ",
-        "aby-Latn": "aby-Latn-ZZ",
-        "aby-ZZ": "aby-Latn-ZZ",
+        "aby": "aby-Latn-PG",
+        "aby-Latn": "aby-Latn-PG",
+        "aby-PG": "aby-Latn-PG",
         "abz": "abz-Latn-ID",
         "abz-ID": "abz-Latn-ID",
         "abz-Latn": "abz-Latn-ID",
@@ -945,9 +942,9 @@
         "acb": "acb-Latn-NG",
         "acb-Latn": "acb-Latn-NG",
         "acb-NG": "acb-Latn-NG",
-        "acd": "acd-Latn-ZZ",
-        "acd-Latn": "acd-Latn-ZZ",
-        "acd-ZZ": "acd-Latn-ZZ",
+        "acd": "acd-Latn-GH",
+        "acd-GH": "acd-Latn-GH",
+        "acd-Latn": "acd-Latn-GH",
         "ace": "ace-Latn-ID",
         "ace-ID": "ace-Latn-ID",
         "ace-Latn": "ace-Latn-ID",
@@ -1007,9 +1004,9 @@
         "add": "add-Latn-CM",
         "add-CM": "add-Latn-CM",
         "add-Latn": "add-Latn-CM",
-        "ade": "ade-Latn-ZZ",
-        "ade-Latn": "ade-Latn-ZZ",
-        "ade-ZZ": "ade-Latn-ZZ",
+        "ade": "ade-Latn-TG",
+        "ade-Latn": "ade-Latn-TG",
+        "ade-TG": "ade-Latn-TG",
         "adf": "adf-Arab-OM",
         "adf-Arab": "adf-Arab-OM",
         "adf-OM": "adf-Arab-OM",
@@ -1023,9 +1020,9 @@
         "adi-IN": "adi-Latn-IN",
         "adi-Latn": "adi-Latn-IN",
         "adi-Tibt": "adi-Tibt-CN",
-        "adj": "adj-Latn-ZZ",
-        "adj-Latn": "adj-Latn-ZZ",
-        "adj-ZZ": "adj-Latn-ZZ",
+        "adj": "adj-Latn-CI",
+        "adj-CI": "adj-Latn-CI",
+        "adj-Latn": "adj-Latn-CI",
         "adl": "adl-Latn-IN",
         "adl-IN": "adl-Latn-IN",
         "adl-Latn": "adl-Latn-IN",
@@ -1035,9 +1032,6 @@
         "ado": "ado-Latn-PG",
         "ado-Latn": "ado-Latn-PG",
         "ado-PG": "ado-Latn-PG",
-        "adp": "adp-Tibt-BT",
-        "adp-BT": "adp-Tibt-BT",
-        "adp-Tibt": "adp-Tibt-BT",
         "adq": "adq-Latn-GH",
         "adq-GH": "adq-Latn-GH",
         "adq-Latn": "adq-Latn-GH",
@@ -1059,9 +1053,9 @@
         "ady": "ady-Cyrl-RU",
         "ady-Cyrl": "ady-Cyrl-RU",
         "ady-RU": "ady-Cyrl-RU",
-        "adz": "adz-Latn-ZZ",
-        "adz-Latn": "adz-Latn-ZZ",
-        "adz-ZZ": "adz-Latn-ZZ",
+        "adz": "adz-Latn-PG",
+        "adz-Latn": "adz-Latn-PG",
+        "adz-PG": "adz-Latn-PG",
         "ae": "ae-Avst-IR",
         "ae-Avst": "ae-Avst-IR",
         "ae-IR": "ae-Avst-IR",
@@ -1098,9 +1092,9 @@
         "aew": "aew-Latn-PG",
         "aew-Latn": "aew-Latn-PG",
         "aew-PG": "aew-Latn-PG",
-        "aey": "aey-Latn-ZZ",
-        "aey-Latn": "aey-Latn-ZZ",
-        "aey-ZZ": "aey-Latn-ZZ",
+        "aey": "aey-Latn-PG",
+        "aey-Latn": "aey-Latn-PG",
+        "aey-PG": "aey-Latn-PG",
         "aez": "aez-Latn-PG",
         "aez-Latn": "aez-Latn-PG",
         "aez-PG": "aez-Latn-PG",
@@ -1150,21 +1144,21 @@
         "agb": "agb-Latn-NG",
         "agb-Latn": "agb-Latn-NG",
         "agb-NG": "agb-Latn-NG",
-        "agc": "agc-Latn-ZZ",
-        "agc-Latn": "agc-Latn-ZZ",
-        "agc-ZZ": "agc-Latn-ZZ",
-        "agd": "agd-Latn-ZZ",
-        "agd-Latn": "agd-Latn-ZZ",
-        "agd-ZZ": "agd-Latn-ZZ",
+        "agc": "agc-Latn-NG",
+        "agc-Latn": "agc-Latn-NG",
+        "agc-NG": "agc-Latn-NG",
+        "agd": "agd-Latn-PG",
+        "agd-Latn": "agd-Latn-PG",
+        "agd-PG": "agd-Latn-PG",
         "age": "age-Latn-PG",
         "age-Latn": "age-Latn-PG",
         "age-PG": "age-Latn-PG",
         "agf": "agf-Latn-ID",
         "agf-ID": "agf-Latn-ID",
         "agf-Latn": "agf-Latn-ID",
-        "agg": "agg-Latn-ZZ",
-        "agg-Latn": "agg-Latn-ZZ",
-        "agg-ZZ": "agg-Latn-ZZ",
+        "agg": "agg-Latn-PG",
+        "agg-Latn": "agg-Latn-PG",
+        "agg-PG": "agg-Latn-PG",
         "agh": "agh-Latn-CD",
         "agh-CD": "agh-Latn-CD",
         "agh-Latn": "agh-Latn-CD",
@@ -1181,15 +1175,15 @@
         "agl": "agl-Latn-PG",
         "agl-Latn": "agl-Latn-PG",
         "agl-PG": "agl-Latn-PG",
-        "agm": "agm-Latn-ZZ",
-        "agm-Latn": "agm-Latn-ZZ",
-        "agm-ZZ": "agm-Latn-ZZ",
+        "agm": "agm-Latn-PG",
+        "agm-Latn": "agm-Latn-PG",
+        "agm-PG": "agm-Latn-PG",
         "agn": "agn-Latn-PH",
         "agn-Latn": "agn-Latn-PH",
         "agn-PH": "agn-Latn-PH",
-        "ago": "ago-Latn-ZZ",
-        "ago-Latn": "ago-Latn-ZZ",
-        "ago-ZZ": "ago-Latn-ZZ",
+        "ago": "ago-Latn-PG",
+        "ago-Latn": "ago-Latn-PG",
+        "ago-PG": "ago-Latn-PG",
         "agq": "agq-Latn-CM",
         "agq-CM": "agq-Latn-CM",
         "agq-Latn": "agq-Latn-CM",
@@ -1220,9 +1214,9 @@
         "agz": "agz-Latn-PH",
         "agz-Latn": "agz-Latn-PH",
         "agz-PH": "agz-Latn-PH",
-        "aha": "aha-Latn-ZZ",
-        "aha-Latn": "aha-Latn-ZZ",
-        "aha-ZZ": "aha-Latn-ZZ",
+        "aha": "aha-Latn-GH",
+        "aha-GH": "aha-Latn-GH",
+        "aha-Latn": "aha-Latn-GH",
         "ahb": "ahb-Latn-VU",
         "ahb-Latn": "ahb-Latn-VU",
         "ahb-VU": "ahb-Latn-VU",
@@ -1241,9 +1235,9 @@
         "ahk-Mymr": "ahk-Mymr-MM",
         "ahk-TH": "ahk-Latn-TH",
         "ahk-Thai": "ahk-Thai-TH",
-        "ahl": "ahl-Latn-ZZ",
-        "ahl-Latn": "ahl-Latn-ZZ",
-        "ahl-ZZ": "ahl-Latn-ZZ",
+        "ahl": "ahl-Latn-TG",
+        "ahl-Latn": "ahl-Latn-TG",
+        "ahl-TG": "ahl-Latn-TG",
         "ahm": "ahm-Latn-CI",
         "ahm-CI": "ahm-Latn-CI",
         "ahm-Latn": "ahm-Latn-CI",
@@ -1331,9 +1325,9 @@
         "aja": "aja-Latn-SS",
         "aja-Latn": "aja-Latn-SS",
         "aja-SS": "aja-Latn-SS",
-        "ajg": "ajg-Latn-ZZ",
-        "ajg-Latn": "ajg-Latn-ZZ",
-        "ajg-ZZ": "ajg-Latn-ZZ",
+        "ajg": "ajg-Latn-BJ",
+        "ajg-BJ": "ajg-Latn-BJ",
+        "ajg-Latn": "ajg-Latn-BJ",
         "aji": "aji-Latn-NC",
         "aji-Latn": "aji-Latn-NC",
         "aji-NC": "aji-Latn-NC",
@@ -1343,9 +1337,6 @@
         "ajp": "ajp-Arab-JO",
         "ajp-Arab": "ajp-Arab-JO",
         "ajp-JO": "ajp-Arab-JO",
-        "ajt": "ajt-Arab-TN",
-        "ajt-Arab": "ajt-Arab-TN",
-        "ajt-TN": "ajt-Arab-TN",
         "ajw": "ajw-Latn-NG",
         "ajw-Latn": "ajw-Latn-NG",
         "ajw-NG": "ajw-Latn-NG",
@@ -1416,9 +1407,9 @@
         "akz": "akz-Latn-US",
         "akz-Latn": "akz-Latn-US",
         "akz-US": "akz-Latn-US",
-        "ala": "ala-Latn-ZZ",
-        "ala-Latn": "ala-Latn-ZZ",
-        "ala-ZZ": "ala-Latn-ZZ",
+        "ala": "ala-Latn-NG",
+        "ala-Latn": "ala-Latn-NG",
+        "ala-NG": "ala-Latn-NG",
         "alc": "alc-Latn-CL",
         "alc-CL": "alc-Latn-CL",
         "alc-Latn": "alc-Latn-CL",
@@ -1434,9 +1425,9 @@
         "alh": "alh-Latn-AU",
         "alh-AU": "alh-Latn-AU",
         "alh-Latn": "alh-Latn-AU",
-        "ali": "ali-Latn-ZZ",
-        "ali-Latn": "ali-Latn-ZZ",
-        "ali-ZZ": "ali-Latn-ZZ",
+        "ali": "ali-Latn-PG",
+        "ali-Latn": "ali-Latn-PG",
+        "ali-PG": "ali-Latn-PG",
         "alj": "alj-Latn-PH",
         "alj-Latn": "alj-Latn-PH",
         "alj-PH": "alj-Latn-PH",
@@ -1514,18 +1505,18 @@
         "amk": "amk-Latn-ID",
         "amk-ID": "amk-Latn-ID",
         "amk-Latn": "amk-Latn-ID",
-        "amm": "amm-Latn-ZZ",
-        "amm-Latn": "amm-Latn-ZZ",
-        "amm-ZZ": "amm-Latn-ZZ",
-        "amn": "amn-Latn-ZZ",
-        "amn-Latn": "amn-Latn-ZZ",
-        "amn-ZZ": "amn-Latn-ZZ",
+        "amm": "amm-Latn-PG",
+        "amm-Latn": "amm-Latn-PG",
+        "amm-PG": "amm-Latn-PG",
+        "amn": "amn-Latn-PG",
+        "amn-Latn": "amn-Latn-PG",
+        "amn-PG": "amn-Latn-PG",
         "amo": "amo-Latn-NG",
         "amo-Latn": "amo-Latn-NG",
         "amo-NG": "amo-Latn-NG",
-        "amp": "amp-Latn-ZZ",
-        "amp-Latn": "amp-Latn-ZZ",
-        "amp-ZZ": "amp-Latn-ZZ",
+        "amp": "amp-Latn-PG",
+        "amp-Latn": "amp-Latn-PG",
+        "amp-PG": "amp-Latn-PG",
         "amq": "amq-Latn-ID",
         "amq-ID": "amq-Latn-ID",
         "amq-Latn": "amq-Latn-ID",
@@ -1568,9 +1559,9 @@
         "anb": "anb-Latn-PE",
         "anb-Latn": "anb-Latn-PE",
         "anb-PE": "anb-Latn-PE",
-        "anc": "anc-Latn-ZZ",
-        "anc-Latn": "anc-Latn-ZZ",
-        "anc-ZZ": "anc-Latn-ZZ",
+        "anc": "anc-Latn-NG",
+        "anc-Latn": "anc-Latn-NG",
+        "anc-NG": "anc-Latn-NG",
         "and": "and-Latn-ID",
         "and-ID": "and-Latn-ID",
         "and-Latn": "and-Latn-ID",
@@ -1592,9 +1583,9 @@
         "anj": "anj-Latn-PG",
         "anj-Latn": "anj-Latn-PG",
         "anj-PG": "anj-Latn-PG",
-        "ank": "ank-Latn-ZZ",
-        "ank-Latn": "ank-Latn-ZZ",
-        "ank-ZZ": "ank-Latn-ZZ",
+        "ank": "ank-Latn-NG",
+        "ank-Latn": "ank-Latn-NG",
+        "ank-NG": "ank-Latn-NG",
         "anl": "anl-Latn-MM",
         "anl-Latn": "anl-Latn-MM",
         "anl-MM": "anl-Latn-MM",
@@ -1633,9 +1624,9 @@
         "anx": "anx-Latn-PG",
         "anx-Latn": "anx-Latn-PG",
         "anx-PG": "anx-Latn-PG",
-        "any": "any-Latn-ZZ",
-        "any-Latn": "any-Latn-ZZ",
-        "any-ZZ": "any-Latn-ZZ",
+        "any": "any-Latn-CI",
+        "any-CI": "any-Latn-CI",
+        "any-Latn": "any-Latn-CI",
         "anz": "anz-Latn-PG",
         "anz-Latn": "anz-Latn-PG",
         "anz-PG": "anz-Latn-PG",
@@ -1663,18 +1654,18 @@
         "aoi": "aoi-Latn-AU",
         "aoi-AU": "aoi-Latn-AU",
         "aoi-Latn": "aoi-Latn-AU",
-        "aoj": "aoj-Latn-ZZ",
-        "aoj-Latn": "aoj-Latn-ZZ",
-        "aoj-ZZ": "aoj-Latn-ZZ",
+        "aoj": "aoj-Latn-PG",
+        "aoj-Latn": "aoj-Latn-PG",
+        "aoj-PG": "aoj-Latn-PG",
         "aok": "aok-Latn-NC",
         "aok-Latn": "aok-Latn-NC",
         "aok-NC": "aok-Latn-NC",
         "aol": "aol-Latn-ID",
         "aol-ID": "aol-Latn-ID",
         "aol-Latn": "aol-Latn-ID",
-        "aom": "aom-Latn-ZZ",
-        "aom-Latn": "aom-Latn-ZZ",
-        "aom-ZZ": "aom-Latn-ZZ",
+        "aom": "aom-Latn-PG",
+        "aom-Latn": "aom-Latn-PG",
+        "aom-PG": "aom-Latn-PG",
         "aon": "aon-Latn-PG",
         "aon-Latn": "aon-Latn-PG",
         "aon-PG": "aon-Latn-PG",
@@ -1703,9 +1694,9 @@
         "apd": "apd-Arab-TG",
         "apd-Arab": "apd-Arab-TG",
         "apd-TG": "apd-Arab-TG",
-        "ape": "ape-Latn-ZZ",
-        "ape-Latn": "ape-Latn-ZZ",
-        "ape-ZZ": "ape-Latn-ZZ",
+        "ape": "ape-Latn-PG",
+        "ape-Latn": "ape-Latn-PG",
+        "ape-PG": "ape-Latn-PG",
         "apf": "apf-Latn-PH",
         "apf-Latn": "apf-Latn-PH",
         "apf-PH": "apf-Latn-PH",
@@ -1739,12 +1730,12 @@
         "app": "app-Latn-VU",
         "app-Latn": "app-Latn-VU",
         "app-VU": "app-Latn-VU",
-        "apr": "apr-Latn-ZZ",
-        "apr-Latn": "apr-Latn-ZZ",
-        "apr-ZZ": "apr-Latn-ZZ",
-        "aps": "aps-Latn-ZZ",
-        "aps-Latn": "aps-Latn-ZZ",
-        "aps-ZZ": "aps-Latn-ZZ",
+        "apr": "apr-Latn-PG",
+        "apr-Latn": "apr-Latn-PG",
+        "apr-PG": "apr-Latn-PG",
+        "aps": "aps-Latn-PG",
+        "aps-Latn": "aps-Latn-PG",
+        "aps-PG": "aps-Latn-PG",
         "apt": "apt-Latn-IN",
         "apt-IN": "apt-Latn-IN",
         "apt-Latn": "apt-Latn-IN",
@@ -1763,9 +1754,9 @@
         "apy": "apy-Latn-BR",
         "apy-BR": "apy-Latn-BR",
         "apy-Latn": "apy-Latn-BR",
-        "apz": "apz-Latn-ZZ",
-        "apz-Latn": "apz-Latn-ZZ",
-        "apz-ZZ": "apz-Latn-ZZ",
+        "apz": "apz-Latn-PG",
+        "apz-Latn": "apz-Latn-PG",
+        "apz-PG": "apz-Latn-PG",
         "aqc": "aqc-Cyrl-RU",
         "aqc-Cyrl": "aqc-Cyrl-RU",
         "aqc-RU": "aqc-Cyrl-RU",
@@ -1816,6 +1807,7 @@
         "ar-QA": "ar-Arab-QA",
         "ar-SA": "ar-Arab-SA",
         "ar-SD": "ar-Arab-SD",
+        "ar-SS": "ar-Arab-SS",
         "ar-SY": "ar-Arab-SY",
         "ar-TN": "ar-Arab-TN",
         "ar-YE": "ar-Arab-YE",
@@ -1830,9 +1822,9 @@
         "are": "are-Latn-AU",
         "are-AU": "are-Latn-AU",
         "are-Latn": "are-Latn-AU",
-        "arh": "arh-Latn-ZZ",
-        "arh-Latn": "arh-Latn-ZZ",
-        "arh-ZZ": "arh-Latn-ZZ",
+        "arh": "arh-Latn-CO",
+        "arh-CO": "arh-Latn-CO",
+        "arh-Latn": "arh-Latn-CO",
         "ari": "ari-Latn-US",
         "ari-Latn": "ari-Latn-US",
         "ari-US": "ari-Latn-US",
@@ -1894,9 +1886,9 @@
         "ase": "ase-Sgnw-US",
         "ase-Sgnw": "ase-Sgnw-US",
         "ase-US": "ase-Sgnw-US",
-        "asg": "asg-Latn-ZZ",
-        "asg-Latn": "asg-Latn-ZZ",
-        "asg-ZZ": "asg-Latn-ZZ",
+        "asg": "asg-Latn-NG",
+        "asg-Latn": "asg-Latn-NG",
+        "asg-NG": "asg-Latn-NG",
         "ash": "ash-Latn-PE",
         "ash-Latn": "ash-Latn-PE",
         "ash-PE": "ash-Latn-PE",
@@ -1915,9 +1907,9 @@
         "asn": "asn-Latn-BR",
         "asn-BR": "asn-Latn-BR",
         "asn-Latn": "asn-Latn-BR",
-        "aso": "aso-Latn-ZZ",
-        "aso-Latn": "aso-Latn-ZZ",
-        "aso-ZZ": "aso-Latn-ZZ",
+        "aso": "aso-Latn-PG",
+        "aso-Latn": "aso-Latn-PG",
+        "aso-PG": "aso-Latn-PG",
         "ass": "ass-Latn-CM",
         "ass-CM": "ass-Latn-CM",
         "ass-Latn": "ass-Latn-CM",
@@ -1939,9 +1931,9 @@
         "asz": "asz-Latn-ID",
         "asz-ID": "asz-Latn-ID",
         "asz-Latn": "asz-Latn-ID",
-        "ata": "ata-Latn-ZZ",
-        "ata-Latn": "ata-Latn-ZZ",
-        "ata-ZZ": "ata-Latn-ZZ",
+        "ata": "ata-Latn-PG",
+        "ata-Latn": "ata-Latn-PG",
+        "ata-PG": "ata-Latn-PG",
         "atb": "atb-Latn-CN",
         "atb-CN": "atb-Latn-CN",
         "atb-Latn": "atb-Latn-CN",
@@ -1955,9 +1947,9 @@
         "ate": "ate-Latn-PG",
         "ate-Latn": "ate-Latn-PG",
         "ate-PG": "ate-Latn-PG",
-        "atg": "atg-Latn-ZZ",
-        "atg-Latn": "atg-Latn-ZZ",
-        "atg-ZZ": "atg-Latn-ZZ",
+        "atg": "atg-Latn-NG",
+        "atg-Latn": "atg-Latn-NG",
+        "atg-NG": "atg-Latn-NG",
         "ati": "ati-Latn-CI",
         "ati-CI": "ati-Latn-CI",
         "ati-Latn": "ati-Latn-CI",
@@ -2068,9 +2060,9 @@
         "auw": "auw-Latn-ID",
         "auw-ID": "auw-Latn-ID",
         "auw-Latn": "auw-Latn-ID",
-        "auy": "auy-Latn-ZZ",
-        "auy-Latn": "auy-Latn-ZZ",
-        "auy-ZZ": "auy-Latn-ZZ",
+        "auy": "auy-Latn-PG",
+        "auy-Latn": "auy-Latn-PG",
+        "auy-PG": "auy-Latn-PG",
         "auz": "auz-Arab-UZ",
         "auz-Arab": "auz-Arab-UZ",
         "auz-UZ": "auz-Arab-UZ",
@@ -2089,36 +2081,37 @@
         "avk": "avk-Latn-001",
         "avk-001": "avk-Latn-001",
         "avk-Latn": "avk-Latn-001",
-        "avl": "avl-Arab-ZZ",
-        "avl-Arab": "avl-Arab-ZZ",
-        "avl-ZZ": "avl-Arab-ZZ",
+        "avl": "avl-Arab-EG",
+        "avl-Arab": "avl-Arab-EG",
+        "avl-EG": "avl-Arab-EG",
         "avm": "avm-Latn-AU",
         "avm-AU": "avm-Latn-AU",
         "avm-Latn": "avm-Latn-AU",
-        "avn": "avn-Latn-ZZ",
-        "avn-Latn": "avn-Latn-ZZ",
-        "avn-ZZ": "avn-Latn-ZZ",
+        "avn": "avn-Latn-GH",
+        "avn-GH": "avn-Latn-GH",
+        "avn-Latn": "avn-Latn-GH",
         "avo": "avo-Latn-BR",
         "avo-BR": "avo-Latn-BR",
         "avo-Latn": "avo-Latn-BR",
         "avs": "avs-Latn-PE",
         "avs-Latn": "avs-Latn-PE",
         "avs-PE": "avs-Latn-PE",
-        "avt": "avt-Latn-ZZ",
-        "avt-Latn": "avt-Latn-ZZ",
-        "avt-ZZ": "avt-Latn-ZZ",
-        "avu": "avu-Latn-ZZ",
-        "avu-Latn": "avu-Latn-ZZ",
-        "avu-ZZ": "avu-Latn-ZZ",
+        "avt": "avt-Latn-PG",
+        "avt-Latn": "avt-Latn-PG",
+        "avt-PG": "avt-Latn-PG",
+        "avu": "avu-Latn-SS",
+        "avu-Latn": "avu-Latn-SS",
+        "avu-SD": "avu-Latn-SD",
+        "avu-SS": "avu-Latn-SS",
         "avv": "avv-Latn-BR",
         "avv-BR": "avv-Latn-BR",
         "avv-Latn": "avv-Latn-BR",
         "awa": "awa-Deva-IN",
         "awa-Deva": "awa-Deva-IN",
         "awa-IN": "awa-Deva-IN",
-        "awb": "awb-Latn-ZZ",
-        "awb-Latn": "awb-Latn-ZZ",
-        "awb-ZZ": "awb-Latn-ZZ",
+        "awb": "awb-Latn-PG",
+        "awb-Latn": "awb-Latn-PG",
+        "awb-PG": "awb-Latn-PG",
         "awc": "awc-Latn-NG",
         "awc-Latn": "awc-Latn-NG",
         "awc-NG": "awc-Latn-NG",
@@ -2143,9 +2136,9 @@
         "awn": "awn-Ethi-ET",
         "awn-ET": "awn-Ethi-ET",
         "awn-Ethi": "awn-Ethi-ET",
-        "awo": "awo-Latn-ZZ",
-        "awo-Latn": "awo-Latn-ZZ",
-        "awo-ZZ": "awo-Latn-ZZ",
+        "awo": "awo-Latn-NG",
+        "awo-Latn": "awo-Latn-NG",
+        "awo-NG": "awo-Latn-NG",
         "awr": "awr-Latn-ID",
         "awr-ID": "awr-Latn-ID",
         "awr-Latn": "awr-Latn-ID",
@@ -2164,9 +2157,9 @@
         "aww": "aww-Latn-PG",
         "aww-Latn": "aww-Latn-PG",
         "aww-PG": "aww-Latn-PG",
-        "awx": "awx-Latn-ZZ",
-        "awx-Latn": "awx-Latn-ZZ",
-        "awx-ZZ": "awx-Latn-ZZ",
+        "awx": "awx-Latn-PG",
+        "awx-Latn": "awx-Latn-PG",
+        "awx-PG": "awx-Latn-PG",
         "awy": "awy-Latn-ID",
         "awy-ID": "awy-Latn-ID",
         "awy-Latn": "awy-Latn-ID",
@@ -2197,9 +2190,9 @@
         "aya": "aya-Latn-PG",
         "aya-Latn": "aya-Latn-PG",
         "aya-PG": "aya-Latn-PG",
-        "ayb": "ayb-Latn-ZZ",
-        "ayb-Latn": "ayb-Latn-ZZ",
-        "ayb-ZZ": "ayb-Latn-ZZ",
+        "ayb": "ayb-Latn-BJ",
+        "ayb-BJ": "ayb-Latn-BJ",
+        "ayb-Latn": "ayb-Latn-BJ",
         "ayc": "ayc-Latn-PE",
         "ayc-Latn": "ayc-Latn-PE",
         "ayc-PE": "ayc-Latn-PE",
@@ -2329,9 +2322,9 @@
         "bau": "bau-Latn-NG",
         "bau-Latn": "bau-Latn-NG",
         "bau-NG": "bau-Latn-NG",
-        "bav": "bav-Latn-ZZ",
-        "bav-Latn": "bav-Latn-ZZ",
-        "bav-ZZ": "bav-Latn-ZZ",
+        "bav": "bav-Latn-CM",
+        "bav-CM": "bav-Latn-CM",
+        "bav-Latn": "bav-Latn-CM",
         "baw": "baw-Latn-CM",
         "baw-CM": "baw-Latn-CM",
         "baw-Latn": "baw-Latn-CM",
@@ -2341,18 +2334,18 @@
         "bay": "bay-Latn-ID",
         "bay-ID": "bay-Latn-ID",
         "bay-Latn": "bay-Latn-ID",
-        "bba": "bba-Latn-ZZ",
-        "bba-Latn": "bba-Latn-ZZ",
-        "bba-ZZ": "bba-Latn-ZZ",
-        "bbb": "bbb-Latn-ZZ",
-        "bbb-Latn": "bbb-Latn-ZZ",
-        "bbb-ZZ": "bbb-Latn-ZZ",
+        "bba": "bba-Latn-BJ",
+        "bba-BJ": "bba-Latn-BJ",
+        "bba-Latn": "bba-Latn-BJ",
+        "bbb": "bbb-Latn-PG",
+        "bbb-Latn": "bbb-Latn-PG",
+        "bbb-PG": "bbb-Latn-PG",
         "bbc": "bbc-Latn-ID",
         "bbc-ID": "bbc-Latn-ID",
         "bbc-Latn": "bbc-Latn-ID",
-        "bbd": "bbd-Latn-ZZ",
-        "bbd-Latn": "bbd-Latn-ZZ",
-        "bbd-ZZ": "bbd-Latn-ZZ",
+        "bbd": "bbd-Latn-PG",
+        "bbd-Latn": "bbd-Latn-PG",
+        "bbd-PG": "bbd-Latn-PG",
         "bbe": "bbe-Latn-CD",
         "bbe-CD": "bbe-Latn-CD",
         "bbe-Latn": "bbe-Latn-CD",
@@ -2383,15 +2376,15 @@
         "bbo": "bbo-Latn-BF",
         "bbo-BF": "bbo-Latn-BF",
         "bbo-Latn": "bbo-Latn-BF",
-        "bbp": "bbp-Latn-ZZ",
-        "bbp-Latn": "bbp-Latn-ZZ",
-        "bbp-ZZ": "bbp-Latn-ZZ",
+        "bbp": "bbp-Latn-CF",
+        "bbp-CF": "bbp-Latn-CF",
+        "bbp-Latn": "bbp-Latn-CF",
         "bbq": "bbq-Latn-CM",
         "bbq-CM": "bbq-Latn-CM",
         "bbq-Latn": "bbq-Latn-CM",
-        "bbr": "bbr-Latn-ZZ",
-        "bbr-Latn": "bbr-Latn-ZZ",
-        "bbr-ZZ": "bbr-Latn-ZZ",
+        "bbr": "bbr-Latn-PG",
+        "bbr-Latn": "bbr-Latn-PG",
+        "bbr-PG": "bbr-Latn-PG",
         "bbs": "bbs-Latn-NG",
         "bbs-Latn": "bbs-Latn-NG",
         "bbs-NG": "bbs-Latn-NG",
@@ -2426,15 +2419,15 @@
         "bce": "bce-Latn-CM",
         "bce-CM": "bce-Latn-CM",
         "bce-Latn": "bce-Latn-CM",
-        "bcf": "bcf-Latn-ZZ",
-        "bcf-Latn": "bcf-Latn-ZZ",
-        "bcf-ZZ": "bcf-Latn-ZZ",
+        "bcf": "bcf-Latn-PG",
+        "bcf-Latn": "bcf-Latn-PG",
+        "bcf-PG": "bcf-Latn-PG",
         "bcg": "bcg-Latn-GN",
         "bcg-GN": "bcg-Latn-GN",
         "bcg-Latn": "bcg-Latn-GN",
-        "bch": "bch-Latn-ZZ",
-        "bch-Latn": "bch-Latn-ZZ",
-        "bch-ZZ": "bch-Latn-ZZ",
+        "bch": "bch-Latn-PG",
+        "bch-Latn": "bch-Latn-PG",
+        "bch-PG": "bch-Latn-PG",
         "bci": "bci-Latn-CI",
         "bci-CI": "bci-Latn-CI",
         "bci-Latn": "bci-Latn-CI",
@@ -2444,21 +2437,22 @@
         "bck": "bck-Latn-AU",
         "bck-AU": "bck-Latn-AU",
         "bck-Latn": "bck-Latn-AU",
-        "bcm": "bcm-Latn-ZZ",
-        "bcm-Latn": "bcm-Latn-ZZ",
-        "bcm-ZZ": "bcm-Latn-ZZ",
-        "bcn": "bcn-Latn-ZZ",
-        "bcn-Latn": "bcn-Latn-ZZ",
-        "bcn-ZZ": "bcn-Latn-ZZ",
-        "bco": "bco-Latn-ZZ",
-        "bco-Latn": "bco-Latn-ZZ",
-        "bco-ZZ": "bco-Latn-ZZ",
+        "bcm": "bcm-Latn-PG",
+        "bcm-Latn": "bcm-Latn-PG",
+        "bcm-PG": "bcm-Latn-PG",
+        "bcn": "bcn-Latn-NG",
+        "bcn-Latn": "bcn-Latn-NG",
+        "bcn-NG": "bcn-Latn-NG",
+        "bco": "bco-Latn-PG",
+        "bco-Latn": "bco-Latn-PG",
+        "bco-PG": "bco-Latn-PG",
         "bcp": "bcp-Latn-CD",
         "bcp-CD": "bcp-Latn-CD",
         "bcp-Latn": "bcp-Latn-CD",
-        "bcq": "bcq-Ethi-ZZ",
-        "bcq-Ethi": "bcq-Ethi-ZZ",
-        "bcq-ZZ": "bcq-Ethi-ZZ",
+        "bcq": "bcq-Ethi-ET",
+        "bcq-ET": "bcq-Ethi-ET",
+        "bcq-Ethi": "bcq-Ethi-ET",
+        "bcq-Latn": "bcq-Latn-ET",
         "bcr": "bcr-Latn-CA",
         "bcr-CA": "bcr-Latn-CA",
         "bcr-Latn": "bcr-Latn-CA",
@@ -2468,9 +2462,9 @@
         "bct": "bct-Latn-CD",
         "bct-CD": "bct-Latn-CD",
         "bct-Latn": "bct-Latn-CD",
-        "bcu": "bcu-Latn-ZZ",
-        "bcu-Latn": "bcu-Latn-ZZ",
-        "bcu-ZZ": "bcu-Latn-ZZ",
+        "bcu": "bcu-Latn-PG",
+        "bcu-Latn": "bcu-Latn-PG",
+        "bcu-PG": "bcu-Latn-PG",
         "bcv": "bcv-Latn-NG",
         "bcv-Latn": "bcv-Latn-NG",
         "bcv-NG": "bcv-Latn-NG",
@@ -2492,9 +2486,9 @@
         "bdc": "bdc-Latn-CO",
         "bdc-CO": "bdc-Latn-CO",
         "bdc-Latn": "bdc-Latn-CO",
-        "bdd": "bdd-Latn-ZZ",
-        "bdd-Latn": "bdd-Latn-ZZ",
-        "bdd-ZZ": "bdd-Latn-ZZ",
+        "bdd": "bdd-Latn-PG",
+        "bdd-Latn": "bdd-Latn-PG",
+        "bdd-PG": "bdd-Latn-PG",
         "bde": "bde-Latn-NG",
         "bde-Latn": "bde-Latn-NG",
         "bde-NG": "bde-Latn-NG",
@@ -2580,12 +2574,12 @@
         "bee": "bee-Deva-IN",
         "bee-Deva": "bee-Deva-IN",
         "bee-IN": "bee-Deva-IN",
-        "bef": "bef-Latn-ZZ",
-        "bef-Latn": "bef-Latn-ZZ",
-        "bef-ZZ": "bef-Latn-ZZ",
-        "beh": "beh-Latn-ZZ",
-        "beh-Latn": "beh-Latn-ZZ",
-        "beh-ZZ": "beh-Latn-ZZ",
+        "bef": "bef-Latn-PG",
+        "bef-Latn": "bef-Latn-PG",
+        "bef-PG": "bef-Latn-PG",
+        "beh": "beh-Latn-BJ",
+        "beh-BJ": "beh-Latn-BJ",
+        "beh-Latn": "beh-Latn-BJ",
         "bei": "bei-Latn-ID",
         "bei-ID": "bei-Latn-ID",
         "bei-Latn": "bei-Latn-ID",
@@ -2610,9 +2604,9 @@
         "bes": "bes-Latn-TD",
         "bes-Latn": "bes-Latn-TD",
         "bes-TD": "bes-Latn-TD",
-        "bet": "bet-Latn-ZZ",
-        "bet-Latn": "bet-Latn-ZZ",
-        "bet-ZZ": "bet-Latn-ZZ",
+        "bet": "bet-Latn-CI",
+        "bet-CI": "bet-Latn-CI",
+        "bet-Latn": "bet-Latn-CI",
         "beu": "beu-Latn-ID",
         "beu-ID": "beu-Latn-ID",
         "beu-Latn": "beu-Latn-ID",
@@ -2622,9 +2616,10 @@
         "bew": "bew-Latn-ID",
         "bew-ID": "bew-Latn-ID",
         "bew-Latn": "bew-Latn-ID",
-        "bex": "bex-Latn-ZZ",
-        "bex-Latn": "bex-Latn-ZZ",
-        "bex-ZZ": "bex-Latn-ZZ",
+        "bex": "bex-Latn-SS",
+        "bex-Arab": "bex-Arab-SS",
+        "bex-Latn": "bex-Latn-SS",
+        "bex-SS": "bex-Latn-SS",
         "bey": "bey-Latn-PG",
         "bey-Latn": "bey-Latn-PG",
         "bey-PG": "bey-Latn-PG",
@@ -2789,9 +2784,9 @@
         "bhf": "bhf-Latn-PG",
         "bhf-Latn": "bhf-Latn-PG",
         "bhf-PG": "bhf-Latn-PG",
-        "bhg": "bhg-Latn-ZZ",
-        "bhg-Latn": "bhg-Latn-ZZ",
-        "bhg-ZZ": "bhg-Latn-ZZ",
+        "bhg": "bhg-Latn-PG",
+        "bhg-Latn": "bhg-Latn-PG",
+        "bhg-PG": "bhg-Latn-PG",
         "bhh": "bhh-Cyrl-IL",
         "bhh-Cyrl": "bhh-Cyrl-IL",
         "bhh-Hebr": "bhh-Hebr-IL",
@@ -2803,9 +2798,9 @@
         "bhj": "bhj-Deva-NP",
         "bhj-Deva": "bhj-Deva-NP",
         "bhj-NP": "bhj-Deva-NP",
-        "bhl": "bhl-Latn-ZZ",
-        "bhl-Latn": "bhl-Latn-ZZ",
-        "bhl-ZZ": "bhl-Latn-ZZ",
+        "bhl": "bhl-Latn-PG",
+        "bhl-Latn": "bhl-Latn-PG",
+        "bhl-PG": "bhl-Latn-PG",
         "bhm": "bhm-Arab-OM",
         "bhm-Arab": "bhm-Arab-OM",
         "bhm-OM": "bhm-Arab-OM",
@@ -2841,9 +2836,9 @@
         "bhw": "bhw-Latn-ID",
         "bhw-ID": "bhw-Latn-ID",
         "bhw-Latn": "bhw-Latn-ID",
-        "bhy": "bhy-Latn-ZZ",
-        "bhy-Latn": "bhy-Latn-ZZ",
-        "bhy-ZZ": "bhy-Latn-ZZ",
+        "bhy": "bhy-Latn-CD",
+        "bhy-CD": "bhy-Latn-CD",
+        "bhy-Latn": "bhy-Latn-CD",
         "bhz": "bhz-Latn-ID",
         "bhz-ID": "bhz-Latn-ID",
         "bhz-Latn": "bhz-Latn-ID",
@@ -2853,9 +2848,9 @@
         "bia": "bia-Latn-AU",
         "bia-AU": "bia-Latn-AU",
         "bia-Latn": "bia-Latn-AU",
-        "bib": "bib-Latn-ZZ",
-        "bib-Latn": "bib-Latn-ZZ",
-        "bib-ZZ": "bib-Latn-ZZ",
+        "bib": "bib-Latn-BF",
+        "bib-BF": "bib-Latn-BF",
+        "bib-Latn": "bib-Latn-BF",
         "bid": "bid-Latn-TD",
         "bid-Latn": "bid-Latn-TD",
         "bid-TD": "bid-Latn-TD",
@@ -2865,30 +2860,30 @@
         "bif": "bif-Latn-GW",
         "bif-GW": "bif-Latn-GW",
         "bif-Latn": "bif-Latn-GW",
-        "big": "big-Latn-ZZ",
-        "big-Latn": "big-Latn-ZZ",
-        "big-ZZ": "big-Latn-ZZ",
+        "big": "big-Latn-PG",
+        "big-Latn": "big-Latn-PG",
+        "big-PG": "big-Latn-PG",
         "bik": "bik-Latn-PH",
         "bik-Latn": "bik-Latn-PH",
         "bik-PH": "bik-Latn-PH",
         "bil": "bil-Latn-NG",
         "bil-Latn": "bil-Latn-NG",
         "bil-NG": "bil-Latn-NG",
-        "bim": "bim-Latn-ZZ",
-        "bim-Latn": "bim-Latn-ZZ",
-        "bim-ZZ": "bim-Latn-ZZ",
+        "bim": "bim-Latn-GH",
+        "bim-GH": "bim-Latn-GH",
+        "bim-Latn": "bim-Latn-GH",
         "bin": "bin-Latn-NG",
         "bin-Latn": "bin-Latn-NG",
         "bin-NG": "bin-Latn-NG",
-        "bio": "bio-Latn-ZZ",
-        "bio-Latn": "bio-Latn-ZZ",
-        "bio-ZZ": "bio-Latn-ZZ",
+        "bio": "bio-Latn-PG",
+        "bio-Latn": "bio-Latn-PG",
+        "bio-PG": "bio-Latn-PG",
         "bip": "bip-Latn-CD",
         "bip-CD": "bip-Latn-CD",
         "bip-Latn": "bip-Latn-CD",
-        "biq": "biq-Latn-ZZ",
-        "biq-Latn": "biq-Latn-ZZ",
-        "biq-ZZ": "biq-Latn-ZZ",
+        "biq": "biq-Latn-PG",
+        "biq-Latn": "biq-Latn-PG",
+        "biq-PG": "biq-Latn-PG",
         "bir": "bir-Latn-PG",
         "bir-Latn": "bir-Latn-PG",
         "bir-PG": "bir-Latn-PG",
@@ -2925,12 +2920,13 @@
         "bjg": "bjg-Latn-GW",
         "bjg-GW": "bjg-Latn-GW",
         "bjg-Latn": "bjg-Latn-GW",
-        "bjh": "bjh-Latn-ZZ",
-        "bjh-Latn": "bjh-Latn-ZZ",
-        "bjh-ZZ": "bjh-Latn-ZZ",
-        "bji": "bji-Ethi-ZZ",
-        "bji-Ethi": "bji-Ethi-ZZ",
-        "bji-ZZ": "bji-Ethi-ZZ",
+        "bjh": "bjh-Latn-PG",
+        "bjh-Latn": "bjh-Latn-PG",
+        "bjh-PG": "bjh-Latn-PG",
+        "bji": "bji-Latn-ET",
+        "bji-ET": "bji-Latn-ET",
+        "bji-Ethi": "bji-Ethi-ET",
+        "bji-Latn": "bji-Latn-ET",
         "bjj": "bjj-Deva-IN",
         "bjj-Deva": "bjj-Deva-IN",
         "bjj-IN": "bjj-Deva-IN",
@@ -2946,15 +2942,15 @@
         "bjn": "bjn-Latn-ID",
         "bjn-ID": "bjn-Latn-ID",
         "bjn-Latn": "bjn-Latn-ID",
-        "bjo": "bjo-Latn-ZZ",
-        "bjo-Latn": "bjo-Latn-ZZ",
-        "bjo-ZZ": "bjo-Latn-ZZ",
+        "bjo": "bjo-Latn-CF",
+        "bjo-CF": "bjo-Latn-CF",
+        "bjo-Latn": "bjo-Latn-CF",
         "bjp": "bjp-Latn-PG",
         "bjp-Latn": "bjp-Latn-PG",
         "bjp-PG": "bjp-Latn-PG",
-        "bjr": "bjr-Latn-ZZ",
-        "bjr-Latn": "bjr-Latn-ZZ",
-        "bjr-ZZ": "bjr-Latn-ZZ",
+        "bjr": "bjr-Latn-PG",
+        "bjr-Latn": "bjr-Latn-PG",
+        "bjr-PG": "bjr-Latn-PG",
         "bjs": "bjs-Latn-BB",
         "bjs-BB": "bjs-Latn-BB",
         "bjs-Latn": "bjs-Latn-BB",
@@ -2976,15 +2972,15 @@
         "bjy": "bjy-Latn-AU",
         "bjy-AU": "bjy-Latn-AU",
         "bjy-Latn": "bjy-Latn-AU",
-        "bjz": "bjz-Latn-ZZ",
-        "bjz-Latn": "bjz-Latn-ZZ",
-        "bjz-ZZ": "bjz-Latn-ZZ",
+        "bjz": "bjz-Latn-PG",
+        "bjz-Latn": "bjz-Latn-PG",
+        "bjz-PG": "bjz-Latn-PG",
         "bka": "bka-Latn-NG",
         "bka-Latn": "bka-Latn-NG",
         "bka-NG": "bka-Latn-NG",
-        "bkc": "bkc-Latn-ZZ",
-        "bkc-Latn": "bkc-Latn-ZZ",
-        "bkc-ZZ": "bkc-Latn-ZZ",
+        "bkc": "bkc-Latn-CM",
+        "bkc-CM": "bkc-Latn-CM",
+        "bkc-Latn": "bkc-Latn-CM",
         "bkd": "bkd-Latn-PH",
         "bkd-Latn": "bkd-Latn-PH",
         "bkd-PH": "bkd-Latn-PH",
@@ -3018,9 +3014,9 @@
         "bkp": "bkp-Latn-CD",
         "bkp-CD": "bkp-Latn-CD",
         "bkp-Latn": "bkp-Latn-CD",
-        "bkq": "bkq-Latn-ZZ",
-        "bkq-Latn": "bkq-Latn-ZZ",
-        "bkq-ZZ": "bkq-Latn-ZZ",
+        "bkq": "bkq-Latn-BR",
+        "bkq-BR": "bkq-Latn-BR",
+        "bkq-Latn": "bkq-Latn-BR",
         "bkr": "bkr-Latn-ID",
         "bkr-ID": "bkr-Latn-ID",
         "bkr-Latn": "bkr-Latn-ID",
@@ -3033,9 +3029,9 @@
         "bku": "bku-Latn-PH",
         "bku-Latn": "bku-Latn-PH",
         "bku-PH": "bku-Latn-PH",
-        "bkv": "bkv-Latn-ZZ",
-        "bkv-Latn": "bkv-Latn-ZZ",
-        "bkv-ZZ": "bkv-Latn-ZZ",
+        "bkv": "bkv-Latn-NG",
+        "bkv-Latn": "bkv-Latn-NG",
+        "bkv-NG": "bkv-Latn-NG",
         "bkw": "bkw-Latn-CG",
         "bkw-CG": "bkw-Latn-CG",
         "bkw-Latn": "bkw-Latn-CG",
@@ -3066,9 +3062,6 @@
         "blf": "blf-Latn-ID",
         "blf-ID": "blf-Latn-ID",
         "blf-Latn": "blf-Latn-ID",
-        "blg": "blg-Latn-MY",
-        "blg-Latn": "blg-Latn-MY",
-        "blg-MY": "blg-Latn-MY",
         "blh": "blh-Latn-LR",
         "blh-LR": "blh-Latn-LR",
         "blh-Latn": "blh-Latn-LR",
@@ -3146,18 +3139,18 @@
         "bmg": "bmg-Latn-CD",
         "bmg-CD": "bmg-Latn-CD",
         "bmg-Latn": "bmg-Latn-CD",
-        "bmh": "bmh-Latn-ZZ",
-        "bmh-Latn": "bmh-Latn-ZZ",
-        "bmh-ZZ": "bmh-Latn-ZZ",
+        "bmh": "bmh-Latn-PG",
+        "bmh-Latn": "bmh-Latn-PG",
+        "bmh-PG": "bmh-Latn-PG",
         "bmi": "bmi-Latn-TD",
         "bmi-Latn": "bmi-Latn-TD",
         "bmi-TD": "bmi-Latn-TD",
         "bmj": "bmj-Deva-NP",
         "bmj-Deva": "bmj-Deva-NP",
         "bmj-NP": "bmj-Deva-NP",
-        "bmk": "bmk-Latn-ZZ",
-        "bmk-Latn": "bmk-Latn-ZZ",
-        "bmk-ZZ": "bmk-Latn-ZZ",
+        "bmk": "bmk-Latn-PG",
+        "bmk-Latn": "bmk-Latn-PG",
+        "bmk-PG": "bmk-Latn-PG",
         "bml": "bml-Latn-CD",
         "bml-CD": "bml-Latn-CD",
         "bml-Latn": "bml-Latn-CD",
@@ -3182,9 +3175,9 @@
         "bms": "bms-Latn-NE",
         "bms-Latn": "bms-Latn-NE",
         "bms-NE": "bms-Latn-NE",
-        "bmu": "bmu-Latn-ZZ",
-        "bmu-Latn": "bmu-Latn-ZZ",
-        "bmu-ZZ": "bmu-Latn-ZZ",
+        "bmu": "bmu-Latn-PG",
+        "bmu-Latn": "bmu-Latn-PG",
+        "bmu-PG": "bmu-Latn-PG",
         "bmv": "bmv-Latn-CM",
         "bmv-CM": "bmv-Latn-CM",
         "bmv-Latn": "bmv-Latn-CM",
@@ -3220,9 +3213,9 @@
         "bnf": "bnf-Latn-ID",
         "bnf-ID": "bnf-Latn-ID",
         "bnf-Latn": "bnf-Latn-ID",
-        "bng": "bng-Latn-ZZ",
-        "bng-Latn": "bng-Latn-ZZ",
-        "bng-ZZ": "bng-Latn-ZZ",
+        "bng": "bng-Latn-GQ",
+        "bng-GQ": "bng-Latn-GQ",
+        "bng-Latn": "bng-Latn-GQ",
         "bni": "bni-Latn-CD",
         "bni-CD": "bni-Latn-CD",
         "bni-Latn": "bni-Latn-CD",
@@ -3232,18 +3225,18 @@
         "bnk": "bnk-Latn-VU",
         "bnk-Latn": "bnk-Latn-VU",
         "bnk-VU": "bnk-Latn-VU",
-        "bnm": "bnm-Latn-ZZ",
-        "bnm-Latn": "bnm-Latn-ZZ",
-        "bnm-ZZ": "bnm-Latn-ZZ",
+        "bnm": "bnm-Latn-GQ",
+        "bnm-GQ": "bnm-Latn-GQ",
+        "bnm-Latn": "bnm-Latn-GQ",
         "bnn": "bnn-Latn-TW",
         "bnn-Latn": "bnn-Latn-TW",
         "bnn-TW": "bnn-Latn-TW",
         "bno": "bno-Latn-PH",
         "bno-Latn": "bno-Latn-PH",
         "bno-PH": "bno-Latn-PH",
-        "bnp": "bnp-Latn-ZZ",
-        "bnp-Latn": "bnp-Latn-ZZ",
-        "bnp-ZZ": "bnp-Latn-ZZ",
+        "bnp": "bnp-Latn-PG",
+        "bnp-Latn": "bnp-Latn-PG",
+        "bnp-PG": "bnp-Latn-PG",
         "bnq": "bnq-Latn-ID",
         "bnq-ID": "bnq-Latn-ID",
         "bnq-Latn": "bnq-Latn-ID",
@@ -3289,21 +3282,21 @@
         "boh": "boh-Latn-CD",
         "boh-CD": "boh-Latn-CD",
         "boh-Latn": "boh-Latn-CD",
-        "boj": "boj-Latn-ZZ",
-        "boj-Latn": "boj-Latn-ZZ",
-        "boj-ZZ": "boj-Latn-ZZ",
+        "boj": "boj-Latn-PG",
+        "boj-Latn": "boj-Latn-PG",
+        "boj-PG": "boj-Latn-PG",
         "bok": "bok-Latn-CG",
         "bok-CG": "bok-Latn-CG",
         "bok-Latn": "bok-Latn-CG",
         "bol": "bol-Latn-NG",
         "bol-Latn": "bol-Latn-NG",
         "bol-NG": "bol-Latn-NG",
-        "bom": "bom-Latn-ZZ",
-        "bom-Latn": "bom-Latn-ZZ",
-        "bom-ZZ": "bom-Latn-ZZ",
-        "bon": "bon-Latn-ZZ",
-        "bon-Latn": "bon-Latn-ZZ",
-        "bon-ZZ": "bon-Latn-ZZ",
+        "bom": "bom-Latn-NG",
+        "bom-Latn": "bom-Latn-NG",
+        "bom-NG": "bom-Latn-NG",
+        "bon": "bon-Latn-PG",
+        "bon-Latn": "bon-Latn-PG",
+        "bon-PG": "bon-Latn-PG",
         "boo": "boo-Latn-ML",
         "boo-Latn": "boo-Latn-ML",
         "boo-ML": "boo-Latn-ML",
@@ -3413,9 +3406,9 @@
         "bqb": "bqb-Latn-ID",
         "bqb-ID": "bqb-Latn-ID",
         "bqb-Latn": "bqb-Latn-ID",
-        "bqc": "bqc-Latn-ZZ",
-        "bqc-Latn": "bqc-Latn-ZZ",
-        "bqc-ZZ": "bqc-Latn-ZZ",
+        "bqc": "bqc-Latn-BJ",
+        "bqc-BJ": "bqc-Latn-BJ",
+        "bqc-Latn": "bqc-Latn-BJ",
         "bqd": "bqd-Latn-CM",
         "bqd-CM": "bqd-Latn-CM",
         "bqd-Latn": "bqd-Latn-CM",
@@ -3444,9 +3437,9 @@
         "bqo": "bqo-Latn-CM",
         "bqo-CM": "bqo-Latn-CM",
         "bqo-Latn": "bqo-Latn-CM",
-        "bqp": "bqp-Latn-ZZ",
-        "bqp-Latn": "bqp-Latn-ZZ",
-        "bqp-ZZ": "bqp-Latn-ZZ",
+        "bqp": "bqp-Latn-NG",
+        "bqp-Latn": "bqp-Latn-NG",
+        "bqp-NG": "bqp-Latn-NG",
         "bqq": "bqq-Latn-ID",
         "bqq-ID": "bqq-Latn-ID",
         "bqq-Latn": "bqq-Latn-ID",
@@ -3547,9 +3540,9 @@
         "bry": "bry-Latn-PG",
         "bry-Latn": "bry-Latn-PG",
         "bry-PG": "bry-Latn-PG",
-        "brz": "brz-Latn-ZZ",
-        "brz-Latn": "brz-Latn-ZZ",
-        "brz-ZZ": "brz-Latn-ZZ",
+        "brz": "brz-Latn-PG",
+        "brz-Latn": "brz-Latn-PG",
+        "brz-PG": "brz-Latn-PG",
         "bs": "bs-Latn-BA",
         "bs-BA": "bs-Latn-BA",
         "bs-Latn": "bs-Latn-BA",
@@ -3574,9 +3567,9 @@
         "bsi": "bsi-Latn-CM",
         "bsi-CM": "bsi-Latn-CM",
         "bsi-Latn": "bsi-Latn-CM",
-        "bsj": "bsj-Latn-ZZ",
-        "bsj-Latn": "bsj-Latn-ZZ",
-        "bsj-ZZ": "bsj-Latn-ZZ",
+        "bsj": "bsj-Latn-NG",
+        "bsj-Latn": "bsj-Latn-NG",
+        "bsj-NG": "bsj-Latn-NG",
         "bsk": "bsk-Arab-PK",
         "bsk-Arab": "bsk-Arab-PK",
         "bsk-Latn": "bsk-Latn-PK",
@@ -3605,9 +3598,10 @@
         "bss": "bss-Latn-CM",
         "bss-CM": "bss-Latn-CM",
         "bss-Latn": "bss-Latn-CM",
-        "bst": "bst-Ethi-ZZ",
-        "bst-Ethi": "bst-Ethi-ZZ",
-        "bst-ZZ": "bst-Ethi-ZZ",
+        "bst": "bst-Ethi-ET",
+        "bst-ET": "bst-Ethi-ET",
+        "bst-Ethi": "bst-Ethi-ET",
+        "bst-Latn": "bst-Latn-ET",
         "bsu": "bsu-Latn-ID",
         "bsu-ID": "bsu-Latn-ID",
         "bsu-Latn": "bsu-Latn-ID",
@@ -3674,9 +3668,9 @@
         "bts-Batk": "bts-Batk-ID",
         "bts-ID": "bts-Latn-ID",
         "bts-Latn": "bts-Latn-ID",
-        "btt": "btt-Latn-ZZ",
-        "btt-Latn": "btt-Latn-ZZ",
-        "btt-ZZ": "btt-Latn-ZZ",
+        "btt": "btt-Latn-NG",
+        "btt-Latn": "btt-Latn-NG",
+        "btt-NG": "btt-Latn-NG",
         "btu": "btu-Latn-NG",
         "btu-Latn": "btu-Latn-NG",
         "btu-NG": "btu-Latn-NG",
@@ -3705,9 +3699,10 @@
         "buc": "buc-Latn-YT",
         "buc-Latn": "buc-Latn-YT",
         "buc-YT": "buc-Latn-YT",
-        "bud": "bud-Latn-ZZ",
-        "bud-Latn": "bud-Latn-ZZ",
-        "bud-ZZ": "bud-Latn-ZZ",
+        "bud": "bud-Latn-TG",
+        "bud-Brai": "bud-Brai-TG",
+        "bud-Latn": "bud-Latn-TG",
+        "bud-TG": "bud-Latn-TG",
         "bue": "bue-Latn-CA",
         "bue-CA": "bue-Latn-CA",
         "bue-Latn": "bue-Latn-CA",
@@ -3726,33 +3721,33 @@
         "buj": "buj-Latn-NG",
         "buj-Latn": "buj-Latn-NG",
         "buj-NG": "buj-Latn-NG",
-        "buk": "buk-Latn-ZZ",
-        "buk-Latn": "buk-Latn-ZZ",
-        "buk-ZZ": "buk-Latn-ZZ",
+        "buk": "buk-Latn-PG",
+        "buk-Latn": "buk-Latn-PG",
+        "buk-PG": "buk-Latn-PG",
         "bum": "bum-Latn-CM",
         "bum-CM": "bum-Latn-CM",
         "bum-Latn": "bum-Latn-CM",
         "bun": "bun-Latn-SL",
         "bun-Latn": "bun-Latn-SL",
         "bun-SL": "bun-Latn-SL",
-        "buo": "buo-Latn-ZZ",
-        "buo-Latn": "buo-Latn-ZZ",
-        "buo-ZZ": "buo-Latn-ZZ",
+        "buo": "buo-Latn-PG",
+        "buo-Latn": "buo-Latn-PG",
+        "buo-PG": "buo-Latn-PG",
         "bup": "bup-Latn-ID",
         "bup-ID": "bup-Latn-ID",
         "bup-Latn": "bup-Latn-ID",
         "buq": "buq-Latn-PG",
         "buq-Latn": "buq-Latn-PG",
         "buq-PG": "buq-Latn-PG",
-        "bus": "bus-Latn-ZZ",
-        "bus-Latn": "bus-Latn-ZZ",
-        "bus-ZZ": "bus-Latn-ZZ",
+        "bus": "bus-Latn-NG",
+        "bus-Latn": "bus-Latn-NG",
+        "bus-NG": "bus-Latn-NG",
         "but": "but-Latn-PG",
         "but-Latn": "but-Latn-PG",
         "but-PG": "but-Latn-PG",
-        "buu": "buu-Latn-ZZ",
-        "buu-Latn": "buu-Latn-ZZ",
-        "buu-ZZ": "buu-Latn-ZZ",
+        "buu": "buu-Latn-CD",
+        "buu-CD": "buu-Latn-CD",
+        "buu-Latn": "buu-Latn-CD",
         "buv": "buv-Latn-PG",
         "buv-Latn": "buv-Latn-PG",
         "buv-PG": "buv-Latn-PG",
@@ -3846,9 +3841,9 @@
         "bwc": "bwc-Latn-ZM",
         "bwc-Latn": "bwc-Latn-ZM",
         "bwc-ZM": "bwc-Latn-ZM",
-        "bwd": "bwd-Latn-ZZ",
-        "bwd-Latn": "bwd-Latn-ZZ",
-        "bwd-ZZ": "bwd-Latn-ZZ",
+        "bwd": "bwd-Latn-PG",
+        "bwd-Latn": "bwd-Latn-PG",
+        "bwd-PG": "bwd-Latn-PG",
         "bwe": "bwe-Mymr-MM",
         "bwe-Latn": "bwe-Latn-MM",
         "bwe-MM": "bwe-Mymr-MM",
@@ -3887,9 +3882,9 @@
         "bwq": "bwq-Latn-BF",
         "bwq-BF": "bwq-Latn-BF",
         "bwq-Latn": "bwq-Latn-BF",
-        "bwr": "bwr-Latn-ZZ",
-        "bwr-Latn": "bwr-Latn-ZZ",
-        "bwr-ZZ": "bwr-Latn-ZZ",
+        "bwr": "bwr-Latn-NG",
+        "bwr-Latn": "bwr-Latn-NG",
+        "bwr-NG": "bwr-Latn-NG",
         "bws": "bws-Latn-CD",
         "bws-CD": "bws-Latn-CD",
         "bws-Latn": "bws-Latn-CD",
@@ -3926,9 +3921,9 @@
         "bxg": "bxg-Latn-CD",
         "bxg-CD": "bxg-Latn-CD",
         "bxg-Latn": "bxg-Latn-CD",
-        "bxh": "bxh-Latn-ZZ",
-        "bxh-Latn": "bxh-Latn-ZZ",
-        "bxh-ZZ": "bxh-Latn-ZZ",
+        "bxh": "bxh-Latn-PG",
+        "bxh-Latn": "bxh-Latn-PG",
+        "bxh-PG": "bxh-Latn-PG",
         "bxi": "bxi-Latn-AU",
         "bxi-AU": "bxi-Latn-AU",
         "bxi-Latn": "bxi-Latn-AU",
@@ -3984,9 +3979,9 @@
         "byd": "byd-Latn-ID",
         "byd-ID": "byd-Latn-ID",
         "byd-Latn": "byd-Latn-ID",
-        "bye": "bye-Latn-ZZ",
-        "bye-Latn": "bye-Latn-ZZ",
-        "bye-ZZ": "bye-Latn-ZZ",
+        "bye": "bye-Latn-PG",
+        "bye-Latn": "bye-Latn-PG",
+        "bye-PG": "bye-Latn-PG",
         "byf": "byf-Latn-NG",
         "byf-Latn": "byf-Latn-NG",
         "byf-NG": "byf-Latn-NG",
@@ -4014,27 +4009,27 @@
         "byp": "byp-Latn-NG",
         "byp-Latn": "byp-Latn-NG",
         "byp-NG": "byp-Latn-NG",
-        "byr": "byr-Latn-ZZ",
-        "byr-Latn": "byr-Latn-ZZ",
-        "byr-ZZ": "byr-Latn-ZZ",
-        "bys": "bys-Latn-ZZ",
-        "bys-Latn": "bys-Latn-ZZ",
-        "bys-ZZ": "bys-Latn-ZZ",
+        "byr": "byr-Latn-PG",
+        "byr-Latn": "byr-Latn-PG",
+        "byr-PG": "byr-Latn-PG",
+        "bys": "bys-Latn-NG",
+        "bys-Latn": "bys-Latn-NG",
+        "bys-NG": "bys-Latn-NG",
         "byv": "byv-Latn-CM",
         "byv-CM": "byv-Latn-CM",
         "byv-Latn": "byv-Latn-CM",
         "byw": "byw-Deva-NP",
         "byw-Deva": "byw-Deva-NP",
         "byw-NP": "byw-Deva-NP",
-        "byx": "byx-Latn-ZZ",
-        "byx-Latn": "byx-Latn-ZZ",
-        "byx-ZZ": "byx-Latn-ZZ",
+        "byx": "byx-Latn-PG",
+        "byx-Latn": "byx-Latn-PG",
+        "byx-PG": "byx-Latn-PG",
         "byz": "byz-Latn-PG",
         "byz-Latn": "byz-Latn-PG",
         "byz-PG": "byz-Latn-PG",
-        "bza": "bza-Latn-ZZ",
-        "bza-Latn": "bza-Latn-ZZ",
-        "bza-ZZ": "bza-Latn-ZZ",
+        "bza": "bza-Latn-LR",
+        "bza-LR": "bza-Latn-LR",
+        "bza-Latn": "bza-Latn-LR",
         "bzb": "bzb-Latn-ID",
         "bzb-ID": "bzb-Latn-ID",
         "bzb-Latn": "bzb-Latn-ID",
@@ -4047,12 +4042,12 @@
         "bze": "bze-Latn-ML",
         "bze-Latn": "bze-Latn-ML",
         "bze-ML": "bze-Latn-ML",
-        "bzf": "bzf-Latn-ZZ",
-        "bzf-Latn": "bzf-Latn-ZZ",
-        "bzf-ZZ": "bzf-Latn-ZZ",
-        "bzh": "bzh-Latn-ZZ",
-        "bzh-Latn": "bzh-Latn-ZZ",
-        "bzh-ZZ": "bzh-Latn-ZZ",
+        "bzf": "bzf-Latn-PG",
+        "bzf-Latn": "bzf-Latn-PG",
+        "bzf-PG": "bzf-Latn-PG",
+        "bzh": "bzh-Latn-PG",
+        "bzh-Latn": "bzh-Latn-PG",
+        "bzh-PG": "bzh-Latn-PG",
         "bzi": "bzi-Thai-TH",
         "bzi-TH": "bzi-Thai-TH",
         "bzi-Thai": "bzi-Thai-TH",
@@ -4092,9 +4087,9 @@
         "bzv": "bzv-Latn-CM",
         "bzv-CM": "bzv-Latn-CM",
         "bzv-Latn": "bzv-Latn-CM",
-        "bzw": "bzw-Latn-ZZ",
-        "bzw-Latn": "bzw-Latn-ZZ",
-        "bzw-ZZ": "bzw-Latn-ZZ",
+        "bzw": "bzw-Latn-NG",
+        "bzw-Latn": "bzw-Latn-NG",
+        "bzw-NG": "bzw-Latn-NG",
         "bzx": "bzx-Latn-ML",
         "bzx-Latn": "bzx-Latn-ML",
         "bzx-ML": "bzx-Latn-ML",
@@ -4145,9 +4140,9 @@
         "cam": "cam-Latn-NC",
         "cam-Latn": "cam-Latn-NC",
         "cam-NC": "cam-Latn-NC",
-        "can": "can-Latn-ZZ",
-        "can-Latn": "can-Latn-ZZ",
-        "can-ZZ": "can-Latn-ZZ",
+        "can": "can-Latn-PG",
+        "can-Latn": "can-Latn-PG",
+        "can-PG": "can-Latn-PG",
         "cao": "cao-Latn-BO",
         "cao-BO": "cao-Latn-BO",
         "cao-Latn": "cao-Latn-BO",
@@ -4193,9 +4188,9 @@
         "cbi": "cbi-Latn-EC",
         "cbi-EC": "cbi-Latn-EC",
         "cbi-Latn": "cbi-Latn-EC",
-        "cbj": "cbj-Latn-ZZ",
-        "cbj-Latn": "cbj-Latn-ZZ",
-        "cbj-ZZ": "cbj-Latn-ZZ",
+        "cbj": "cbj-Latn-BJ",
+        "cbj-BJ": "cbj-Latn-BJ",
+        "cbj-Latn": "cbj-Latn-BJ",
         "cbk": "cbk-Latn-PH",
         "cbk-Brai": "cbk-Brai-PH",
         "cbk-Latn": "cbk-Latn-PH",
@@ -4322,9 +4317,9 @@
         "cey": "cey-Latn-MM",
         "cey-Latn": "cey-Latn-MM",
         "cey-MM": "cey-Latn-MM",
-        "cfa": "cfa-Latn-ZZ",
-        "cfa-Latn": "cfa-Latn-ZZ",
-        "cfa-ZZ": "cfa-Latn-ZZ",
+        "cfa": "cfa-Latn-NG",
+        "cfa-Latn": "cfa-Latn-NG",
+        "cfa-NG": "cfa-Latn-NG",
         "cfd": "cfd-Latn-NG",
         "cfd-Latn": "cfd-Latn-NG",
         "cfd-NG": "cfd-Latn-NG",
@@ -4475,9 +4470,9 @@
         "cjs-Cyrl": "cjs-Cyrl-RU",
         "cjs-Latn": "cjs-Latn-RU",
         "cjs-RU": "cjs-Latn-RU",
-        "cjv": "cjv-Latn-ZZ",
-        "cjv-Latn": "cjv-Latn-ZZ",
-        "cjv-ZZ": "cjv-Latn-ZZ",
+        "cjv": "cjv-Latn-PG",
+        "cjv-Latn": "cjv-Latn-PG",
+        "cjv-PG": "cjv-Latn-PG",
         "cjy": "cjy-Hans-CN",
         "cjy-CN": "cjy-Hans-CN",
         "cjy-Hans": "cjy-Hans-CN",
@@ -4485,9 +4480,9 @@
         "ckb": "ckb-Arab-IQ",
         "ckb-Arab": "ckb-Arab-IQ",
         "ckb-IQ": "ckb-Arab-IQ",
-        "ckl": "ckl-Latn-ZZ",
-        "ckl-Latn": "ckl-Latn-ZZ",
-        "ckl-ZZ": "ckl-Latn-ZZ",
+        "ckl": "ckl-Latn-NG",
+        "ckl-Latn": "ckl-Latn-NG",
+        "ckl-NG": "ckl-Latn-NG",
         "ckm": "ckm-Latn-HR",
         "ckm-Glag": "ckm-Glag-HR",
         "ckm-HR": "ckm-Latn-HR",
@@ -4495,9 +4490,9 @@
         "ckn": "ckn-Latn-MM",
         "ckn-Latn": "ckn-Latn-MM",
         "ckn-MM": "ckn-Latn-MM",
-        "cko": "cko-Latn-ZZ",
-        "cko-Latn": "cko-Latn-ZZ",
-        "cko-ZZ": "cko-Latn-ZZ",
+        "cko": "cko-Latn-GH",
+        "cko-GH": "cko-Latn-GH",
+        "cko-Latn": "cko-Latn-GH",
         "ckq": "ckq-Latn-TD",
         "ckq-Latn": "ckq-Latn-TD",
         "ckq-TD": "ckq-Latn-TD",
@@ -4519,15 +4514,15 @@
         "ckx": "ckx-Latn-CM",
         "ckx-CM": "ckx-Latn-CM",
         "ckx-Latn": "ckx-Latn-CM",
-        "cky": "cky-Latn-ZZ",
-        "cky-Latn": "cky-Latn-ZZ",
-        "cky-ZZ": "cky-Latn-ZZ",
+        "cky": "cky-Latn-NG",
+        "cky-Latn": "cky-Latn-NG",
+        "cky-NG": "cky-Latn-NG",
         "ckz": "ckz-Latn-GT",
         "ckz-GT": "ckz-Latn-GT",
         "ckz-Latn": "ckz-Latn-GT",
-        "cla": "cla-Latn-ZZ",
-        "cla-Latn": "cla-Latn-ZZ",
-        "cla-ZZ": "cla-Latn-ZZ",
+        "cla": "cla-Latn-NG",
+        "cla-Latn": "cla-Latn-NG",
+        "cla-NG": "cla-Latn-NG",
         "clc": "clc-Latn-CA",
         "clc-CA": "clc-Latn-CA",
         "clc-Latn": "clc-Latn-CA",
@@ -4571,9 +4566,9 @@
         "cma": "cma-Latn-VN",
         "cma-Latn": "cma-Latn-VN",
         "cma-VN": "cma-Latn-VN",
-        "cme": "cme-Latn-ZZ",
-        "cme-Latn": "cme-Latn-ZZ",
-        "cme-ZZ": "cme-Latn-ZZ",
+        "cme": "cme-Latn-BF",
+        "cme-BF": "cme-Latn-BF",
+        "cme-Latn": "cme-Latn-BF",
         "cmg": "cmg-Soyo-MN",
         "cmg-MN": "cmg-Soyo-MN",
         "cmg-Soyo": "cmg-Soyo-MN",
@@ -5006,21 +5001,19 @@
         "dac": "dac-Latn-PG",
         "dac-Latn": "dac-Latn-PG",
         "dac-PG": "dac-Latn-PG",
-        "dad": "dad-Latn-ZZ",
-        "dad-Latn": "dad-Latn-ZZ",
-        "dad-ZZ": "dad-Latn-ZZ",
+        "dad": "dad-Latn-PG",
+        "dad-Latn": "dad-Latn-PG",
+        "dad-PG": "dad-Latn-PG",
         "dae": "dae-Latn-CM",
         "dae-CM": "dae-Latn-CM",
         "dae-Latn": "dae-Latn-CM",
-        "daf": "daf-Latn-CI",
-        "daf-CI": "daf-Latn-CI",
-        "daf-Latn": "daf-Latn-CI",
-        "dag": "dag-Latn-ZZ",
-        "dag-Latn": "dag-Latn-ZZ",
-        "dag-ZZ": "dag-Latn-ZZ",
-        "dah": "dah-Latn-ZZ",
-        "dah-Latn": "dah-Latn-ZZ",
-        "dah-ZZ": "dah-Latn-ZZ",
+        "dag": "dag-Latn-GH",
+        "dag-Arab": "dag-Arab-GH",
+        "dag-GH": "dag-Latn-GH",
+        "dag-Latn": "dag-Latn-GH",
+        "dah": "dah-Latn-PG",
+        "dah-Latn": "dah-Latn-PG",
+        "dah-PG": "dah-Latn-PG",
         "dai": "dai-Latn-TD",
         "dai-Latn": "dai-Latn-TD",
         "dai-TD": "dai-Latn-TD",
@@ -5069,9 +5062,9 @@
         "dbb": "dbb-Latn-NG",
         "dbb-Latn": "dbb-Latn-NG",
         "dbb-NG": "dbb-Latn-NG",
-        "dbd": "dbd-Latn-ZZ",
-        "dbd-Latn": "dbd-Latn-ZZ",
-        "dbd-ZZ": "dbd-Latn-ZZ",
+        "dbd": "dbd-Latn-NG",
+        "dbd-Latn": "dbd-Latn-NG",
+        "dbd-NG": "dbd-Latn-NG",
         "dbe": "dbe-Latn-ID",
         "dbe-ID": "dbe-Latn-ID",
         "dbe-Latn": "dbe-Latn-ID",
@@ -5103,9 +5096,9 @@
         "dbp": "dbp-Latn-NG",
         "dbp-Latn": "dbp-Latn-NG",
         "dbp-NG": "dbp-Latn-NG",
-        "dbq": "dbq-Latn-ZZ",
-        "dbq-Latn": "dbq-Latn-ZZ",
-        "dbq-ZZ": "dbq-Latn-ZZ",
+        "dbq": "dbq-Latn-CM",
+        "dbq-CM": "dbq-Latn-CM",
+        "dbq-Latn": "dbq-Latn-CM",
         "dbt": "dbt-Latn-ML",
         "dbt-Latn": "dbt-Latn-ML",
         "dbt-ML": "dbt-Latn-ML",
@@ -5145,9 +5138,9 @@
         "ddj": "ddj-Latn-AU",
         "ddj-AU": "ddj-Latn-AU",
         "ddj-Latn": "ddj-Latn-AU",
-        "ddn": "ddn-Latn-ZZ",
-        "ddn-Latn": "ddn-Latn-ZZ",
-        "ddn-ZZ": "ddn-Latn-ZZ",
+        "ddn": "ddn-Latn-BJ",
+        "ddn-BJ": "ddn-Latn-BJ",
+        "ddn-Latn": "ddn-Latn-BJ",
         "ddo": "ddo-Cyrl-RU",
         "ddo-Cyrl": "ddo-Cyrl-RU",
         "ddo-RU": "ddo-Cyrl-RU",
@@ -5164,16 +5157,15 @@
         "de-AT": "de-Latn-AT",
         "de-CH": "de-Latn-CH",
         "de-DE": "de-Latn-DE",
-        "de-EZ": "de-Latn-EZ",
         "de-LI": "de-Latn-LI",
         "de-LU": "de-Latn-LU",
         "de-Latn": "de-Latn-DE",
         "dec": "dec-Latn-SD",
         "dec-Latn": "dec-Latn-SD",
         "dec-SD": "dec-Latn-SD",
-        "ded": "ded-Latn-ZZ",
-        "ded-Latn": "ded-Latn-ZZ",
-        "ded-ZZ": "ded-Latn-ZZ",
+        "ded": "ded-Latn-PG",
+        "ded-Latn": "ded-Latn-PG",
+        "ded-PG": "ded-Latn-PG",
         "dee": "dee-Latn-LR",
         "dee-LR": "dee-Latn-LR",
         "dee-Latn": "dee-Latn-LR",
@@ -5217,9 +5209,9 @@
         "dez": "dez-Latn-CD",
         "dez-CD": "dez-Latn-CD",
         "dez-Latn": "dez-Latn-CD",
-        "dga": "dga-Latn-ZZ",
-        "dga-Latn": "dga-Latn-ZZ",
-        "dga-ZZ": "dga-Latn-ZZ",
+        "dga": "dga-Latn-GH",
+        "dga-GH": "dga-Latn-GH",
+        "dga-Latn": "dga-Latn-GH",
         "dgb": "dgb-Latn-ML",
         "dgb-Latn": "dgb-Latn-ML",
         "dgb-ML": "dgb-Latn-ML",
@@ -5235,18 +5227,15 @@
         "dgg": "dgg-Latn-PG",
         "dgg-Latn": "dgg-Latn-PG",
         "dgg-PG": "dgg-Latn-PG",
-        "dgh": "dgh-Latn-ZZ",
-        "dgh-Latn": "dgh-Latn-ZZ",
-        "dgh-ZZ": "dgh-Latn-ZZ",
-        "dgi": "dgi-Latn-ZZ",
-        "dgi-Latn": "dgi-Latn-ZZ",
-        "dgi-ZZ": "dgi-Latn-ZZ",
+        "dgh": "dgh-Latn-NG",
+        "dgh-Latn": "dgh-Latn-NG",
+        "dgh-NG": "dgh-Latn-NG",
+        "dgi": "dgi-Latn-BF",
+        "dgi-BF": "dgi-Latn-BF",
+        "dgi-Latn": "dgi-Latn-BF",
         "dgk": "dgk-Latn-CF",
         "dgk-CF": "dgk-Latn-CF",
         "dgk-Latn": "dgk-Latn-CF",
-        "dgl": "dgl-Arab-ZZ",
-        "dgl-Arab": "dgl-Arab-ZZ",
-        "dgl-ZZ": "dgl-Arab-ZZ",
         "dgn": "dgn-Latn-AU",
         "dgn-AU": "dgn-Latn-AU",
         "dgn-Latn": "dgn-Latn-AU",
@@ -5265,9 +5254,9 @@
         "dgx": "dgx-Latn-PG",
         "dgx-Latn": "dgx-Latn-PG",
         "dgx-PG": "dgx-Latn-PG",
-        "dgz": "dgz-Latn-ZZ",
-        "dgz-Latn": "dgz-Latn-ZZ",
-        "dgz-ZZ": "dgz-Latn-ZZ",
+        "dgz": "dgz-Latn-PG",
+        "dgz-Latn": "dgz-Latn-PG",
+        "dgz-PG": "dgz-Latn-PG",
         "dhg": "dhg-Latn-AU",
         "dhg-AU": "dhg-Latn-AU",
         "dhg-Latn": "dhg-Latn-AU",
@@ -5304,9 +5293,9 @@
         "dhx": "dhx-Latn-AU",
         "dhx-AU": "dhx-Latn-AU",
         "dhx-Latn": "dhx-Latn-AU",
-        "dia": "dia-Latn-ZZ",
-        "dia-Latn": "dia-Latn-ZZ",
-        "dia-ZZ": "dia-Latn-ZZ",
+        "dia": "dia-Latn-PG",
+        "dia-Latn": "dia-Latn-PG",
+        "dia-PG": "dia-Latn-PG",
         "dib": "dib-Latn-SS",
         "dib-Latn": "dib-Latn-SS",
         "dib-SS": "dib-Latn-SS",
@@ -5542,9 +5531,9 @@
         "doa": "doa-Latn-PG",
         "doa-Latn": "doa-Latn-PG",
         "doa-PG": "doa-Latn-PG",
-        "dob": "dob-Latn-ZZ",
-        "dob-Latn": "dob-Latn-ZZ",
-        "dob-ZZ": "dob-Latn-ZZ",
+        "dob": "dob-Latn-PG",
+        "dob-Latn": "dob-Latn-PG",
+        "dob-PG": "dob-Latn-PG",
         "doc": "doc-Latn-CN",
         "doc-CN": "doc-Latn-CN",
         "doc-Latn": "doc-Latn-CN",
@@ -5573,9 +5562,9 @@
         "doo": "doo-Latn-CD",
         "doo-CD": "doo-Latn-CD",
         "doo-Latn": "doo-Latn-CD",
-        "dop": "dop-Latn-ZZ",
-        "dop-Latn": "dop-Latn-ZZ",
-        "dop-ZZ": "dop-Latn-ZZ",
+        "dop": "dop-Latn-BJ",
+        "dop-BJ": "dop-Latn-BJ",
+        "dop-Latn": "dop-Latn-BJ",
         "dor": "dor-Latn-SB",
         "dor-Latn": "dor-Latn-SB",
         "dor-SB": "dor-Latn-SB",
@@ -5588,9 +5577,9 @@
         "dov": "dov-Latn-ZW",
         "dov-Latn": "dov-Latn-ZW",
         "dov-ZW": "dov-Latn-ZW",
-        "dow": "dow-Latn-ZZ",
-        "dow-Latn": "dow-Latn-ZZ",
-        "dow-ZZ": "dow-Latn-ZZ",
+        "dow": "dow-Latn-CM",
+        "dow-CM": "dow-Latn-CM",
+        "dow-Latn": "dow-Latn-CM",
         "dox": "dox-Ethi-ET",
         "dox-ET": "dox-Ethi-ET",
         "dox-Ethi": "dox-Ethi-ET",
@@ -5609,12 +5598,9 @@
         "drg": "drg-Latn-MY",
         "drg-Latn": "drg-Latn-MY",
         "drg-MY": "drg-Latn-MY",
-        "drh": "drh-Mong-CN",
-        "drh-CN": "drh-Mong-CN",
-        "drh-Mong": "drh-Mong-CN",
-        "dri": "dri-Latn-ZZ",
-        "dri-Latn": "dri-Latn-ZZ",
-        "dri-ZZ": "dri-Latn-ZZ",
+        "dri": "dri-Latn-NG",
+        "dri-Latn": "dri-Latn-NG",
+        "dri-NG": "dri-Latn-NG",
         "drl": "drl-Latn-AU",
         "drl-AU": "drl-Latn-AU",
         "drl-Latn": "drl-Latn-AU",
@@ -5627,9 +5613,9 @@
         "drq": "drq-Deva-NP",
         "drq-Deva": "drq-Deva-NP",
         "drq-NP": "drq-Deva-NP",
-        "drs": "drs-Ethi-ZZ",
-        "drs-Ethi": "drs-Ethi-ZZ",
-        "drs-ZZ": "drs-Ethi-ZZ",
+        "drs": "drs-Ethi-ET",
+        "drs-ET": "drs-Ethi-ET",
+        "drs-Ethi": "drs-Ethi-ET",
         "drt": "drt-Latn-NL",
         "drt-Latn": "drt-Latn-NL",
         "drt-NL": "drt-Latn-NL",
@@ -5690,9 +5676,9 @@
         "dtr": "dtr-Latn-MY",
         "dtr-Latn": "dtr-Latn-MY",
         "dtr-MY": "dtr-Latn-MY",
-        "dts": "dts-Latn-ZZ",
-        "dts-Latn": "dts-Latn-ZZ",
-        "dts-ZZ": "dts-Latn-ZZ",
+        "dts": "dts-Latn-ML",
+        "dts-Latn": "dts-Latn-ML",
+        "dts-ML": "dts-Latn-ML",
         "dtt": "dtt-Latn-ML",
         "dtt-Latn": "dtt-Latn-ML",
         "dtt-ML": "dtt-Latn-ML",
@@ -5708,21 +5694,18 @@
         "dub": "dub-Gujr-IN",
         "dub-Gujr": "dub-Gujr-IN",
         "dub-IN": "dub-Gujr-IN",
-        "duc": "duc-Latn-ZZ",
-        "duc-Latn": "duc-Latn-ZZ",
-        "duc-ZZ": "duc-Latn-ZZ",
-        "dud": "dud-Latn-ZZ",
-        "dud-Latn": "dud-Latn-ZZ",
-        "dud-ZZ": "dud-Latn-ZZ",
+        "duc": "duc-Latn-PG",
+        "duc-Latn": "duc-Latn-PG",
+        "duc-PG": "duc-Latn-PG",
         "due": "due-Latn-PH",
         "due-Latn": "due-Latn-PH",
         "due-PH": "due-Latn-PH",
         "duf": "duf-Latn-NC",
         "duf-Latn": "duf-Latn-NC",
         "duf-NC": "duf-Latn-NC",
-        "dug": "dug-Latn-ZZ",
-        "dug-Latn": "dug-Latn-ZZ",
-        "dug-ZZ": "dug-Latn-ZZ",
+        "dug": "dug-Latn-KE",
+        "dug-KE": "dug-Latn-KE",
+        "dug-Latn": "dug-Latn-KE",
         "duh": "duh-Deva-IN",
         "duh-Deva": "duh-Deva-IN",
         "duh-Gujr": "duh-Gujr-IN",
@@ -5778,9 +5761,9 @@
         "dv": "dv-Thaa-MV",
         "dv-MV": "dv-Thaa-MV",
         "dv-Thaa": "dv-Thaa-MV",
-        "dva": "dva-Latn-ZZ",
-        "dva-Latn": "dva-Latn-ZZ",
-        "dva-ZZ": "dva-Latn-ZZ",
+        "dva": "dva-Latn-PG",
+        "dva-Latn": "dva-Latn-PG",
+        "dva-PG": "dva-Latn-PG",
         "dwa": "dwa-Latn-NG",
         "dwa-Latn": "dwa-Latn-NG",
         "dwa-NG": "dwa-Latn-NG",
@@ -5797,9 +5780,9 @@
         "dwu": "dwu-Latn-AU",
         "dwu-AU": "dwu-Latn-AU",
         "dwu-Latn": "dwu-Latn-AU",
-        "dww": "dww-Latn-ZZ",
-        "dww-Latn": "dww-Latn-ZZ",
-        "dww-ZZ": "dww-Latn-ZZ",
+        "dww": "dww-Latn-PG",
+        "dww-Latn": "dww-Latn-PG",
+        "dww-PG": "dww-Latn-PG",
         "dwy": "dwy-Latn-AU",
         "dwy-AU": "dwy-Latn-AU",
         "dwy-Latn": "dwy-Latn-AU",
@@ -5845,9 +5828,9 @@
         "dze": "dze-Latn-AU",
         "dze-AU": "dze-Latn-AU",
         "dze-Latn": "dze-Latn-AU",
-        "dzg": "dzg-Latn-ZZ",
-        "dzg-Latn": "dzg-Latn-ZZ",
-        "dzg-ZZ": "dzg-Latn-ZZ",
+        "dzg": "dzg-Latn-TD",
+        "dzg-Latn": "dzg-Latn-TD",
+        "dzg-TD": "dzg-Latn-TD",
         "dzl": "dzl-Tibt-BT",
         "dzl-BT": "dzl-Tibt-BT",
         "dzl-Tibt": "dzl-Tibt-BT",
@@ -5923,9 +5906,9 @@
         "eja": "eja-Latn-GW",
         "eja-GW": "eja-Latn-GW",
         "eja-Latn": "eja-Latn-GW",
-        "eka": "eka-Latn-ZZ",
-        "eka-Latn": "eka-Latn-ZZ",
-        "eka-ZZ": "eka-Latn-ZZ",
+        "eka": "eka-Latn-NG",
+        "eka-Latn": "eka-Latn-NG",
+        "eka-NG": "eka-Latn-NG",
         "eke": "eke-Latn-NG",
         "eke-Latn": "eke-Latn-NG",
         "eke-NG": "eke-Latn-NG",
@@ -5973,9 +5956,9 @@
         "elu": "elu-Latn-PG",
         "elu-Latn": "elu-Latn-PG",
         "elu-PG": "elu-Latn-PG",
-        "ema": "ema-Latn-ZZ",
-        "ema-Latn": "ema-Latn-ZZ",
-        "ema-ZZ": "ema-Latn-ZZ",
+        "ema": "ema-Latn-NG",
+        "ema-Latn": "ema-Latn-NG",
+        "ema-NG": "ema-Latn-NG",
         "emb": "emb-Latn-ID",
         "emb-ID": "emb-Latn-ID",
         "emb-Latn": "emb-Latn-ID",
@@ -5985,9 +5968,9 @@
         "emg": "emg-Deva-NP",
         "emg-Deva": "emg-Deva-NP",
         "emg-NP": "emg-Deva-NP",
-        "emi": "emi-Latn-ZZ",
-        "emi-Latn": "emi-Latn-ZZ",
-        "emi-ZZ": "emi-Latn-ZZ",
+        "emi": "emi-Latn-PG",
+        "emi-Latn": "emi-Latn-PG",
+        "emi-PG": "emi-Latn-PG",
         "emm": "emm-Latn-MX",
         "emm-Latn": "emm-Latn-MX",
         "emm-MX": "emm-Latn-MX",
@@ -6014,20 +5997,25 @@
         "emz-CM": "emz-Latn-CM",
         "emz-Latn": "emz-Latn-CM",
         "en": "en-Latn-US",
+        "en-AC": "en-Latn-AC",
         "en-AG": "en-Latn-AG",
         "en-AI": "en-Latn-AI",
         "en-AM": "en-Latn-AM",
+        "en-AQ": "en-Latn-AQ",
         "en-AU": "en-Latn-AU",
         "en-AZ": "en-Latn-AZ",
         "en-BB": "en-Latn-BB",
         "en-BM": "en-Latn-BM",
         "en-BS": "en-Latn-BS",
+        "en-BV": "en-Latn-BV",
         "en-BW": "en-Latn-BW",
         "en-BZ": "en-Latn-BZ",
         "en-CA": "en-Latn-CA",
         "en-CC": "en-Latn-CC",
         "en-CK": "en-Latn-CK",
         "en-CN": "en-Latn-CN",
+        "en-CP": "en-Latn-CP",
+        "en-CQ": "en-Latn-CQ",
         "en-CX": "en-Latn-CX",
         "en-CY": "en-Latn-CY",
         "en-DG": "en-Latn-DG",
@@ -6078,6 +6066,7 @@
         "en-NA": "en-Latn-NA",
         "en-NF": "en-Latn-NF",
         "en-NG": "en-Latn-NG",
+        "en-NR": "en-Latn-NR",
         "en-NU": "en-Latn-NU",
         "en-NZ": "en-Latn-NZ",
         "en-PG": "en-Latn-PG",
@@ -6094,7 +6083,9 @@
         "en-SL": "en-Latn-SL",
         "en-SS": "en-Latn-SS",
         "en-SX": "en-Latn-SX",
+        "en-SZ": "en-Latn-SZ",
         "en-Shaw": "en-Shaw-GB",
+        "en-TA": "en-Latn-TA",
         "en-TC": "en-Latn-TC",
         "en-TK": "en-Latn-TK",
         "en-TT": "en-Latn-TT",
@@ -6133,15 +6124,15 @@
         "enm": "enm-Latn-GB",
         "enm-GB": "enm-Latn-GB",
         "enm-Latn": "enm-Latn-GB",
-        "enn": "enn-Latn-ZZ",
-        "enn-Latn": "enn-Latn-ZZ",
-        "enn-ZZ": "enn-Latn-ZZ",
+        "enn": "enn-Latn-NG",
+        "enn-Latn": "enn-Latn-NG",
+        "enn-NG": "enn-Latn-NG",
         "eno": "eno-Latn-ID",
         "eno-ID": "eno-Latn-ID",
         "eno-Latn": "eno-Latn-ID",
-        "enq": "enq-Latn-ZZ",
-        "enq-Latn": "enq-Latn-ZZ",
-        "enq-ZZ": "enq-Latn-ZZ",
+        "enq": "enq-Latn-PG",
+        "enq-Latn": "enq-Latn-PG",
+        "enq-PG": "enq-Latn-PG",
         "enr": "enr-Latn-ID",
         "enr-ID": "enr-Latn-ID",
         "enr-Latn": "enr-Latn-ID",
@@ -6172,9 +6163,9 @@
         "erh": "erh-Latn-NG",
         "erh-Latn": "erh-Latn-NG",
         "erh-NG": "erh-Latn-NG",
-        "eri": "eri-Latn-ZZ",
-        "eri-Latn": "eri-Latn-ZZ",
-        "eri-ZZ": "eri-Latn-ZZ",
+        "eri": "eri-Latn-PG",
+        "eri-Latn": "eri-Latn-PG",
+        "eri-PG": "eri-Latn-PG",
         "erk": "erk-Latn-VU",
         "erk-Latn": "erk-Latn-VU",
         "erk-VU": "erk-Latn-VU",
@@ -6253,21 +6244,21 @@
         "eto": "eto-Latn-CM",
         "eto-CM": "eto-Latn-CM",
         "eto-Latn": "eto-Latn-CM",
-        "etr": "etr-Latn-ZZ",
-        "etr-Latn": "etr-Latn-ZZ",
-        "etr-ZZ": "etr-Latn-ZZ",
+        "etr": "etr-Latn-PG",
+        "etr-Latn": "etr-Latn-PG",
+        "etr-PG": "etr-Latn-PG",
         "ets": "ets-Latn-NG",
         "ets-Latn": "ets-Latn-NG",
         "ets-NG": "ets-Latn-NG",
         "ett": "ett-Ital-IT",
         "ett-IT": "ett-Ital-IT",
         "ett-Ital": "ett-Ital-IT",
-        "etu": "etu-Latn-ZZ",
-        "etu-Latn": "etu-Latn-ZZ",
-        "etu-ZZ": "etu-Latn-ZZ",
-        "etx": "etx-Latn-ZZ",
-        "etx-Latn": "etx-Latn-ZZ",
-        "etx-ZZ": "etx-Latn-ZZ",
+        "etu": "etu-Latn-NG",
+        "etu-Latn": "etu-Latn-NG",
+        "etu-NG": "etu-Latn-NG",
+        "etx": "etx-Latn-NG",
+        "etx-Latn": "etx-Latn-NG",
+        "etx-NG": "etx-Latn-NG",
         "etz": "etz-Latn-ID",
         "etz-ID": "etz-Latn-ID",
         "etz-Latn": "etz-Latn-ID",
@@ -6297,9 +6288,9 @@
         "eyo": "eyo-Latn-KE",
         "eyo-KE": "eyo-Latn-KE",
         "eyo-Latn": "eyo-Latn-KE",
-        "eza": "eza-Latn-ZZ",
-        "eza-Latn": "eza-Latn-ZZ",
-        "eza-ZZ": "eza-Latn-ZZ",
+        "eza": "eza-Latn-NG",
+        "eza-Latn": "eza-Latn-NG",
+        "eza-NG": "eza-Latn-NG",
         "eze": "eze-Latn-NG",
         "eze-Latn": "eze-Latn-NG",
         "eze-NG": "eze-Latn-NG",
@@ -6308,27 +6299,27 @@
         "fa-Arab": "fa-Arab-IR",
         "fa-Aran": "fa-Aran-IR",
         "fa-IR": "fa-Arab-IR",
-        "faa": "faa-Latn-ZZ",
-        "faa-Latn": "faa-Latn-ZZ",
-        "faa-ZZ": "faa-Latn-ZZ",
-        "fab": "fab-Latn-ZZ",
-        "fab-Latn": "fab-Latn-ZZ",
-        "fab-ZZ": "fab-Latn-ZZ",
+        "faa": "faa-Latn-PG",
+        "faa-Latn": "faa-Latn-PG",
+        "faa-PG": "faa-Latn-PG",
+        "fab": "fab-Latn-GQ",
+        "fab-GQ": "fab-Latn-GQ",
+        "fab-Latn": "fab-Latn-GQ",
         "fad": "fad-Latn-PG",
         "fad-Latn": "fad-Latn-PG",
         "fad-PG": "fad-Latn-PG",
         "faf": "faf-Latn-SB",
         "faf-Latn": "faf-Latn-SB",
         "faf-SB": "faf-Latn-SB",
-        "fag": "fag-Latn-ZZ",
-        "fag-Latn": "fag-Latn-ZZ",
-        "fag-ZZ": "fag-Latn-ZZ",
+        "fag": "fag-Latn-PG",
+        "fag-Latn": "fag-Latn-PG",
+        "fag-PG": "fag-Latn-PG",
         "fah": "fah-Latn-NG",
         "fah-Latn": "fah-Latn-NG",
         "fah-NG": "fah-Latn-NG",
-        "fai": "fai-Latn-ZZ",
-        "fai-Latn": "fai-Latn-ZZ",
-        "fai-ZZ": "fai-Latn-ZZ",
+        "fai": "fai-Latn-PG",
+        "fai-Latn": "fai-Latn-PG",
+        "fai-PG": "fai-Latn-PG",
         "faj": "faj-Latn-PG",
         "faj-Latn": "faj-Latn-PG",
         "faj-PG": "faj-Latn-PG",
@@ -6372,9 +6363,9 @@
         "ff-Adlm": "ff-Adlm-GN",
         "ff-Latn": "ff-Latn-SN",
         "ff-SN": "ff-Latn-SN",
-        "ffi": "ffi-Latn-ZZ",
-        "ffi-Latn": "ffi-Latn-ZZ",
-        "ffi-ZZ": "ffi-Latn-ZZ",
+        "ffi": "ffi-Latn-PG",
+        "ffi-Latn": "ffi-Latn-PG",
+        "ffi-PG": "ffi-Latn-PG",
         "ffm": "ffm-Latn-ML",
         "ffm-Latn": "ffm-Latn-ML",
         "ffm-ML": "ffm-Latn-ML",
@@ -6432,15 +6423,15 @@
         "fln": "fln-Latn-AU",
         "fln-AU": "fln-Latn-AU",
         "fln-Latn": "fln-Latn-AU",
-        "flr": "flr-Latn-ZZ",
-        "flr-Latn": "flr-Latn-ZZ",
-        "flr-ZZ": "flr-Latn-ZZ",
+        "flr": "flr-Latn-CD",
+        "flr-CD": "flr-Latn-CD",
+        "flr-Latn": "flr-Latn-CD",
         "fly": "fly-Latn-ZA",
         "fly-Latn": "fly-Latn-ZA",
         "fly-ZA": "fly-Latn-ZA",
-        "fmp": "fmp-Latn-ZZ",
-        "fmp-Latn": "fmp-Latn-ZZ",
-        "fmp-ZZ": "fmp-Latn-ZZ",
+        "fmp": "fmp-Latn-CM",
+        "fmp-CM": "fmp-Latn-CM",
+        "fmp-Latn": "fmp-Latn-CM",
         "fmu": "fmu-Deva-IN",
         "fmu-Deva": "fmu-Deva-IN",
         "fmu-IN": "fmu-Deva-IN",
@@ -6456,9 +6447,9 @@
         "fo": "fo-Latn-FO",
         "fo-FO": "fo-Latn-FO",
         "fo-Latn": "fo-Latn-FO",
-        "fod": "fod-Latn-ZZ",
-        "fod-Latn": "fod-Latn-ZZ",
-        "fod-ZZ": "fod-Latn-ZZ",
+        "fod": "fod-Latn-BJ",
+        "fod-BJ": "fod-Latn-BJ",
+        "fod-Latn": "fod-Latn-BJ",
         "foi": "foi-Latn-PG",
         "foi-Latn": "foi-Latn-PG",
         "foi-PG": "foi-Latn-PG",
@@ -6468,18 +6459,18 @@
         "fon": "fon-Latn-BJ",
         "fon-BJ": "fon-Latn-BJ",
         "fon-Latn": "fon-Latn-BJ",
-        "for": "for-Latn-ZZ",
-        "for-Latn": "for-Latn-ZZ",
-        "for-ZZ": "for-Latn-ZZ",
+        "for": "for-Latn-PG",
+        "for-Latn": "for-Latn-PG",
+        "for-PG": "for-Latn-PG",
         "fos": "fos-Latn-TW",
         "fos-Latn": "fos-Latn-TW",
         "fos-TW": "fos-Latn-TW",
-        "fpe": "fpe-Latn-ZZ",
-        "fpe-Latn": "fpe-Latn-ZZ",
-        "fpe-ZZ": "fpe-Latn-ZZ",
-        "fqs": "fqs-Latn-ZZ",
-        "fqs-Latn": "fqs-Latn-ZZ",
-        "fqs-ZZ": "fqs-Latn-ZZ",
+        "fpe": "fpe-Latn-GQ",
+        "fpe-GQ": "fpe-Latn-GQ",
+        "fpe-Latn": "fpe-Latn-GQ",
+        "fqs": "fqs-Latn-PG",
+        "fqs-Latn": "fqs-Latn-PG",
+        "fqs-PG": "fqs-Latn-PG",
         "fr": "fr-Latn-FR",
         "fr-BE": "fr-Latn-BE",
         "fr-BF": "fr-Latn-BF",
@@ -6559,15 +6550,17 @@
         "fud": "fud-Latn-WF",
         "fud-Latn": "fud-Latn-WF",
         "fud-WF": "fud-Latn-WF",
-        "fue": "fue-Latn-ZZ",
-        "fue-Latn": "fue-Latn-ZZ",
-        "fue-ZZ": "fue-Latn-ZZ",
+        "fue": "fue-Latn-BJ",
+        "fue-BJ": "fue-Latn-BJ",
+        "fue-Latn": "fue-Latn-BJ",
         "fuf": "fuf-Latn-GN",
         "fuf-GN": "fuf-Latn-GN",
         "fuf-Latn": "fuf-Latn-GN",
-        "fuh": "fuh-Latn-ZZ",
-        "fuh-Latn": "fuh-Latn-ZZ",
-        "fuh-ZZ": "fuh-Latn-ZZ",
+        "fuh": "fuh-Latn-NE",
+        "fuh-Arab": "fuh-Arab-NE",
+        "fuh-BF": "fuh-Latn-BF",
+        "fuh-Latn": "fuh-Latn-NE",
+        "fuh-NE": "fuh-Latn-NE",
         "fui": "fui-Latn-TD",
         "fui-Latn": "fui-Latn-TD",
         "fui-TD": "fui-Latn-TD",
@@ -6592,9 +6585,9 @@
         "fuv": "fuv-Latn-NG",
         "fuv-Latn": "fuv-Latn-NG",
         "fuv-NG": "fuv-Latn-NG",
-        "fuy": "fuy-Latn-ZZ",
-        "fuy-Latn": "fuy-Latn-ZZ",
-        "fuy-ZZ": "fuy-Latn-ZZ",
+        "fuy": "fuy-Latn-PG",
+        "fuy-Latn": "fuy-Latn-PG",
+        "fuy-PG": "fuy-Latn-PG",
         "fvr": "fvr-Latn-SD",
         "fvr-Latn": "fvr-Latn-SD",
         "fvr-SD": "fvr-Latn-SD",
@@ -6626,30 +6619,30 @@
         "gae": "gae-Latn-VE",
         "gae-Latn": "gae-Latn-VE",
         "gae-VE": "gae-Latn-VE",
-        "gaf": "gaf-Latn-ZZ",
-        "gaf-Latn": "gaf-Latn-ZZ",
-        "gaf-ZZ": "gaf-Latn-ZZ",
+        "gaf": "gaf-Latn-PG",
+        "gaf-Latn": "gaf-Latn-PG",
+        "gaf-PG": "gaf-Latn-PG",
         "gag": "gag-Latn-MD",
         "gag-Latn": "gag-Latn-MD",
         "gag-MD": "gag-Latn-MD",
-        "gah": "gah-Latn-ZZ",
-        "gah-Latn": "gah-Latn-ZZ",
-        "gah-ZZ": "gah-Latn-ZZ",
+        "gah": "gah-Latn-PG",
+        "gah-Latn": "gah-Latn-PG",
+        "gah-PG": "gah-Latn-PG",
         "gai": "gai-Latn-PG",
         "gai-Latn": "gai-Latn-PG",
         "gai-PG": "gai-Latn-PG",
-        "gaj": "gaj-Latn-ZZ",
-        "gaj-Latn": "gaj-Latn-ZZ",
-        "gaj-ZZ": "gaj-Latn-ZZ",
+        "gaj": "gaj-Latn-PG",
+        "gaj-Latn": "gaj-Latn-PG",
+        "gaj-PG": "gaj-Latn-PG",
         "gak": "gak-Latn-ID",
         "gak-ID": "gak-Latn-ID",
         "gak-Latn": "gak-Latn-ID",
         "gal": "gal-Latn-TL",
         "gal-Latn": "gal-Latn-TL",
         "gal-TL": "gal-Latn-TL",
-        "gam": "gam-Latn-ZZ",
-        "gam-Latn": "gam-Latn-ZZ",
-        "gam-ZZ": "gam-Latn-ZZ",
+        "gam": "gam-Latn-PG",
+        "gam-Latn": "gam-Latn-PG",
+        "gam-PG": "gam-Latn-PG",
         "gan": "gan-Hans-CN",
         "gan-CN": "gan-Hans-CN",
         "gan-Hans": "gan-Hans-CN",
@@ -6674,9 +6667,9 @@
         "gau": "gau-Telu-IN",
         "gau-IN": "gau-Telu-IN",
         "gau-Telu": "gau-Telu-IN",
-        "gaw": "gaw-Latn-ZZ",
-        "gaw-Latn": "gaw-Latn-ZZ",
-        "gaw-ZZ": "gaw-Latn-ZZ",
+        "gaw": "gaw-Latn-PG",
+        "gaw-Latn": "gaw-Latn-PG",
+        "gaw-PG": "gaw-Latn-PG",
         "gax": "gax-Latn-ET",
         "gax-ET": "gax-Latn-ET",
         "gax-Ethi": "gax-Ethi-ET",
@@ -6684,9 +6677,10 @@
         "gay": "gay-Latn-ID",
         "gay-ID": "gay-Latn-ID",
         "gay-Latn": "gay-Latn-ID",
-        "gba": "gba-Latn-ZZ",
-        "gba-Latn": "gba-Latn-ZZ",
-        "gba-ZZ": "gba-Latn-ZZ",
+        "gba": "gba-Latn-CF",
+        "gba-Arab": "gba-Arab-CF",
+        "gba-CF": "gba-Latn-CF",
+        "gba-Latn": "gba-Latn-CF",
         "gbb": "gbb-Latn-AU",
         "gbb-AU": "gbb-Latn-AU",
         "gbb-Latn": "gbb-Latn-AU",
@@ -6696,9 +6690,9 @@
         "gbe": "gbe-Latn-PG",
         "gbe-Latn": "gbe-Latn-PG",
         "gbe-PG": "gbe-Latn-PG",
-        "gbf": "gbf-Latn-ZZ",
-        "gbf-Latn": "gbf-Latn-ZZ",
-        "gbf-ZZ": "gbf-Latn-ZZ",
+        "gbf": "gbf-Latn-PG",
+        "gbf-Latn": "gbf-Latn-PG",
+        "gbf-PG": "gbf-Latn-PG",
         "gbg": "gbg-Latn-CF",
         "gbg-CF": "gbg-Latn-CF",
         "gbg-Latn": "gbg-Latn-CF",
@@ -6749,9 +6743,9 @@
         "gbx": "gbx-Latn-BJ",
         "gbx-BJ": "gbx-Latn-BJ",
         "gbx-Latn": "gbx-Latn-BJ",
-        "gby": "gby-Latn-ZZ",
-        "gby-Latn": "gby-Latn-ZZ",
-        "gby-ZZ": "gby-Latn-ZZ",
+        "gby": "gby-Latn-NG",
+        "gby-Latn": "gby-Latn-NG",
+        "gby-NG": "gby-Latn-NG",
         "gbz": "gbz-Arab-IR",
         "gbz-Arab": "gbz-Arab-IR",
         "gbz-IR": "gbz-Arab-IR",
@@ -6789,9 +6783,9 @@
         "gdd": "gdd-Latn-PG",
         "gdd-Latn": "gdd-Latn-PG",
         "gdd-PG": "gdd-Latn-PG",
-        "gde": "gde-Latn-ZZ",
-        "gde-Latn": "gde-Latn-ZZ",
-        "gde-ZZ": "gde-Latn-ZZ",
+        "gde": "gde-Latn-NG",
+        "gde-Latn": "gde-Latn-NG",
+        "gde-NG": "gde-Latn-NG",
         "gdf": "gdf-Latn-NG",
         "gdf-Latn": "gdf-Latn-NG",
         "gdf-NG": "gdf-Latn-NG",
@@ -6817,18 +6811,18 @@
         "gdm": "gdm-Latn-TD",
         "gdm-Latn": "gdm-Latn-TD",
         "gdm-TD": "gdm-Latn-TD",
-        "gdn": "gdn-Latn-ZZ",
-        "gdn-Latn": "gdn-Latn-ZZ",
-        "gdn-ZZ": "gdn-Latn-ZZ",
+        "gdn": "gdn-Latn-PG",
+        "gdn-Latn": "gdn-Latn-PG",
+        "gdn-PG": "gdn-Latn-PG",
         "gdo": "gdo-Cyrl-RU",
         "gdo-Cyrl": "gdo-Cyrl-RU",
         "gdo-RU": "gdo-Cyrl-RU",
         "gdq": "gdq-Latn-YE",
         "gdq-Latn": "gdq-Latn-YE",
         "gdq-YE": "gdq-Latn-YE",
-        "gdr": "gdr-Latn-ZZ",
-        "gdr-Latn": "gdr-Latn-ZZ",
-        "gdr-ZZ": "gdr-Latn-ZZ",
+        "gdr": "gdr-Latn-PG",
+        "gdr-Latn": "gdr-Latn-PG",
+        "gdr-PG": "gdr-Latn-PG",
         "gdt": "gdt-Latn-AU",
         "gdt-AU": "gdt-Latn-AU",
         "gdt-Latn": "gdt-Latn-AU",
@@ -6841,9 +6835,9 @@
         "gea": "gea-Latn-NG",
         "gea-Latn": "gea-Latn-NG",
         "gea-NG": "gea-Latn-NG",
-        "geb": "geb-Latn-ZZ",
-        "geb-Latn": "geb-Latn-ZZ",
-        "geb-ZZ": "geb-Latn-ZZ",
+        "geb": "geb-Latn-PG",
+        "geb-Latn": "geb-Latn-PG",
+        "geb-PG": "geb-Latn-PG",
         "gec": "gec-Latn-LR",
         "gec-LR": "gec-Latn-LR",
         "gec-Latn": "gec-Latn-LR",
@@ -6862,15 +6856,15 @@
         "gei": "gei-Latn-ID",
         "gei-ID": "gei-Latn-ID",
         "gei-Latn": "gei-Latn-ID",
-        "gej": "gej-Latn-ZZ",
-        "gej-Latn": "gej-Latn-ZZ",
-        "gej-ZZ": "gej-Latn-ZZ",
+        "gej": "gej-Latn-TG",
+        "gej-Latn": "gej-Latn-TG",
+        "gej-TG": "gej-Latn-TG",
         "gek": "gek-Latn-NG",
         "gek-Latn": "gek-Latn-NG",
         "gek-NG": "gek-Latn-NG",
-        "gel": "gel-Latn-ZZ",
-        "gel-Latn": "gel-Latn-ZZ",
-        "gel-ZZ": "gel-Latn-ZZ",
+        "gel": "gel-Latn-NG",
+        "gel-Latn": "gel-Latn-NG",
+        "gel-NG": "gel-Latn-NG",
         "geq": "geq-Latn-CF",
         "geq-CF": "geq-Latn-CF",
         "geq-Latn": "geq-Latn-CF",
@@ -6892,9 +6886,9 @@
         "gez": "gez-Ethi-ET",
         "gez-ET": "gez-Ethi-ET",
         "gez-Ethi": "gez-Ethi-ET",
-        "gfk": "gfk-Latn-ZZ",
-        "gfk-Latn": "gfk-Latn-ZZ",
-        "gfk-ZZ": "gfk-Latn-ZZ",
+        "gfk": "gfk-Latn-PG",
+        "gfk-Latn": "gfk-Latn-PG",
+        "gfk-PG": "gfk-Latn-PG",
         "gga": "gga-Latn-SB",
         "gga-Latn": "gga-Latn-SB",
         "gga-SB": "gga-Latn-SB",
@@ -6916,9 +6910,6 @@
         "ggl": "ggl-Latn-PG",
         "ggl-Latn": "ggl-Latn-PG",
         "ggl-PG": "ggl-Latn-PG",
-        "ggn": "ggn-Deva-NP",
-        "ggn-Deva": "ggn-Deva-NP",
-        "ggn-NP": "ggn-Deva-NP",
         "ggt": "ggt-Latn-PG",
         "ggt-Latn": "ggt-Latn-PG",
         "ggt-PG": "ggt-Latn-PG",
@@ -6948,9 +6939,9 @@
         "ghr": "ghr-Arab-PK",
         "ghr-Arab": "ghr-Arab-PK",
         "ghr-PK": "ghr-Arab-PK",
-        "ghs": "ghs-Latn-ZZ",
-        "ghs-Latn": "ghs-Latn-ZZ",
-        "ghs-ZZ": "ghs-Latn-ZZ",
+        "ghs": "ghs-Latn-PG",
+        "ghs-Latn": "ghs-Latn-PG",
+        "ghs-PG": "ghs-Latn-PG",
         "ght": "ght-Tibt-NP",
         "ght-NP": "ght-Tibt-NP",
         "ght-Tibt": "ght-Tibt-NP",
@@ -6978,9 +6969,9 @@
         "gil": "gil-Latn-KI",
         "gil-KI": "gil-Latn-KI",
         "gil-Latn": "gil-Latn-KI",
-        "gim": "gim-Latn-ZZ",
-        "gim-Latn": "gim-Latn-ZZ",
-        "gim-ZZ": "gim-Latn-ZZ",
+        "gim": "gim-Latn-PG",
+        "gim-Latn": "gim-Latn-PG",
+        "gim-PG": "gim-Latn-PG",
         "gin": "gin-Cyrl-RU",
         "gin-Cyrl": "gin-Cyrl-RU",
         "gin-RU": "gin-Cyrl-RU",
@@ -7014,9 +7005,10 @@
         "gjm": "gjm-Latn-AU",
         "gjm-AU": "gjm-Latn-AU",
         "gjm-Latn": "gjm-Latn-AU",
-        "gjn": "gjn-Latn-ZZ",
-        "gjn-Latn": "gjn-Latn-ZZ",
-        "gjn-ZZ": "gjn-Latn-ZZ",
+        "gjn": "gjn-Latn-GH",
+        "gjn-Arab": "gjn-Arab-GH",
+        "gjn-GH": "gjn-Latn-GH",
+        "gjn-Latn": "gjn-Latn-GH",
         "gjr": "gjr-Latn-AU",
         "gjr-AU": "gjr-Latn-AU",
         "gjr-Latn": "gjr-Latn-AU",
@@ -7032,15 +7024,15 @@
         "gke": "gke-Latn-CM",
         "gke-CM": "gke-Latn-CM",
         "gke-Latn": "gke-Latn-CM",
-        "gkn": "gkn-Latn-ZZ",
-        "gkn-Latn": "gkn-Latn-ZZ",
-        "gkn-ZZ": "gkn-Latn-ZZ",
+        "gkn": "gkn-Latn-NG",
+        "gkn-Latn": "gkn-Latn-NG",
+        "gkn-NG": "gkn-Latn-NG",
         "gko": "gko-Latn-AU",
         "gko-AU": "gko-Latn-AU",
         "gko-Latn": "gko-Latn-AU",
-        "gkp": "gkp-Latn-ZZ",
-        "gkp-Latn": "gkp-Latn-ZZ",
-        "gkp-ZZ": "gkp-Latn-ZZ",
+        "gkp": "gkp-Latn-GN",
+        "gkp-GN": "gkp-Latn-GN",
+        "gkp-Latn": "gkp-Latn-GN",
         "gku": "gku-Latn-ZA",
         "gku-Latn": "gku-Latn-ZA",
         "gku-ZA": "gku-Latn-ZA",
@@ -7095,9 +7087,9 @@
         "gmh": "gmh-Latn-DE",
         "gmh-DE": "gmh-Latn-DE",
         "gmh-Latn": "gmh-Latn-DE",
-        "gmm": "gmm-Latn-ZZ",
-        "gmm-Latn": "gmm-Latn-ZZ",
-        "gmm-ZZ": "gmm-Latn-ZZ",
+        "gmm": "gmm-Latn-CM",
+        "gmm-CM": "gmm-Latn-CM",
+        "gmm-Latn": "gmm-Latn-CM",
         "gmn": "gmn-Latn-CM",
         "gmn-CM": "gmn-Latn-CM",
         "gmn-Latn": "gmn-Latn-CM",
@@ -7107,9 +7099,10 @@
         "gmu": "gmu-Latn-PG",
         "gmu-Latn": "gmu-Latn-PG",
         "gmu-PG": "gmu-Latn-PG",
-        "gmv": "gmv-Ethi-ZZ",
-        "gmv-Ethi": "gmv-Ethi-ZZ",
-        "gmv-ZZ": "gmv-Ethi-ZZ",
+        "gmv": "gmv-Ethi-ET",
+        "gmv-ET": "gmv-Ethi-ET",
+        "gmv-Ethi": "gmv-Ethi-ET",
+        "gmv-Latn": "gmv-Latn-ET",
         "gmx": "gmx-Latn-TZ",
         "gmx-Latn": "gmx-Latn-TZ",
         "gmx-TZ": "gmx-Latn-TZ",
@@ -7131,15 +7124,15 @@
         "gnc": "gnc-Latn-ES",
         "gnc-ES": "gnc-Latn-ES",
         "gnc-Latn": "gnc-Latn-ES",
-        "gnd": "gnd-Latn-ZZ",
-        "gnd-Latn": "gnd-Latn-ZZ",
-        "gnd-ZZ": "gnd-Latn-ZZ",
+        "gnd": "gnd-Latn-CM",
+        "gnd-CM": "gnd-Latn-CM",
+        "gnd-Latn": "gnd-Latn-CM",
         "gne": "gne-Latn-NG",
         "gne-Latn": "gne-Latn-NG",
         "gne-NG": "gne-Latn-NG",
-        "gng": "gng-Latn-ZZ",
-        "gng-Latn": "gng-Latn-ZZ",
-        "gng-ZZ": "gng-Latn-ZZ",
+        "gng": "gng-Latn-TG",
+        "gng-Latn": "gng-Latn-TG",
+        "gng-TG": "gng-Latn-TG",
         "gnh": "gnh-Latn-NG",
         "gnh-Latn": "gnh-Latn-NG",
         "gnh-NG": "gnh-Latn-NG",
@@ -7188,24 +7181,25 @@
         "goc": "goc-Latn-PG",
         "goc-Latn": "goc-Latn-PG",
         "goc-PG": "goc-Latn-PG",
-        "god": "god-Latn-ZZ",
-        "god-Latn": "god-Latn-ZZ",
-        "god-ZZ": "god-Latn-ZZ",
+        "god": "god-Latn-CI",
+        "god-CI": "god-Latn-CI",
+        "god-Latn": "god-Latn-CI",
         "goe": "goe-Tibt-BT",
         "goe-BT": "goe-Tibt-BT",
         "goe-Tibt": "goe-Tibt-BT",
-        "gof": "gof-Ethi-ZZ",
-        "gof-Ethi": "gof-Ethi-ZZ",
-        "gof-ZZ": "gof-Ethi-ZZ",
+        "gof": "gof-Ethi-ET",
+        "gof-ET": "gof-Ethi-ET",
+        "gof-Ethi": "gof-Ethi-ET",
+        "gof-Latn": "gof-Latn-ET",
         "gog": "gog-Latn-TZ",
         "gog-Latn": "gog-Latn-TZ",
         "gog-TZ": "gog-Latn-TZ",
         "goh": "goh-Latn-DE",
         "goh-DE": "goh-Latn-DE",
         "goh-Latn": "goh-Latn-DE",
-        "goi": "goi-Latn-ZZ",
-        "goi-Latn": "goi-Latn-ZZ",
-        "goi-ZZ": "goi-Latn-ZZ",
+        "goi": "goi-Latn-PG",
+        "goi-Latn": "goi-Latn-PG",
+        "goi-PG": "goi-Latn-PG",
         "gok": "gok-Deva-IN",
         "gok-Deva": "gok-Deva-IN",
         "gok-IN": "gok-Deva-IN",
@@ -7273,9 +7267,9 @@
         "gra-Deva": "gra-Deva-IN",
         "gra-Gujr": "gra-Gujr-IN",
         "gra-IN": "gra-Deva-IN",
-        "grb": "grb-Latn-ZZ",
-        "grb-Latn": "grb-Latn-ZZ",
-        "grb-ZZ": "grb-Latn-ZZ",
+        "grb": "grb-Latn-LR",
+        "grb-LR": "grb-Latn-LR",
+        "grb-Latn": "grb-Latn-LR",
         "grc": "grc-Cprt-CY",
         "grc-CY": "grc-Cprt-CY",
         "grc-Cprt": "grc-Cprt-CY",
@@ -7314,9 +7308,9 @@
         "grv": "grv-Latn-LR",
         "grv-LR": "grv-Latn-LR",
         "grv-Latn": "grv-Latn-LR",
-        "grw": "grw-Latn-ZZ",
-        "grw-Latn": "grw-Latn-ZZ",
-        "grw-ZZ": "grw-Latn-ZZ",
+        "grw": "grw-Latn-PG",
+        "grw-Latn": "grw-Latn-PG",
+        "grw-PG": "grw-Latn-PG",
         "grx": "grx-Latn-PG",
         "grx-Latn": "grx-Latn-PG",
         "grx-PG": "grx-Latn-PG",
@@ -7360,9 +7354,9 @@
         "guc": "guc-Latn-CO",
         "guc-CO": "guc-Latn-CO",
         "guc-Latn": "guc-Latn-CO",
-        "gud": "gud-Latn-ZZ",
-        "gud-Latn": "gud-Latn-ZZ",
-        "gud-ZZ": "gud-Latn-ZZ",
+        "gud": "gud-Latn-CI",
+        "gud-CI": "gud-Latn-CI",
+        "gud-Latn": "gud-Latn-CI",
         "gue": "gue-Latn-AU",
         "gue-AU": "gue-Latn-AU",
         "gue-Latn": "gue-Latn-AU",
@@ -7406,12 +7400,12 @@
         "guu": "guu-Latn-VE",
         "guu-Latn": "guu-Latn-VE",
         "guu-VE": "guu-Latn-VE",
-        "guw": "guw-Latn-ZZ",
-        "guw-Latn": "guw-Latn-ZZ",
-        "guw-ZZ": "guw-Latn-ZZ",
-        "gux": "gux-Latn-ZZ",
-        "gux-Latn": "gux-Latn-ZZ",
-        "gux-ZZ": "gux-Latn-ZZ",
+        "guw": "guw-Latn-BJ",
+        "guw-BJ": "guw-Latn-BJ",
+        "guw-Latn": "guw-Latn-BJ",
+        "gux": "gux-Latn-BF",
+        "gux-BF": "gux-Latn-BF",
+        "gux-Latn": "gux-Latn-BF",
         "guz": "guz-Latn-KE",
         "guz-KE": "guz-Latn-KE",
         "guz-Latn": "guz-Latn-KE",
@@ -7427,9 +7421,9 @@
         "gve": "gve-Latn-PG",
         "gve-Latn": "gve-Latn-PG",
         "gve-PG": "gve-Latn-PG",
-        "gvf": "gvf-Latn-ZZ",
-        "gvf-Latn": "gvf-Latn-ZZ",
-        "gvf-ZZ": "gvf-Latn-ZZ",
+        "gvf": "gvf-Latn-PG",
+        "gvf-Latn": "gvf-Latn-PG",
+        "gvf-PG": "gvf-Latn-PG",
         "gvj": "gvj-Latn-BR",
         "gvj-BR": "gvj-Latn-BR",
         "gvj-Latn": "gvj-Latn-BR",
@@ -7451,9 +7445,9 @@
         "gvr": "gvr-Deva-NP",
         "gvr-Deva": "gvr-Deva-NP",
         "gvr-NP": "gvr-Deva-NP",
-        "gvs": "gvs-Latn-ZZ",
-        "gvs-Latn": "gvs-Latn-ZZ",
-        "gvs-ZZ": "gvs-Latn-ZZ",
+        "gvs": "gvs-Latn-PG",
+        "gvs-Latn": "gvs-Latn-PG",
+        "gvs-PG": "gvs-Latn-PG",
         "gvy": "gvy-Latn-AU",
         "gvy-AU": "gvy-Latn-AU",
         "gvy-Latn": "gvy-Latn-AU",
@@ -7463,9 +7457,9 @@
         "gwb": "gwb-Latn-NG",
         "gwb-Latn": "gwb-Latn-NG",
         "gwb-NG": "gwb-Latn-NG",
-        "gwc": "gwc-Arab-ZZ",
-        "gwc-Arab": "gwc-Arab-ZZ",
-        "gwc-ZZ": "gwc-Arab-ZZ",
+        "gwc": "gwc-Arab-PK",
+        "gwc-Arab": "gwc-Arab-PK",
+        "gwc-PK": "gwc-Arab-PK",
         "gwd": "gwd-Latn-ET",
         "gwd-ET": "gwd-Latn-ET",
         "gwd-Latn": "gwd-Latn-ET",
@@ -7493,9 +7487,9 @@
         "gwr": "gwr-Latn-UG",
         "gwr-Latn": "gwr-Latn-UG",
         "gwr-UG": "gwr-Latn-UG",
-        "gwt": "gwt-Arab-ZZ",
-        "gwt-Arab": "gwt-Arab-ZZ",
-        "gwt-ZZ": "gwt-Arab-ZZ",
+        "gwt": "gwt-Arab-AF",
+        "gwt-AF": "gwt-Arab-AF",
+        "gwt-Arab": "gwt-Arab-AF",
         "gwu": "gwu-Latn-AU",
         "gwu-AU": "gwu-Latn-AU",
         "gwu-Latn": "gwu-Latn-AU",
@@ -7523,9 +7517,9 @@
         "gyg": "gyg-Latn-CF",
         "gyg-CF": "gyg-Latn-CF",
         "gyg-Latn": "gyg-Latn-CF",
-        "gyi": "gyi-Latn-ZZ",
-        "gyi-Latn": "gyi-Latn-ZZ",
-        "gyi-ZZ": "gyi-Latn-ZZ",
+        "gyi": "gyi-Latn-CM",
+        "gyi-CM": "gyi-Latn-CM",
+        "gyi-Latn": "gyi-Latn-CM",
         "gyl": "gyl-Latn-ET",
         "gyl-ET": "gyl-Latn-ET",
         "gyl-Ethi": "gyl-Ethi-ET",
@@ -7575,9 +7569,9 @@
         "hae": "hae-Latn-ET",
         "hae-ET": "hae-Latn-ET",
         "hae-Latn": "hae-Latn-ET",
-        "hag": "hag-Latn-ZZ",
-        "hag-Latn": "hag-Latn-ZZ",
-        "hag-ZZ": "hag-Latn-ZZ",
+        "hag": "hag-Latn-GH",
+        "hag-GH": "hag-Latn-GH",
+        "hag-Latn": "hag-Latn-GH",
         "hah": "hah-Latn-PG",
         "hah-Latn": "hah-Latn-PG",
         "hah-PG": "hah-Latn-PG",
@@ -7594,9 +7588,9 @@
         "hal": "hal-Latn-VN",
         "hal-Latn": "hal-Latn-VN",
         "hal-VN": "hal-Latn-VN",
-        "ham": "ham-Latn-ZZ",
-        "ham-Latn": "ham-Latn-ZZ",
-        "ham-ZZ": "ham-Latn-ZZ",
+        "ham": "ham-Latn-PG",
+        "ham-Latn": "ham-Latn-PG",
+        "ham-PG": "ham-Latn-PG",
         "han": "han-Latn-TZ",
         "han-Latn": "han-Latn-TZ",
         "han-TZ": "han-Latn-TZ",
@@ -7635,9 +7629,9 @@
         "hba": "hba-Latn-CD",
         "hba-CD": "hba-Latn-CD",
         "hba-Latn": "hba-Latn-CD",
-        "hbb": "hbb-Latn-ZZ",
-        "hbb-Latn": "hbb-Latn-ZZ",
-        "hbb-ZZ": "hbb-Latn-ZZ",
+        "hbb": "hbb-Latn-NG",
+        "hbb-Latn": "hbb-Latn-NG",
+        "hbb-NG": "hbb-Latn-NG",
         "hbn": "hbn-Latn-SD",
         "hbn-Latn": "hbn-Latn-SD",
         "hbn-SD": "hbn-Latn-SD",
@@ -7650,9 +7644,10 @@
         "hch": "hch-Latn-MX",
         "hch-Latn": "hch-Latn-MX",
         "hch-MX": "hch-Latn-MX",
-        "hdy": "hdy-Ethi-ZZ",
-        "hdy-Ethi": "hdy-Ethi-ZZ",
-        "hdy-ZZ": "hdy-Ethi-ZZ",
+        "hdy": "hdy-Ethi-ET",
+        "hdy-ET": "hdy-Ethi-ET",
+        "hdy-Ethi": "hdy-Ethi-ET",
+        "hdy-Latn": "hdy-Latn-ET",
         "he": "he-Hebr-IL",
         "he-Hebr": "he-Hebr-IL",
         "he-IL": "he-Hebr-IL",
@@ -7683,17 +7678,16 @@
         "hhr": "hhr-Latn-SN",
         "hhr-Latn": "hhr-Latn-SN",
         "hhr-SN": "hhr-Latn-SN",
-        "hhy": "hhy-Latn-ZZ",
-        "hhy-Latn": "hhy-Latn-ZZ",
-        "hhy-ZZ": "hhy-Latn-ZZ",
+        "hhy": "hhy-Latn-PG",
+        "hhy-Latn": "hhy-Latn-PG",
+        "hhy-PG": "hhy-Latn-PG",
         "hi": "hi-Deva-IN",
         "hi-Deva": "hi-Deva-IN",
         "hi-IN": "hi-Deva-IN",
-        "hi-Latn": "hi-Latn-IN",
         "hi-XX": "hi-Deva-XX",
-        "hia": "hia-Latn-ZZ",
-        "hia-Latn": "hia-Latn-ZZ",
-        "hia-ZZ": "hia-Latn-ZZ",
+        "hia": "hia-Latn-NG",
+        "hia-Latn": "hia-Latn-NG",
+        "hia-NG": "hia-Latn-NG",
         "hib": "hib-Latn-PE",
         "hib-Latn": "hib-Latn-PE",
         "hib-PE": "hib-Latn-PE",
@@ -7703,12 +7697,12 @@
         "hif": "hif-Latn-FJ",
         "hif-FJ": "hif-Latn-FJ",
         "hif-Latn": "hif-Latn-FJ",
-        "hig": "hig-Latn-ZZ",
-        "hig-Latn": "hig-Latn-ZZ",
-        "hig-ZZ": "hig-Latn-ZZ",
-        "hih": "hih-Latn-ZZ",
-        "hih-Latn": "hih-Latn-ZZ",
-        "hih-ZZ": "hih-Latn-ZZ",
+        "hig": "hig-Latn-NG",
+        "hig-Latn": "hig-Latn-NG",
+        "hig-NG": "hig-Latn-NG",
+        "hih": "hih-Latn-PG",
+        "hih-Latn": "hih-Latn-PG",
+        "hih-PG": "hih-Latn-PG",
         "hii": "hii-Takr-IN",
         "hii-Deva": "hii-Deva-IN",
         "hii-IN": "hii-Takr-IN",
@@ -7754,9 +7748,9 @@
         "hkk": "hkk-Latn-PG",
         "hkk-Latn": "hkk-Latn-PG",
         "hkk-PG": "hkk-Latn-PG",
-        "hla": "hla-Latn-ZZ",
-        "hla-Latn": "hla-Latn-ZZ",
-        "hla-ZZ": "hla-Latn-ZZ",
+        "hla": "hla-Latn-PG",
+        "hla-Latn": "hla-Latn-PG",
+        "hla-PG": "hla-Latn-PG",
         "hlb": "hlb-Deva-IN",
         "hlb-Deva": "hlb-Deva-IN",
         "hlb-IN": "hlb-Deva-IN",
@@ -7804,9 +7798,9 @@
         "hms": "hms-Latn-CN",
         "hms-CN": "hms-Latn-CN",
         "hms-Latn": "hms-Latn-CN",
-        "hmt": "hmt-Latn-ZZ",
-        "hmt-Latn": "hmt-Latn-ZZ",
-        "hmt-ZZ": "hmt-Latn-ZZ",
+        "hmt": "hmt-Latn-PG",
+        "hmt-Latn": "hmt-Latn-PG",
+        "hmt-PG": "hmt-Latn-PG",
         "hmu": "hmu-Latn-ID",
         "hmu-ID": "hmu-Latn-ID",
         "hmu-Latn": "hmu-Latn-ID",
@@ -7905,9 +7899,9 @@
         "hor": "hor-Latn-TD",
         "hor-Latn": "hor-Latn-TD",
         "hor-TD": "hor-Latn-TD",
-        "hot": "hot-Latn-ZZ",
-        "hot-Latn": "hot-Latn-ZZ",
-        "hot-ZZ": "hot-Latn-ZZ",
+        "hot": "hot-Latn-PG",
+        "hot-Latn": "hot-Latn-PG",
+        "hot-PG": "hot-Latn-PG",
         "hov": "hov-Latn-ID",
         "hov-ID": "hov-Latn-ID",
         "hov-Latn": "hov-Latn-ID",
@@ -8013,9 +8007,9 @@
         "huh": "huh-Latn-CL",
         "huh-CL": "huh-Latn-CL",
         "huh-Latn": "huh-Latn-CL",
-        "hui": "hui-Latn-ZZ",
-        "hui-Latn": "hui-Latn-ZZ",
-        "hui-ZZ": "hui-Latn-ZZ",
+        "hui": "hui-Latn-PG",
+        "hui-Latn": "hui-Latn-PG",
+        "hui-PG": "hui-Latn-PG",
         "huk": "huk-Latn-ID",
         "huk-ID": "huk-Latn-ID",
         "huk-Latn": "huk-Latn-ID",
@@ -8099,12 +8093,12 @@
         "iai": "iai-Latn-NC",
         "iai-Latn": "iai-Latn-NC",
         "iai-NC": "iai-Latn-NC",
-        "ian": "ian-Latn-ZZ",
-        "ian-Latn": "ian-Latn-ZZ",
-        "ian-ZZ": "ian-Latn-ZZ",
-        "iar": "iar-Latn-ZZ",
-        "iar-Latn": "iar-Latn-ZZ",
-        "iar-ZZ": "iar-Latn-ZZ",
+        "ian": "ian-Latn-PG",
+        "ian-Latn": "ian-Latn-PG",
+        "ian-PG": "ian-Latn-PG",
+        "iar": "iar-Latn-PG",
+        "iar-Latn": "iar-Latn-PG",
+        "iar-PG": "iar-Latn-PG",
         "iba": "iba-Latn-MY",
         "iba-Latn": "iba-Latn-MY",
         "iba-MY": "iba-Latn-MY",
@@ -8138,15 +8132,15 @@
         "ibu": "ibu-Latn-ID",
         "ibu-ID": "ibu-Latn-ID",
         "ibu-Latn": "ibu-Latn-ID",
-        "iby": "iby-Latn-ZZ",
-        "iby-Latn": "iby-Latn-ZZ",
-        "iby-ZZ": "iby-Latn-ZZ",
-        "ica": "ica-Latn-ZZ",
-        "ica-Latn": "ica-Latn-ZZ",
-        "ica-ZZ": "ica-Latn-ZZ",
-        "ich": "ich-Latn-ZZ",
-        "ich-Latn": "ich-Latn-ZZ",
-        "ich-ZZ": "ich-Latn-ZZ",
+        "iby": "iby-Latn-NG",
+        "iby-Latn": "iby-Latn-NG",
+        "iby-NG": "iby-Latn-NG",
+        "ica": "ica-Latn-BJ",
+        "ica-BJ": "ica-Latn-BJ",
+        "ica-Latn": "ica-Latn-BJ",
+        "ich": "ich-Latn-NG",
+        "ich-Latn": "ich-Latn-NG",
+        "ich-NG": "ich-Latn-NG",
         "icr": "icr-Latn-CO",
         "icr-CO": "icr-Latn-CO",
         "icr-Latn": "icr-Latn-CO",
@@ -8163,15 +8157,15 @@
         "idc": "idc-Latn-NG",
         "idc-Latn": "idc-Latn-NG",
         "idc-NG": "idc-Latn-NG",
-        "idd": "idd-Latn-ZZ",
-        "idd-Latn": "idd-Latn-ZZ",
-        "idd-ZZ": "idd-Latn-ZZ",
+        "idd": "idd-Latn-BJ",
+        "idd-BJ": "idd-Latn-BJ",
+        "idd-Latn": "idd-Latn-BJ",
         "ide": "ide-Latn-NG",
         "ide-Latn": "ide-Latn-NG",
         "ide-NG": "ide-Latn-NG",
-        "idi": "idi-Latn-ZZ",
-        "idi-Latn": "idi-Latn-ZZ",
-        "idi-ZZ": "idi-Latn-ZZ",
+        "idi": "idi-Latn-PG",
+        "idi-Latn": "idi-Latn-PG",
+        "idi-PG": "idi-Latn-PG",
         "idr": "idr-Latn-SS",
         "idr-Latn": "idr-Latn-SS",
         "idr-SS": "idr-Latn-SS",
@@ -8181,12 +8175,12 @@
         "idt": "idt-Latn-TL",
         "idt-Latn": "idt-Latn-TL",
         "idt-TL": "idt-Latn-TL",
-        "idu": "idu-Latn-ZZ",
-        "idu-Latn": "idu-Latn-ZZ",
-        "idu-ZZ": "idu-Latn-ZZ",
-        "ie": "ie-Latn-001",
-        "ie-001": "ie-Latn-001",
-        "ie-Latn": "ie-Latn-001",
+        "idu": "idu-Latn-NG",
+        "idu-Latn": "idu-Latn-NG",
+        "idu-NG": "idu-Latn-NG",
+        "ie": "ie-Latn-EE",
+        "ie-EE": "ie-Latn-EE",
+        "ie-Latn": "ie-Latn-EE",
         "ifa": "ifa-Latn-PH",
         "ifa-Latn": "ifa-Latn-PH",
         "ifa-PH": "ifa-Latn-PH",
@@ -8214,12 +8208,12 @@
         "ig": "ig-Latn-NG",
         "ig-Latn": "ig-Latn-NG",
         "ig-NG": "ig-Latn-NG",
-        "igb": "igb-Latn-ZZ",
-        "igb-Latn": "igb-Latn-ZZ",
-        "igb-ZZ": "igb-Latn-ZZ",
-        "ige": "ige-Latn-ZZ",
-        "ige-Latn": "ige-Latn-ZZ",
-        "ige-ZZ": "ige-Latn-ZZ",
+        "igb": "igb-Latn-NG",
+        "igb-Latn": "igb-Latn-NG",
+        "igb-NG": "igb-Latn-NG",
+        "ige": "ige-Latn-NG",
+        "ige-Latn": "ige-Latn-NG",
+        "ige-NG": "ige-Latn-NG",
         "igg": "igg-Latn-PG",
         "igg-Latn": "igg-Latn-PG",
         "igg-PG": "igg-Latn-PG",
@@ -8266,9 +8260,9 @@
         "ije": "ije-Latn-NG",
         "ije-Latn": "ije-Latn-NG",
         "ije-NG": "ije-Latn-NG",
-        "ijj": "ijj-Latn-ZZ",
-        "ijj-Latn": "ijj-Latn-ZZ",
-        "ijj-ZZ": "ijj-Latn-ZZ",
+        "ijj": "ijj-Latn-BJ",
+        "ijj-BJ": "ijj-Latn-BJ",
+        "ijj-Latn": "ijj-Latn-BJ",
         "ijn": "ijn-Latn-NG",
         "ijn-Latn": "ijn-Latn-NG",
         "ijn-NG": "ijn-Latn-NG",
@@ -8281,9 +8275,9 @@
         "iki": "iki-Latn-NG",
         "iki-Latn": "iki-Latn-NG",
         "iki-NG": "iki-Latn-NG",
-        "ikk": "ikk-Latn-ZZ",
-        "ikk-Latn": "ikk-Latn-ZZ",
-        "ikk-ZZ": "ikk-Latn-ZZ",
+        "ikk": "ikk-Latn-NG",
+        "ikk-Latn": "ikk-Latn-NG",
+        "ikk-NG": "ikk-Latn-NG",
         "ikl": "ikl-Latn-NG",
         "ikl-Latn": "ikl-Latn-NG",
         "ikl-NG": "ikl-Latn-NG",
@@ -8303,12 +8297,12 @@
         "ikv": "ikv-Latn-NG",
         "ikv-Latn": "ikv-Latn-NG",
         "ikv-NG": "ikv-Latn-NG",
-        "ikw": "ikw-Latn-ZZ",
-        "ikw-Latn": "ikw-Latn-ZZ",
-        "ikw-ZZ": "ikw-Latn-ZZ",
-        "ikx": "ikx-Latn-ZZ",
-        "ikx-Latn": "ikx-Latn-ZZ",
-        "ikx-ZZ": "ikx-Latn-ZZ",
+        "ikw": "ikw-Latn-NG",
+        "ikw-Latn": "ikw-Latn-NG",
+        "ikw-NG": "ikw-Latn-NG",
+        "ikx": "ikx-Latn-UG",
+        "ikx-Latn": "ikx-Latn-UG",
+        "ikx-UG": "ikx-Latn-UG",
         "ikz": "ikz-Latn-TZ",
         "ikz-Latn": "ikz-Latn-TZ",
         "ikz-TZ": "ikz-Latn-TZ",
@@ -8353,9 +8347,9 @@
         "imn": "imn-Latn-PG",
         "imn-Latn": "imn-Latn-PG",
         "imn-PG": "imn-Latn-PG",
-        "imo": "imo-Latn-ZZ",
-        "imo-Latn": "imo-Latn-ZZ",
-        "imo-ZZ": "imo-Latn-ZZ",
+        "imo": "imo-Latn-PG",
+        "imo-Latn": "imo-Latn-PG",
+        "imo-PG": "imo-Latn-PG",
         "imr": "imr-Latn-ID",
         "imr-ID": "imr-Latn-ID",
         "imr-Latn": "imr-Latn-ID",
@@ -8401,9 +8395,9 @@
         "ior": "ior-Ethi-ET",
         "ior-ET": "ior-Ethi-ET",
         "ior-Ethi": "ior-Ethi-ET",
-        "iou": "iou-Latn-ZZ",
-        "iou-Latn": "iou-Latn-ZZ",
-        "iou-ZZ": "iou-Latn-ZZ",
+        "iou": "iou-Latn-PG",
+        "iou-Latn": "iou-Latn-PG",
+        "iou-PG": "iou-Latn-PG",
         "iow": "iow-Latn-US",
         "iow-Latn": "iow-Latn-US",
         "iow-US": "iow-Latn-US",
@@ -8425,9 +8419,9 @@
         "irh": "irh-Latn-ID",
         "irh-ID": "irh-Latn-ID",
         "irh-Latn": "irh-Latn-ID",
-        "iri": "iri-Latn-ZZ",
-        "iri-Latn": "iri-Latn-ZZ",
-        "iri-ZZ": "iri-Latn-ZZ",
+        "iri": "iri-Latn-NG",
+        "iri-Latn": "iri-Latn-NG",
+        "iri-NG": "iri-Latn-NG",
         "irk": "irk-Latn-TZ",
         "irk-Latn": "irk-Latn-TZ",
         "irk-TZ": "irk-Latn-TZ",
@@ -8556,15 +8550,15 @@
         "iwk": "iwk-Latn-PH",
         "iwk-Latn": "iwk-Latn-PH",
         "iwk-PH": "iwk-Latn-PH",
-        "iwm": "iwm-Latn-ZZ",
-        "iwm-Latn": "iwm-Latn-ZZ",
-        "iwm-ZZ": "iwm-Latn-ZZ",
+        "iwm": "iwm-Latn-PG",
+        "iwm-Latn": "iwm-Latn-PG",
+        "iwm-PG": "iwm-Latn-PG",
         "iwo": "iwo-Latn-ID",
         "iwo-ID": "iwo-Latn-ID",
         "iwo-Latn": "iwo-Latn-ID",
-        "iws": "iws-Latn-ZZ",
-        "iws-Latn": "iws-Latn-ZZ",
-        "iws-ZZ": "iws-Latn-ZZ",
+        "iws": "iws-Latn-PG",
+        "iws-Latn": "iws-Latn-PG",
+        "iws-PG": "iws-Latn-PG",
         "ixc": "ixc-Latn-MX",
         "ixc-Latn": "ixc-Latn-MX",
         "ixc-MX": "ixc-Latn-MX",
@@ -8583,9 +8577,6 @@
         "izh": "izh-Latn-RU",
         "izh-Latn": "izh-Latn-RU",
         "izh-RU": "izh-Latn-RU",
-        "izi": "izi-Latn-ZZ",
-        "izi-Latn": "izi-Latn-ZZ",
-        "izi-ZZ": "izi-Latn-ZZ",
         "izr": "izr-Latn-NG",
         "izr-Latn": "izr-Latn-NG",
         "izr-NG": "izr-Latn-NG",
@@ -8599,9 +8590,9 @@
         "jaa": "jaa-Latn-BR",
         "jaa-BR": "jaa-Latn-BR",
         "jaa-Latn": "jaa-Latn-BR",
-        "jab": "jab-Latn-ZZ",
-        "jab-Latn": "jab-Latn-ZZ",
-        "jab-ZZ": "jab-Latn-ZZ",
+        "jab": "jab-Latn-NG",
+        "jab-Latn": "jab-Latn-NG",
+        "jab-NG": "jab-Latn-NG",
         "jac": "jac-Latn-GT",
         "jac-GT": "jac-Latn-GT",
         "jac-Latn": "jac-Latn-GT",
@@ -8638,9 +8629,6 @@
         "jaq": "jaq-Latn-ID",
         "jaq-ID": "jaq-Latn-ID",
         "jaq-Latn": "jaq-Latn-ID",
-        "jar": "jar-Latn-ZZ",
-        "jar-Latn": "jar-Latn-ZZ",
-        "jar-ZZ": "jar-Latn-ZZ",
         "jas": "jas-Latn-NC",
         "jas-Latn": "jas-Latn-NC",
         "jas-NC": "jas-Latn-NC",
@@ -8686,9 +8674,9 @@
         "jbt": "jbt-Latn-BR",
         "jbt-BR": "jbt-Latn-BR",
         "jbt-Latn": "jbt-Latn-BR",
-        "jbu": "jbu-Latn-ZZ",
-        "jbu-Latn": "jbu-Latn-ZZ",
-        "jbu-ZZ": "jbu-Latn-ZZ",
+        "jbu": "jbu-Latn-CM",
+        "jbu-CM": "jbu-Latn-CM",
+        "jbu-Latn": "jbu-Latn-CM",
         "jbw": "jbw-Latn-AU",
         "jbw-AU": "jbw-Latn-AU",
         "jbw-Latn": "jbw-Latn-AU",
@@ -8726,9 +8714,9 @@
         "jel": "jel-Latn-ID",
         "jel-ID": "jel-Latn-ID",
         "jel-Latn": "jel-Latn-ID",
-        "jen": "jen-Latn-ZZ",
-        "jen-Latn": "jen-Latn-ZZ",
-        "jen-ZZ": "jen-Latn-ZZ",
+        "jen": "jen-Latn-NG",
+        "jen-Latn": "jen-Latn-NG",
+        "jen-NG": "jen-Latn-NG",
         "jer": "jer-Latn-NG",
         "jer-Latn": "jer-Latn-NG",
         "jer-NG": "jer-Latn-NG",
@@ -8745,9 +8733,9 @@
         "jge-GE": "jge-Geor-GE",
         "jge-Geor": "jge-Geor-GE",
         "jge-Hebr": "jge-Hebr-IL",
-        "jgk": "jgk-Latn-ZZ",
-        "jgk-Latn": "jgk-Latn-ZZ",
-        "jgk-ZZ": "jgk-Latn-ZZ",
+        "jgk": "jgk-Latn-NG",
+        "jgk-Latn": "jgk-Latn-NG",
+        "jgk-NG": "jgk-Latn-NG",
         "jgo": "jgo-Latn-CM",
         "jgo-CM": "jgo-Latn-CM",
         "jgo-Latn": "jgo-Latn-CM",
@@ -8760,9 +8748,9 @@
         "jia": "jia-Latn-CM",
         "jia-CM": "jia-Latn-CM",
         "jia-Latn": "jia-Latn-CM",
-        "jib": "jib-Latn-ZZ",
-        "jib-Latn": "jib-Latn-ZZ",
-        "jib-ZZ": "jib-Latn-ZZ",
+        "jib": "jib-Latn-NG",
+        "jib-Latn": "jib-Latn-NG",
+        "jib-NG": "jib-Latn-NG",
         "jic": "jic-Latn-HN",
         "jic-HN": "jic-Latn-HN",
         "jic-Latn": "jic-Latn-HN",
@@ -8897,9 +8885,15 @@
         "jqr": "jqr-Latn-PE",
         "jqr-Latn": "jqr-Latn-PE",
         "jqr-PE": "jqr-Latn-PE",
-        "jra": "jra-Latn-ZZ",
-        "jra-Latn": "jra-Latn-ZZ",
-        "jra-ZZ": "jra-Latn-ZZ",
+        "jra": "jra-Latn-VN",
+        "jra-Khmr": "jra-Khmr-KH",
+        "jra-Latn": "jra-Latn-VN",
+        "jra-VN": "jra-Latn-VN",
+        "jrb": "jrb-Hebr-IL",
+        "jrb-Arab": "jrb-Arab-MA",
+        "jrb-Hebr": "jrb-Hebr-IL",
+        "jrb-IL": "jrb-Hebr-IL",
+        "jrb-MA": "jrb-Arab-MA",
         "jrr": "jrr-Latn-NG",
         "jrr-Latn": "jrr-Latn-NG",
         "jrr-NG": "jrr-Latn-NG",
@@ -8997,18 +8991,18 @@
         "kac": "kac-Latn-MM",
         "kac-Latn": "kac-Latn-MM",
         "kac-MM": "kac-Latn-MM",
-        "kad": "kad-Latn-ZZ",
-        "kad-Latn": "kad-Latn-ZZ",
-        "kad-ZZ": "kad-Latn-ZZ",
+        "kad": "kad-Latn-NG",
+        "kad-Latn": "kad-Latn-NG",
+        "kad-NG": "kad-Latn-NG",
         "kag": "kag-Latn-MY",
         "kag-Latn": "kag-Latn-MY",
         "kag-MY": "kag-Latn-MY",
         "kah": "kah-Latn-CF",
         "kah-CF": "kah-Latn-CF",
         "kah-Latn": "kah-Latn-CF",
-        "kai": "kai-Latn-ZZ",
-        "kai-Latn": "kai-Latn-ZZ",
-        "kai-ZZ": "kai-Latn-ZZ",
+        "kai": "kai-Latn-NG",
+        "kai-Latn": "kai-Latn-NG",
+        "kai-NG": "kai-Latn-NG",
         "kaj": "kaj-Latn-NG",
         "kaj-Latn": "kaj-Latn-NG",
         "kaj-NG": "kaj-Latn-NG",
@@ -9069,21 +9063,22 @@
         "kbl": "kbl-Latn-TD",
         "kbl-Latn": "kbl-Latn-TD",
         "kbl-TD": "kbl-Latn-TD",
-        "kbm": "kbm-Latn-ZZ",
-        "kbm-Latn": "kbm-Latn-ZZ",
-        "kbm-ZZ": "kbm-Latn-ZZ",
+        "kbm": "kbm-Latn-PG",
+        "kbm-Latn": "kbm-Latn-PG",
+        "kbm-PG": "kbm-Latn-PG",
         "kbn": "kbn-Latn-CF",
         "kbn-CF": "kbn-Latn-CF",
         "kbn-Latn": "kbn-Latn-CF",
         "kbo": "kbo-Latn-SS",
         "kbo-Latn": "kbo-Latn-SS",
         "kbo-SS": "kbo-Latn-SS",
-        "kbp": "kbp-Latn-ZZ",
-        "kbp-Latn": "kbp-Latn-ZZ",
-        "kbp-ZZ": "kbp-Latn-ZZ",
-        "kbq": "kbq-Latn-ZZ",
-        "kbq-Latn": "kbq-Latn-ZZ",
-        "kbq-ZZ": "kbq-Latn-ZZ",
+        "kbp": "kbp-Latn-TG",
+        "kbp-Brai": "kbp-Brai-TG",
+        "kbp-Latn": "kbp-Latn-TG",
+        "kbp-TG": "kbp-Latn-TG",
+        "kbq": "kbq-Latn-PG",
+        "kbq-Latn": "kbq-Latn-PG",
+        "kbq-PG": "kbq-Latn-PG",
         "kbr": "kbr-Latn-ET",
         "kbr-ET": "kbr-Latn-ET",
         "kbr-Ethi": "kbr-Ethi-ET",
@@ -9103,9 +9098,9 @@
         "kbw": "kbw-Latn-PG",
         "kbw-Latn": "kbw-Latn-PG",
         "kbw-PG": "kbw-Latn-PG",
-        "kbx": "kbx-Latn-ZZ",
-        "kbx-Latn": "kbx-Latn-ZZ",
-        "kbx-ZZ": "kbx-Latn-ZZ",
+        "kbx": "kbx-Latn-PG",
+        "kbx-Latn": "kbx-Latn-PG",
+        "kbx-PG": "kbx-Latn-PG",
         "kby": "kby-Arab-NE",
         "kby-Arab": "kby-Arab-NE",
         "kby-NE": "kby-Arab-NE",
@@ -9145,9 +9140,9 @@
         "kck": "kck-Latn-ZW",
         "kck-Latn": "kck-Latn-ZW",
         "kck-ZW": "kck-Latn-ZW",
-        "kcl": "kcl-Latn-ZZ",
-        "kcl-Latn": "kcl-Latn-ZZ",
-        "kcl-ZZ": "kcl-Latn-ZZ",
+        "kcl": "kcl-Latn-PG",
+        "kcl-Latn": "kcl-Latn-PG",
+        "kcl-PG": "kcl-Latn-PG",
         "kcm": "kcm-Latn-CF",
         "kcm-CF": "kcm-Latn-CF",
         "kcm-Latn": "kcm-Latn-CF",
@@ -9166,9 +9161,9 @@
         "kcs": "kcs-Latn-NG",
         "kcs-Latn": "kcs-Latn-NG",
         "kcs-NG": "kcs-Latn-NG",
-        "kct": "kct-Latn-ZZ",
-        "kct-Latn": "kct-Latn-ZZ",
-        "kct-ZZ": "kct-Latn-ZZ",
+        "kct": "kct-Latn-PG",
+        "kct-Latn": "kct-Latn-PG",
+        "kct-PG": "kct-Latn-PG",
         "kcu": "kcu-Latn-TZ",
         "kcu-Latn": "kcu-Latn-TZ",
         "kcu-TZ": "kcu-Latn-TZ",
@@ -9211,9 +9206,9 @@
         "kdk": "kdk-Latn-NC",
         "kdk-Latn": "kdk-Latn-NC",
         "kdk-NC": "kdk-Latn-NC",
-        "kdl": "kdl-Latn-ZZ",
-        "kdl-Latn": "kdl-Latn-ZZ",
-        "kdl-ZZ": "kdl-Latn-ZZ",
+        "kdl": "kdl-Latn-NG",
+        "kdl-Latn": "kdl-Latn-NG",
+        "kdl-NG": "kdl-Latn-NG",
         "kdm": "kdm-Latn-NG",
         "kdm-Latn": "kdm-Latn-NG",
         "kdm-NG": "kdm-Latn-NG",
@@ -9309,9 +9304,9 @@
         "key": "key-Telu-IN",
         "key-IN": "key-Telu-IN",
         "key-Telu": "key-Telu-IN",
-        "kez": "kez-Latn-ZZ",
-        "kez-Latn": "kez-Latn-ZZ",
-        "kez-ZZ": "kez-Latn-ZZ",
+        "kez": "kez-Latn-NG",
+        "kez-Latn": "kez-Latn-NG",
+        "kez-NG": "kez-Latn-NG",
         "kfa": "kfa-Knda-IN",
         "kfa-IN": "kfa-Knda-IN",
         "kfa-Knda": "kfa-Knda-IN",
@@ -9396,9 +9391,9 @@
         "kge": "kge-Latn-ID",
         "kge-ID": "kge-Latn-ID",
         "kge-Latn": "kge-Latn-ID",
-        "kgf": "kgf-Latn-ZZ",
-        "kgf-Latn": "kgf-Latn-ZZ",
-        "kgf-ZZ": "kgf-Latn-ZZ",
+        "kgf": "kgf-Latn-PG",
+        "kgf-Latn": "kgf-Latn-PG",
+        "kgf-PG": "kgf-Latn-PG",
         "kgj": "kgj-Deva-NP",
         "kgj-Deva": "kgj-Deva-NP",
         "kgj-NP": "kgj-Deva-NP",
@@ -9487,9 +9482,9 @@
         "khr-Deva": "khr-Deva-IN",
         "khr-IN": "khr-Latn-IN",
         "khr-Latn": "khr-Latn-IN",
-        "khs": "khs-Latn-ZZ",
-        "khs-Latn": "khs-Latn-ZZ",
-        "khs-ZZ": "khs-Latn-ZZ",
+        "khs": "khs-Latn-PG",
+        "khs-Latn": "khs-Latn-PG",
+        "khs-PG": "khs-Latn-PG",
         "kht": "kht-Mymr-IN",
         "kht-IN": "kht-Mymr-IN",
         "kht-Mymr": "kht-Mymr-IN",
@@ -9508,9 +9503,9 @@
         "khy": "khy-Latn-CD",
         "khy-CD": "khy-Latn-CD",
         "khy-Latn": "khy-Latn-CD",
-        "khz": "khz-Latn-ZZ",
-        "khz-Latn": "khz-Latn-ZZ",
-        "khz-ZZ": "khz-Latn-ZZ",
+        "khz": "khz-Latn-PG",
+        "khz-Latn": "khz-Latn-PG",
+        "khz-PG": "khz-Latn-PG",
         "ki": "ki-Latn-KE",
         "ki-KE": "ki-Latn-KE",
         "ki-Latn": "ki-Latn-KE",
@@ -9538,9 +9533,9 @@
         "kih": "kih-Latn-PG",
         "kih-Latn": "kih-Latn-PG",
         "kih-PG": "kih-Latn-PG",
-        "kij": "kij-Latn-ZZ",
-        "kij-Latn": "kij-Latn-ZZ",
-        "kij-ZZ": "kij-Latn-ZZ",
+        "kij": "kij-Latn-PG",
+        "kij-Latn": "kij-Latn-PG",
+        "kij-PG": "kij-Latn-PG",
         "kil": "kil-Latn-NG",
         "kil-Latn": "kil-Latn-NG",
         "kil-NG": "kil-Latn-NG",
@@ -9568,9 +9563,9 @@
         "kiv": "kiv-Latn-TZ",
         "kiv-Latn": "kiv-Latn-TZ",
         "kiv-TZ": "kiv-Latn-TZ",
-        "kiw": "kiw-Latn-ZZ",
-        "kiw-Latn": "kiw-Latn-ZZ",
-        "kiw-ZZ": "kiw-Latn-ZZ",
+        "kiw": "kiw-Latn-PG",
+        "kiw-Latn": "kiw-Latn-PG",
+        "kiw-PG": "kiw-Latn-PG",
         "kix": "kix-Latn-IN",
         "kix-IN": "kix-Latn-IN",
         "kix-Latn": "kix-Latn-IN",
@@ -9592,9 +9587,9 @@
         "kjc": "kjc-Latn-ID",
         "kjc-ID": "kjc-Latn-ID",
         "kjc-Latn": "kjc-Latn-ID",
-        "kjd": "kjd-Latn-ZZ",
-        "kjd-Latn": "kjd-Latn-ZZ",
-        "kjd-ZZ": "kjd-Latn-ZZ",
+        "kjd": "kjd-Latn-PG",
+        "kjd-Latn": "kjd-Latn-PG",
+        "kjd-PG": "kjd-Latn-PG",
         "kje": "kje-Latn-ID",
         "kje-ID": "kje-Latn-ID",
         "kje-Latn": "kje-Latn-ID",
@@ -9635,9 +9630,9 @@
         "kjr": "kjr-Latn-ID",
         "kjr-ID": "kjr-Latn-ID",
         "kjr-Latn": "kjr-Latn-ID",
-        "kjs": "kjs-Latn-ZZ",
-        "kjs-Latn": "kjs-Latn-ZZ",
-        "kjs-ZZ": "kjs-Latn-ZZ",
+        "kjs": "kjs-Latn-PG",
+        "kjs-Latn": "kjs-Latn-PG",
+        "kjs-PG": "kjs-Latn-PG",
         "kjt": "kjt-Thai-TH",
         "kjt-TH": "kjt-Thai-TH",
         "kjt-Thai": "kjt-Thai-TH",
@@ -9647,9 +9642,9 @@
         "kjx": "kjx-Latn-PG",
         "kjx-Latn": "kjx-Latn-PG",
         "kjx-PG": "kjx-Latn-PG",
-        "kjy": "kjy-Latn-ZZ",
-        "kjy-Latn": "kjy-Latn-ZZ",
-        "kjy-ZZ": "kjy-Latn-ZZ",
+        "kjy": "kjy-Latn-PG",
+        "kjy-Latn": "kjy-Latn-PG",
+        "kjy-PG": "kjy-Latn-PG",
         "kk": "kk-Cyrl-KZ",
         "kk-AF": "kk-Arab-AF",
         "kk-Arab": "kk-Arab-CN",
@@ -9664,9 +9659,9 @@
         "kkb": "kkb-Latn-ID",
         "kkb-ID": "kkb-Latn-ID",
         "kkb-Latn": "kkb-Latn-ID",
-        "kkc": "kkc-Latn-ZZ",
-        "kkc-Latn": "kkc-Latn-ZZ",
-        "kkc-ZZ": "kkc-Latn-ZZ",
+        "kkc": "kkc-Latn-PG",
+        "kkc-Latn": "kkc-Latn-PG",
+        "kkc-PG": "kkc-Latn-PG",
         "kkd": "kkd-Latn-NG",
         "kkd-Latn": "kkd-Latn-NG",
         "kkd-NG": "kkd-Latn-NG",
@@ -9785,9 +9780,9 @@
         "klp": "klp-Latn-PG",
         "klp-Latn": "klp-Latn-PG",
         "klp-PG": "klp-Latn-PG",
-        "klq": "klq-Latn-ZZ",
-        "klq-Latn": "klq-Latn-ZZ",
-        "klq-ZZ": "klq-Latn-ZZ",
+        "klq": "klq-Latn-PG",
+        "klq-Latn": "klq-Latn-PG",
+        "klq-PG": "klq-Latn-PG",
         "klr": "klr-Deva-NP",
         "klr-Deva": "klr-Deva-NP",
         "klr-NP": "klr-Deva-NP",
@@ -9795,9 +9790,9 @@
         "kls-Arab": "kls-Arab-PK",
         "kls-Latn": "kls-Latn-PK",
         "kls-PK": "kls-Latn-PK",
-        "klt": "klt-Latn-ZZ",
-        "klt-Latn": "klt-Latn-ZZ",
-        "klt-ZZ": "klt-Latn-ZZ",
+        "klt": "klt-Latn-PG",
+        "klt-Latn": "klt-Latn-PG",
+        "klt-PG": "klt-Latn-PG",
         "klu": "klu-Latn-LR",
         "klu-LR": "klu-Latn-LR",
         "klu-Latn": "klu-Latn-LR",
@@ -9807,9 +9802,9 @@
         "klw": "klw-Latn-ID",
         "klw-ID": "klw-Latn-ID",
         "klw-Latn": "klw-Latn-ID",
-        "klx": "klx-Latn-ZZ",
-        "klx-Latn": "klx-Latn-ZZ",
-        "klx-ZZ": "klx-Latn-ZZ",
+        "klx": "klx-Latn-PG",
+        "klx-Latn": "klx-Latn-PG",
+        "klx-PG": "klx-Latn-PG",
         "kly": "kly-Latn-ID",
         "kly-ID": "kly-Latn-ID",
         "kly-Latn": "kly-Latn-ID",
@@ -9842,9 +9837,9 @@
         "kmg": "kmg-Latn-PG",
         "kmg-Latn": "kmg-Latn-PG",
         "kmg-PG": "kmg-Latn-PG",
-        "kmh": "kmh-Latn-ZZ",
-        "kmh-Latn": "kmh-Latn-ZZ",
-        "kmh-ZZ": "kmh-Latn-ZZ",
+        "kmh": "kmh-Latn-PG",
+        "kmh-Latn": "kmh-Latn-PG",
+        "kmh-PG": "kmh-Latn-PG",
         "kmi": "kmi-Latn-NG",
         "kmi-Latn": "kmi-Latn-NG",
         "kmi-NG": "kmi-Latn-NG",
@@ -9863,30 +9858,30 @@
         "kmn": "kmn-Latn-PG",
         "kmn-Latn": "kmn-Latn-PG",
         "kmn-PG": "kmn-Latn-PG",
-        "kmo": "kmo-Latn-ZZ",
-        "kmo-Latn": "kmo-Latn-ZZ",
-        "kmo-ZZ": "kmo-Latn-ZZ",
+        "kmo": "kmo-Latn-PG",
+        "kmo-Latn": "kmo-Latn-PG",
+        "kmo-PG": "kmo-Latn-PG",
         "kmp": "kmp-Latn-CM",
         "kmp-CM": "kmp-Latn-CM",
         "kmp-Latn": "kmp-Latn-CM",
         "kmq": "kmq-Latn-ET",
         "kmq-ET": "kmq-Latn-ET",
         "kmq-Latn": "kmq-Latn-ET",
-        "kms": "kms-Latn-ZZ",
-        "kms-Latn": "kms-Latn-ZZ",
-        "kms-ZZ": "kms-Latn-ZZ",
+        "kms": "kms-Latn-PG",
+        "kms-Latn": "kms-Latn-PG",
+        "kms-PG": "kms-Latn-PG",
         "kmt": "kmt-Latn-ID",
         "kmt-ID": "kmt-Latn-ID",
         "kmt-Latn": "kmt-Latn-ID",
-        "kmu": "kmu-Latn-ZZ",
-        "kmu-Latn": "kmu-Latn-ZZ",
-        "kmu-ZZ": "kmu-Latn-ZZ",
+        "kmu": "kmu-Latn-PG",
+        "kmu-Latn": "kmu-Latn-PG",
+        "kmu-PG": "kmu-Latn-PG",
         "kmv": "kmv-Latn-BR",
         "kmv-BR": "kmv-Latn-BR",
         "kmv-Latn": "kmv-Latn-BR",
-        "kmw": "kmw-Latn-ZZ",
-        "kmw-Latn": "kmw-Latn-ZZ",
-        "kmw-ZZ": "kmw-Latn-ZZ",
+        "kmw": "kmw-Latn-CD",
+        "kmw-CD": "kmw-Latn-CD",
+        "kmw-Latn": "kmw-Latn-CD",
         "kmx": "kmx-Latn-PG",
         "kmx-Latn": "kmx-Latn-PG",
         "kmx-PG": "kmx-Latn-PG",
@@ -9934,9 +9929,9 @@
         "kno": "kno-Latn-SL",
         "kno-Latn": "kno-Latn-SL",
         "kno-SL": "kno-Latn-SL",
-        "knp": "knp-Latn-ZZ",
-        "knp-Latn": "knp-Latn-ZZ",
-        "knp-ZZ": "knp-Latn-ZZ",
+        "knp": "knp-Latn-CM",
+        "knp-CM": "knp-Latn-CM",
+        "knp-Latn": "knp-Latn-CM",
         "knq": "knq-Latn-MY",
         "knq-Latn": "knq-Latn-MY",
         "knq-MY": "knq-Latn-MY",
@@ -10000,9 +9995,9 @@
         "kok": "kok-Deva-IN",
         "kok-Deva": "kok-Deva-IN",
         "kok-IN": "kok-Deva-IN",
-        "kol": "kol-Latn-ZZ",
-        "kol-Latn": "kol-Latn-ZZ",
-        "kol-ZZ": "kol-Latn-ZZ",
+        "kol": "kol-Latn-PG",
+        "kol-Latn": "kol-Latn-PG",
+        "kol-PG": "kol-Latn-PG",
         "koo": "koo-Latn-UG",
         "koo-Latn": "koo-Latn-UG",
         "koo-UG": "koo-Latn-UG",
@@ -10030,9 +10025,9 @@
         "koy": "koy-Latn-US",
         "koy-Latn": "koy-Latn-US",
         "koy-US": "koy-Latn-US",
-        "koz": "koz-Latn-ZZ",
-        "koz-Latn": "koz-Latn-ZZ",
-        "koz-ZZ": "koz-Latn-ZZ",
+        "koz": "koz-Latn-PG",
+        "koz-Latn": "koz-Latn-PG",
+        "koz-PG": "koz-Latn-PG",
         "kpa": "kpa-Latn-NG",
         "kpa-Latn": "kpa-Latn-NG",
         "kpa-NG": "kpa-Latn-NG",
@@ -10045,9 +10040,9 @@
         "kpe": "kpe-Latn-LR",
         "kpe-LR": "kpe-Latn-LR",
         "kpe-Latn": "kpe-Latn-LR",
-        "kpf": "kpf-Latn-ZZ",
-        "kpf-Latn": "kpf-Latn-ZZ",
-        "kpf-ZZ": "kpf-Latn-ZZ",
+        "kpf": "kpf-Latn-PG",
+        "kpf-Latn": "kpf-Latn-PG",
+        "kpf-PG": "kpf-Latn-PG",
         "kpg": "kpg-Latn-FM",
         "kpg-FM": "kpg-Latn-FM",
         "kpg-Latn": "kpg-Latn-FM",
@@ -10072,15 +10067,15 @@
         "kpn": "kpn-Latn-BR",
         "kpn-BR": "kpn-Latn-BR",
         "kpn-Latn": "kpn-Latn-BR",
-        "kpo": "kpo-Latn-ZZ",
-        "kpo-Latn": "kpo-Latn-ZZ",
-        "kpo-ZZ": "kpo-Latn-ZZ",
+        "kpo": "kpo-Latn-TG",
+        "kpo-Latn": "kpo-Latn-TG",
+        "kpo-TG": "kpo-Latn-TG",
         "kpq": "kpq-Latn-ID",
         "kpq-ID": "kpq-Latn-ID",
         "kpq-Latn": "kpq-Latn-ID",
-        "kpr": "kpr-Latn-ZZ",
-        "kpr-Latn": "kpr-Latn-ZZ",
-        "kpr-ZZ": "kpr-Latn-ZZ",
+        "kpr": "kpr-Latn-PG",
+        "kpr-Latn": "kpr-Latn-PG",
+        "kpr-PG": "kpr-Latn-PG",
         "kps": "kps-Latn-ID",
         "kps-ID": "kps-Latn-ID",
         "kps-Latn": "kps-Latn-ID",
@@ -10093,9 +10088,9 @@
         "kpw": "kpw-Latn-PG",
         "kpw-Latn": "kpw-Latn-PG",
         "kpw-PG": "kpw-Latn-PG",
-        "kpx": "kpx-Latn-ZZ",
-        "kpx-Latn": "kpx-Latn-ZZ",
-        "kpx-ZZ": "kpx-Latn-ZZ",
+        "kpx": "kpx-Latn-PG",
+        "kpx-Latn": "kpx-Latn-PG",
+        "kpx-PG": "kpx-Latn-PG",
         "kpy": "kpy-Cyrl-RU",
         "kpy-Cyrl": "kpy-Cyrl-RU",
         "kpy-RU": "kpy-Cyrl-RU",
@@ -10105,9 +10100,9 @@
         "kqa": "kqa-Latn-PG",
         "kqa-Latn": "kqa-Latn-PG",
         "kqa-PG": "kqa-Latn-PG",
-        "kqb": "kqb-Latn-ZZ",
-        "kqb-Latn": "kqb-Latn-ZZ",
-        "kqb-ZZ": "kqb-Latn-ZZ",
+        "kqb": "kqb-Latn-PG",
+        "kqb-Latn": "kqb-Latn-PG",
+        "kqb-PG": "kqb-Latn-PG",
         "kqc": "kqc-Latn-PG",
         "kqc-Latn": "kqc-Latn-PG",
         "kqc-PG": "kqc-Latn-PG",
@@ -10117,9 +10112,9 @@
         "kqe": "kqe-Latn-PH",
         "kqe-Latn": "kqe-Latn-PH",
         "kqe-PH": "kqe-Latn-PH",
-        "kqf": "kqf-Latn-ZZ",
-        "kqf-Latn": "kqf-Latn-ZZ",
-        "kqf-ZZ": "kqf-Latn-ZZ",
+        "kqf": "kqf-Latn-PG",
+        "kqf-Latn": "kqf-Latn-PG",
+        "kqf-PG": "kqf-Latn-PG",
         "kqg": "kqg-Latn-BF",
         "kqg-BF": "kqg-Latn-BF",
         "kqg-Latn": "kqg-Latn-BF",
@@ -10156,9 +10151,9 @@
         "kqr": "kqr-Latn-MY",
         "kqr-Latn": "kqr-Latn-MY",
         "kqr-MY": "kqr-Latn-MY",
-        "kqs": "kqs-Latn-ZZ",
-        "kqs-Latn": "kqs-Latn-ZZ",
-        "kqs-ZZ": "kqs-Latn-ZZ",
+        "kqs": "kqs-Latn-GN",
+        "kqs-GN": "kqs-Latn-GN",
+        "kqs-Latn": "kqs-Latn-GN",
         "kqt": "kqt-Latn-MY",
         "kqt-Latn": "kqt-Latn-MY",
         "kqt-MY": "kqt-Latn-MY",
@@ -10174,15 +10169,17 @@
         "kqx": "kqx-Latn-CM",
         "kqx-CM": "kqx-Latn-CM",
         "kqx-Latn": "kqx-Latn-CM",
-        "kqy": "kqy-Ethi-ZZ",
-        "kqy-Ethi": "kqy-Ethi-ZZ",
-        "kqy-ZZ": "kqy-Ethi-ZZ",
+        "kqy": "kqy-Ethi-ET",
+        "kqy-ET": "kqy-Ethi-ET",
+        "kqy-Ethi": "kqy-Ethi-ET",
+        "kqy-Latn": "kqy-Latn-ET",
         "kqz": "kqz-Latn-ZA",
         "kqz-Latn": "kqz-Latn-ZA",
         "kqz-ZA": "kqz-Latn-ZA",
-        "kr": "kr-Latn-ZZ",
-        "kr-Latn": "kr-Latn-ZZ",
-        "kr-ZZ": "kr-Latn-ZZ",
+        "kr": "kr-Latn-NG",
+        "kr-Arab": "kr-Arab-NG",
+        "kr-Latn": "kr-Latn-NG",
+        "kr-NG": "kr-Latn-NG",
         "kra": "kra-Deva-NP",
         "kra-Deva": "kra-Deva-NP",
         "kra-NP": "kra-Deva-NP",
@@ -10225,9 +10222,9 @@
         "krr": "krr-Khmr-KH",
         "krr-KH": "krr-Khmr-KH",
         "krr-Khmr": "krr-Khmr-KH",
-        "krs": "krs-Latn-ZZ",
-        "krs-Latn": "krs-Latn-ZZ",
-        "krs-ZZ": "krs-Latn-ZZ",
+        "krs": "krs-Latn-SS",
+        "krs-Latn": "krs-Latn-SS",
+        "krs-SS": "krs-Latn-SS",
         "krt": "krt-Latn-NE",
         "krt-Latn": "krt-Latn-NE",
         "krt-NE": "krt-Latn-NE",
@@ -10261,9 +10258,9 @@
         "ksc": "ksc-Latn-PH",
         "ksc-Latn": "ksc-Latn-PH",
         "ksc-PH": "ksc-Latn-PH",
-        "ksd": "ksd-Latn-ZZ",
-        "ksd-Latn": "ksd-Latn-ZZ",
-        "ksd-ZZ": "ksd-Latn-ZZ",
+        "ksd": "ksd-Latn-PG",
+        "ksd-Latn": "ksd-Latn-PG",
+        "ksd-PG": "ksd-Latn-PG",
         "kse": "kse-Latn-PG",
         "kse-Latn": "kse-Latn-PG",
         "kse-PG": "kse-Latn-PG",
@@ -10279,9 +10276,9 @@
         "ksi": "ksi-Latn-PG",
         "ksi-Latn": "ksi-Latn-PG",
         "ksi-PG": "ksi-Latn-PG",
-        "ksj": "ksj-Latn-ZZ",
-        "ksj-Latn": "ksj-Latn-ZZ",
-        "ksj-ZZ": "ksj-Latn-ZZ",
+        "ksj": "ksj-Latn-PG",
+        "ksj-Latn": "ksj-Latn-PG",
+        "ksj-PG": "ksj-Latn-PG",
         "ksk": "ksk-Latn-US",
         "ksk-Latn": "ksk-Latn-US",
         "ksk-US": "ksk-Latn-US",
@@ -10303,9 +10300,9 @@
         "ksq": "ksq-Latn-NG",
         "ksq-Latn": "ksq-Latn-NG",
         "ksq-NG": "ksq-Latn-NG",
-        "ksr": "ksr-Latn-ZZ",
-        "ksr-Latn": "ksr-Latn-ZZ",
-        "ksr-ZZ": "ksr-Latn-ZZ",
+        "ksr": "ksr-Latn-PG",
+        "ksr-Latn": "ksr-Latn-PG",
+        "ksr-PG": "ksr-Latn-PG",
         "kss": "kss-Latn-LR",
         "kss-LR": "kss-Latn-LR",
         "kss-Latn": "kss-Latn-LR",
@@ -10331,9 +10328,10 @@
         "kta": "kta-Latn-VN",
         "kta-Latn": "kta-Latn-VN",
         "kta-VN": "kta-Latn-VN",
-        "ktb": "ktb-Ethi-ZZ",
-        "ktb-Ethi": "ktb-Ethi-ZZ",
-        "ktb-ZZ": "ktb-Ethi-ZZ",
+        "ktb": "ktb-Ethi-ET",
+        "ktb-ET": "ktb-Ethi-ET",
+        "ktb-Ethi": "ktb-Ethi-ET",
+        "ktb-Latn": "ktb-Latn-ET",
         "ktc": "ktc-Latn-NG",
         "ktc-Latn": "ktc-Latn-NG",
         "ktc-NG": "ktc-Latn-NG",
@@ -10361,24 +10359,21 @@
         "ktl": "ktl-Arab-IR",
         "ktl-Arab": "ktl-Arab-IR",
         "ktl-IR": "ktl-Arab-IR",
-        "ktm": "ktm-Latn-ZZ",
-        "ktm-Latn": "ktm-Latn-ZZ",
-        "ktm-ZZ": "ktm-Latn-ZZ",
+        "ktm": "ktm-Latn-PG",
+        "ktm-Latn": "ktm-Latn-PG",
+        "ktm-PG": "ktm-Latn-PG",
         "ktn": "ktn-Latn-BR",
         "ktn-BR": "ktn-Latn-BR",
         "ktn-Latn": "ktn-Latn-BR",
-        "kto": "kto-Latn-ZZ",
-        "kto-Latn": "kto-Latn-ZZ",
-        "kto-ZZ": "kto-Latn-ZZ",
+        "kto": "kto-Latn-PG",
+        "kto-Latn": "kto-Latn-PG",
+        "kto-PG": "kto-Latn-PG",
         "ktp": "ktp-Plrd-CN",
         "ktp-CN": "ktp-Plrd-CN",
         "ktp-Plrd": "ktp-Plrd-CN",
         "ktq": "ktq-Latn-PH",
         "ktq-Latn": "ktq-Latn-PH",
         "ktq-PH": "ktq-Latn-PH",
-        "ktr": "ktr-Latn-MY",
-        "ktr-Latn": "ktr-Latn-MY",
-        "ktr-MY": "ktr-Latn-MY",
         "kts": "kts-Latn-ID",
         "kts-ID": "kts-Latn-ID",
         "kts-Latn": "kts-Latn-ID",
@@ -10410,18 +10405,18 @@
         "ku-Latn": "ku-Latn-TR",
         "ku-TR": "ku-Latn-TR",
         "ku-Yezi": "ku-Yezi-GE",
-        "kub": "kub-Latn-ZZ",
-        "kub-Latn": "kub-Latn-ZZ",
-        "kub-ZZ": "kub-Latn-ZZ",
+        "kub": "kub-Latn-NG",
+        "kub-Latn": "kub-Latn-NG",
+        "kub-NG": "kub-Latn-NG",
         "kuc": "kuc-Latn-ID",
         "kuc-ID": "kuc-Latn-ID",
         "kuc-Latn": "kuc-Latn-ID",
-        "kud": "kud-Latn-ZZ",
-        "kud-Latn": "kud-Latn-ZZ",
-        "kud-ZZ": "kud-Latn-ZZ",
-        "kue": "kue-Latn-ZZ",
-        "kue-Latn": "kue-Latn-ZZ",
-        "kue-ZZ": "kue-Latn-ZZ",
+        "kud": "kud-Latn-PG",
+        "kud-Latn": "kud-Latn-PG",
+        "kud-PG": "kud-Latn-PG",
+        "kue": "kue-Latn-PG",
+        "kue-Latn": "kue-Latn-PG",
+        "kue-PG": "kue-Latn-PG",
         "kuf": "kuf-Laoo-LA",
         "kuf-LA": "kuf-Laoo-LA",
         "kuf-Laoo": "kuf-Laoo-LA",
@@ -10434,9 +10429,9 @@
         "kui": "kui-Latn-BR",
         "kui-BR": "kui-Latn-BR",
         "kui-Latn": "kui-Latn-BR",
-        "kuj": "kuj-Latn-ZZ",
-        "kuj-Latn": "kuj-Latn-ZZ",
-        "kuj-ZZ": "kuj-Latn-ZZ",
+        "kuj": "kuj-Latn-TZ",
+        "kuj-Latn": "kuj-Latn-TZ",
+        "kuj-TZ": "kuj-Latn-TZ",
         "kuk": "kuk-Latn-ID",
         "kuk-ID": "kuk-Latn-ID",
         "kuk-Latn": "kuk-Latn-ID",
@@ -10446,21 +10441,21 @@
         "kum": "kum-Cyrl-RU",
         "kum-Cyrl": "kum-Cyrl-RU",
         "kum-RU": "kum-Cyrl-RU",
-        "kun": "kun-Latn-ZZ",
-        "kun-Latn": "kun-Latn-ZZ",
-        "kun-ZZ": "kun-Latn-ZZ",
+        "kun": "kun-Latn-ER",
+        "kun-ER": "kun-Latn-ER",
+        "kun-Latn": "kun-Latn-ER",
         "kuo": "kuo-Latn-PG",
         "kuo-Latn": "kuo-Latn-PG",
         "kuo-PG": "kuo-Latn-PG",
-        "kup": "kup-Latn-ZZ",
-        "kup-Latn": "kup-Latn-ZZ",
-        "kup-ZZ": "kup-Latn-ZZ",
+        "kup": "kup-Latn-PG",
+        "kup-Latn": "kup-Latn-PG",
+        "kup-PG": "kup-Latn-PG",
         "kuq": "kuq-Latn-BR",
         "kuq-BR": "kuq-Latn-BR",
         "kuq-Latn": "kuq-Latn-BR",
-        "kus": "kus-Latn-ZZ",
-        "kus-Latn": "kus-Latn-ZZ",
-        "kus-ZZ": "kus-Latn-ZZ",
+        "kus": "kus-Latn-GH",
+        "kus-GH": "kus-Latn-GH",
+        "kus-Latn": "kus-Latn-GH",
         "kut": "kut-Latn-CA",
         "kut-CA": "kut-Latn-CA",
         "kut-Latn": "kut-Latn-CA",
@@ -10503,9 +10498,9 @@
         "kvf": "kvf-Latn-TD",
         "kvf-Latn": "kvf-Latn-TD",
         "kvf-TD": "kvf-Latn-TD",
-        "kvg": "kvg-Latn-ZZ",
-        "kvg-Latn": "kvg-Latn-ZZ",
-        "kvg-ZZ": "kvg-Latn-ZZ",
+        "kvg": "kvg-Latn-PG",
+        "kvg-Latn": "kvg-Latn-PG",
+        "kvg-PG": "kvg-Latn-PG",
         "kvh": "kvh-Latn-ID",
         "kvh-ID": "kvh-Latn-ID",
         "kvh-Latn": "kvh-Latn-ID",
@@ -10585,9 +10580,9 @@
         "kwi": "kwi-Latn-CO",
         "kwi-CO": "kwi-Latn-CO",
         "kwi-Latn": "kwi-Latn-CO",
-        "kwj": "kwj-Latn-ZZ",
-        "kwj-Latn": "kwj-Latn-ZZ",
-        "kwj-ZZ": "kwj-Latn-ZZ",
+        "kwj": "kwj-Latn-PG",
+        "kwj-Latn": "kwj-Latn-PG",
+        "kwj-PG": "kwj-Latn-PG",
         "kwk": "kwk-Latn-CA",
         "kwk-CA": "kwk-Latn-CA",
         "kwk-Latn": "kwk-Latn-CA",
@@ -10600,15 +10595,12 @@
         "kwn": "kwn-Latn-NA",
         "kwn-Latn": "kwn-Latn-NA",
         "kwn-NA": "kwn-Latn-NA",
-        "kwo": "kwo-Latn-ZZ",
-        "kwo-Latn": "kwo-Latn-ZZ",
-        "kwo-ZZ": "kwo-Latn-ZZ",
+        "kwo": "kwo-Latn-PG",
+        "kwo-Latn": "kwo-Latn-PG",
+        "kwo-PG": "kwo-Latn-PG",
         "kwp": "kwp-Latn-CI",
         "kwp-CI": "kwp-Latn-CI",
         "kwp-Latn": "kwp-Latn-CI",
-        "kwq": "kwq-Latn-ZZ",
-        "kwq-Latn": "kwq-Latn-ZZ",
-        "kwq-ZZ": "kwq-Latn-ZZ",
         "kwr": "kwr-Latn-ID",
         "kwr-ID": "kwr-Latn-ID",
         "kwr-Latn": "kwr-Latn-ID",
@@ -10633,22 +10625,20 @@
         "kwz": "kwz-Latn-AO",
         "kwz-AO": "kwz-Latn-AO",
         "kwz-Latn": "kwz-Latn-AO",
-        "kxa": "kxa-Latn-ZZ",
-        "kxa-Latn": "kxa-Latn-ZZ",
-        "kxa-ZZ": "kxa-Latn-ZZ",
+        "kxa": "kxa-Latn-PG",
+        "kxa-Latn": "kxa-Latn-PG",
+        "kxa-PG": "kxa-Latn-PG",
         "kxb": "kxb-Latn-CI",
         "kxb-CI": "kxb-Latn-CI",
         "kxb-Latn": "kxb-Latn-CI",
-        "kxc": "kxc-Ethi-ZZ",
-        "kxc-Ethi": "kxc-Ethi-ZZ",
-        "kxc-ZZ": "kxc-Ethi-ZZ",
+        "kxc": "kxc-Latn-ET",
+        "kxc-ET": "kxc-Latn-ET",
+        "kxc-Ethi": "kxc-Ethi-ET",
+        "kxc-Latn": "kxc-Latn-ET",
         "kxd": "kxd-Latn-BN",
         "kxd-Arab": "kxd-Arab-BN",
         "kxd-BN": "kxd-Latn-BN",
         "kxd-Latn": "kxd-Latn-BN",
-        "kxe": "kxe-Latn-ZZ",
-        "kxe-Latn": "kxe-Latn-ZZ",
-        "kxe-ZZ": "kxe-Latn-ZZ",
         "kxf": "kxf-Mymr-MM",
         "kxf-Latn": "kxf-Latn-MM",
         "kxf-MM": "kxf-Mymr-MM",
@@ -10662,9 +10652,6 @@
         "kxk": "kxk-Mymr-MM",
         "kxk-MM": "kxk-Mymr-MM",
         "kxk-Mymr": "kxk-Mymr-MM",
-        "kxl": "kxl-Deva-IN",
-        "kxl-Deva": "kxl-Deva-IN",
-        "kxl-IN": "kxl-Deva-IN",
         "kxm": "kxm-Thai-TH",
         "kxm-TH": "kxm-Thai-TH",
         "kxm-Thai": "kxm-Thai-TH",
@@ -10686,23 +10673,21 @@
         "kxt": "kxt-Latn-PG",
         "kxt-Latn": "kxt-Latn-PG",
         "kxt-PG": "kxt-Latn-PG",
-        "kxv": "kxv-Orya-IN",
-        "kxv-IN": "kxv-Orya-IN",
+        "kxv": "kxv-Latn-IN",
+        "kxv-IN": "kxv-Latn-IN",
         "kxv-Latn": "kxv-Latn-IN",
-        "kxv-Orya": "kxv-Orya-IN",
-        "kxv-Telu": "kxv-Telu-IN",
-        "kxw": "kxw-Latn-ZZ",
-        "kxw-Latn": "kxw-Latn-ZZ",
-        "kxw-ZZ": "kxw-Latn-ZZ",
+        "kxw": "kxw-Latn-PG",
+        "kxw-Latn": "kxw-Latn-PG",
+        "kxw-PG": "kxw-Latn-PG",
         "kxx": "kxx-Latn-CG",
         "kxx-CG": "kxx-Latn-CG",
         "kxx-Latn": "kxx-Latn-CG",
         "kxy": "kxy-Latn-VN",
         "kxy-Latn": "kxy-Latn-VN",
         "kxy-VN": "kxy-Latn-VN",
-        "kxz": "kxz-Latn-ZZ",
-        "kxz-Latn": "kxz-Latn-ZZ",
-        "kxz-ZZ": "kxz-Latn-ZZ",
+        "kxz": "kxz-Latn-PG",
+        "kxz-Latn": "kxz-Latn-PG",
+        "kxz-PG": "kxz-Latn-PG",
         "ky": "ky-Cyrl-KG",
         "ky-Arab": "ky-Arab-CN",
         "ky-CN": "ky-Arab-CN",
@@ -10722,9 +10707,9 @@
         "kyd": "kyd-Latn-ID",
         "kyd-ID": "kyd-Latn-ID",
         "kyd-Latn": "kyd-Latn-ID",
-        "kye": "kye-Latn-ZZ",
-        "kye-Latn": "kye-Latn-ZZ",
-        "kye-ZZ": "kye-Latn-ZZ",
+        "kye": "kye-Latn-GH",
+        "kye-GH": "kye-Latn-GH",
+        "kye-Latn": "kye-Latn-GH",
         "kyf": "kyf-Latn-CI",
         "kyf-CI": "kyf-Latn-CI",
         "kyf-Latn": "kyf-Latn-CI",
@@ -10780,9 +10765,9 @@
         "kyw-Deva": "kyw-Deva-IN",
         "kyw-IN": "kyw-Deva-IN",
         "kyw-Orya": "kyw-Orya-IN",
-        "kyx": "kyx-Latn-ZZ",
-        "kyx-Latn": "kyx-Latn-ZZ",
-        "kyx-ZZ": "kyx-Latn-ZZ",
+        "kyx": "kyx-Latn-PG",
+        "kyx-Latn": "kyx-Latn-PG",
+        "kyx-PG": "kyx-Latn-PG",
         "kyy": "kyy-Latn-PG",
         "kyy-Latn": "kyy-Latn-PG",
         "kyy-PG": "kyy-Latn-PG",
@@ -10807,15 +10792,9 @@
         "kzf": "kzf-Latn-ID",
         "kzf-ID": "kzf-Latn-ID",
         "kzf-Latn": "kzf-Latn-ID",
-        "kzh": "kzh-Arab-ZZ",
-        "kzh-Arab": "kzh-Arab-ZZ",
-        "kzh-ZZ": "kzh-Arab-ZZ",
         "kzi": "kzi-Latn-MY",
         "kzi-Latn": "kzi-Latn-MY",
         "kzi-MY": "kzi-Latn-MY",
-        "kzj": "kzj-Latn-MY",
-        "kzj-Latn": "kzj-Latn-MY",
-        "kzj-MY": "kzj-Latn-MY",
         "kzk": "kzk-Latn-SB",
         "kzk-Latn": "kzk-Latn-SB",
         "kzk-SB": "kzk-Latn-SB",
@@ -10834,15 +10813,12 @@
         "kzp": "kzp-Latn-ID",
         "kzp-ID": "kzp-Latn-ID",
         "kzp-Latn": "kzp-Latn-ID",
-        "kzr": "kzr-Latn-ZZ",
-        "kzr-Latn": "kzr-Latn-ZZ",
-        "kzr-ZZ": "kzr-Latn-ZZ",
+        "kzr": "kzr-Latn-CM",
+        "kzr-CM": "kzr-Latn-CM",
+        "kzr-Latn": "kzr-Latn-CM",
         "kzs": "kzs-Latn-MY",
         "kzs-Latn": "kzs-Latn-MY",
         "kzs-MY": "kzs-Latn-MY",
-        "kzt": "kzt-Latn-MY",
-        "kzt-Latn": "kzt-Latn-MY",
-        "kzt-MY": "kzt-Latn-MY",
         "kzu": "kzu-Latn-ID",
         "kzu-ID": "kzu-Latn-ID",
         "kzu-Latn": "kzu-Latn-ID",
@@ -10910,9 +10886,9 @@
         "lar": "lar-Latn-GH",
         "lar-GH": "lar-Latn-GH",
         "lar-Latn": "lar-Latn-GH",
-        "las": "las-Latn-ZZ",
-        "las-Latn": "las-Latn-ZZ",
-        "las-ZZ": "las-Latn-ZZ",
+        "las": "las-Latn-TG",
+        "las-Latn": "las-Latn-TG",
+        "las-TG": "las-Latn-TG",
         "lau": "lau-Latn-ID",
         "lau-ID": "lau-Latn-ID",
         "lau-Latn": "lau-Latn-ID",
@@ -10972,9 +10948,9 @@
         "lbt": "lbt-Latn-VN",
         "lbt-Latn": "lbt-Latn-VN",
         "lbt-VN": "lbt-Latn-VN",
-        "lbu": "lbu-Latn-ZZ",
-        "lbu-Latn": "lbu-Latn-ZZ",
-        "lbu-ZZ": "lbu-Latn-ZZ",
+        "lbu": "lbu-Latn-PG",
+        "lbu-Latn": "lbu-Latn-PG",
+        "lbu-PG": "lbu-Latn-PG",
         "lbv": "lbv-Latn-PG",
         "lbv-Latn": "lbv-Latn-PG",
         "lbv-PG": "lbv-Latn-PG",
@@ -11008,9 +10984,9 @@
         "lcl": "lcl-Latn-ID",
         "lcl-ID": "lcl-Latn-ID",
         "lcl-Latn": "lcl-Latn-ID",
-        "lcm": "lcm-Latn-ZZ",
-        "lcm-Latn": "lcm-Latn-ZZ",
-        "lcm-ZZ": "lcm-Latn-ZZ",
+        "lcm": "lcm-Latn-PG",
+        "lcm-Latn": "lcm-Latn-PG",
+        "lcm-PG": "lcm-Latn-PG",
         "lcp": "lcp-Thai-CN",
         "lcp-CN": "lcp-Thai-CN",
         "lcp-Thai": "lcp-Thai-CN",
@@ -11023,9 +10999,9 @@
         "lda": "lda-Latn-CI",
         "lda-CI": "lda-Latn-CI",
         "lda-Latn": "lda-Latn-CI",
-        "ldb": "ldb-Latn-ZZ",
-        "ldb-Latn": "ldb-Latn-ZZ",
-        "ldb-ZZ": "ldb-Latn-ZZ",
+        "ldb": "ldb-Latn-NG",
+        "ldb-Latn": "ldb-Latn-NG",
+        "ldb-NG": "ldb-Latn-NG",
         "ldd": "ldd-Latn-NG",
         "ldd-Latn": "ldd-Latn-NG",
         "ldd-NG": "ldd-Latn-NG",
@@ -11071,12 +11047,12 @@
         "lec": "lec-Latn-BO",
         "lec-BO": "lec-Latn-BO",
         "lec-Latn": "lec-Latn-BO",
-        "led": "led-Latn-ZZ",
-        "led-Latn": "led-Latn-ZZ",
-        "led-ZZ": "led-Latn-ZZ",
-        "lee": "lee-Latn-ZZ",
-        "lee-Latn": "lee-Latn-ZZ",
-        "lee-ZZ": "lee-Latn-ZZ",
+        "led": "led-Latn-CD",
+        "led-CD": "led-Latn-CD",
+        "led-Latn": "led-Latn-CD",
+        "lee": "lee-Latn-BF",
+        "lee-BF": "lee-Latn-BF",
+        "lee-Latn": "lee-Latn-BF",
         "lef": "lef-Latn-GH",
         "lef-GH": "lef-Latn-GH",
         "lef-Latn": "lef-Latn-GH",
@@ -11095,9 +11071,9 @@
         "lel": "lel-Latn-CD",
         "lel-CD": "lel-Latn-CD",
         "lel-Latn": "lel-Latn-CD",
-        "lem": "lem-Latn-ZZ",
-        "lem-Latn": "lem-Latn-ZZ",
-        "lem-ZZ": "lem-Latn-ZZ",
+        "lem": "lem-Latn-CM",
+        "lem-CM": "lem-Latn-CM",
+        "lem-Latn": "lem-Latn-CM",
         "len": "len-Latn-HN",
         "len-HN": "len-Latn-HN",
         "len-Latn": "len-Latn-HN",
@@ -11107,9 +11083,9 @@
         "lep": "lep-Lepc-IN",
         "lep-IN": "lep-Lepc-IN",
         "lep-Lepc": "lep-Lepc-IN",
-        "leq": "leq-Latn-ZZ",
-        "leq-Latn": "leq-Latn-ZZ",
-        "leq-ZZ": "leq-Latn-ZZ",
+        "leq": "leq-Latn-PG",
+        "leq-Latn": "leq-Latn-PG",
+        "leq-PG": "leq-Latn-PG",
         "ler": "ler-Latn-PG",
         "ler-Latn": "ler-Latn-PG",
         "ler-PG": "ler-Latn-PG",
@@ -11119,9 +11095,9 @@
         "let": "let-Latn-PG",
         "let-Latn": "let-Latn-PG",
         "let-PG": "let-Latn-PG",
-        "leu": "leu-Latn-ZZ",
-        "leu-Latn": "leu-Latn-ZZ",
-        "leu-ZZ": "leu-Latn-ZZ",
+        "leu": "leu-Latn-PG",
+        "leu-Latn": "leu-Latn-PG",
+        "leu-PG": "leu-Latn-PG",
         "lev": "lev-Latn-ID",
         "lev-ID": "lev-Latn-ID",
         "lev-Latn": "lev-Latn-ID",
@@ -11153,9 +11129,10 @@
         "lgb": "lgb-Latn-SB",
         "lgb-Latn": "lgb-Latn-SB",
         "lgb-SB": "lgb-Latn-SB",
-        "lgg": "lgg-Latn-ZZ",
-        "lgg-Latn": "lgg-Latn-ZZ",
-        "lgg-ZZ": "lgg-Latn-ZZ",
+        "lgg": "lgg-Latn-UG",
+        "lgg-Arab": "lgg-Arab-UG",
+        "lgg-Latn": "lgg-Latn-UG",
+        "lgg-UG": "lgg-Latn-UG",
         "lgh": "lgh-Latn-VN",
         "lgh-Latn": "lgh-Latn-VN",
         "lgh-VN": "lgh-Latn-VN",
@@ -11219,18 +11196,18 @@
         "li": "li-Latn-NL",
         "li-Latn": "li-Latn-NL",
         "li-NL": "li-Latn-NL",
-        "lia": "lia-Latn-ZZ",
-        "lia-Latn": "lia-Latn-ZZ",
-        "lia-ZZ": "lia-Latn-ZZ",
+        "lia": "lia-Latn-SL",
+        "lia-Latn": "lia-Latn-SL",
+        "lia-SL": "lia-Latn-SL",
         "lib": "lib-Latn-PG",
         "lib-Latn": "lib-Latn-PG",
         "lib-PG": "lib-Latn-PG",
         "lic": "lic-Latn-CN",
         "lic-CN": "lic-Latn-CN",
         "lic-Latn": "lic-Latn-CN",
-        "lid": "lid-Latn-ZZ",
-        "lid-Latn": "lid-Latn-ZZ",
-        "lid-ZZ": "lid-Latn-ZZ",
+        "lid": "lid-Latn-PG",
+        "lid-Latn": "lid-Latn-PG",
+        "lid-PG": "lid-Latn-PG",
         "lie": "lie-Latn-CD",
         "lie-CD": "lie-Latn-CD",
         "lie-Latn": "lie-Latn-CD",
@@ -11238,12 +11215,12 @@
         "lif-Deva": "lif-Deva-NP",
         "lif-Limb": "lif-Limb-IN",
         "lif-NP": "lif-Deva-NP",
-        "lig": "lig-Latn-ZZ",
-        "lig-Latn": "lig-Latn-ZZ",
-        "lig-ZZ": "lig-Latn-ZZ",
-        "lih": "lih-Latn-ZZ",
-        "lih-Latn": "lih-Latn-ZZ",
-        "lih-ZZ": "lih-Latn-ZZ",
+        "lig": "lig-Latn-GH",
+        "lig-GH": "lig-Latn-GH",
+        "lig-Latn": "lig-Latn-GH",
+        "lih": "lih-Latn-PG",
+        "lih-Latn": "lih-Latn-PG",
+        "lih-PG": "lih-Latn-PG",
         "lij": "lij-Latn-IT",
         "lij-IT": "lij-Latn-IT",
         "lij-Latn": "lij-Latn-IT",
@@ -11370,9 +11347,9 @@
         "lld": "lld-Latn-IT",
         "lld-IT": "lld-Latn-IT",
         "lld-Latn": "lld-Latn-IT",
-        "lle": "lle-Latn-ZZ",
-        "lle-Latn": "lle-Latn-ZZ",
-        "lle-ZZ": "lle-Latn-ZZ",
+        "lle": "lle-Latn-PG",
+        "lle-Latn": "lle-Latn-PG",
+        "lle-PG": "lle-Latn-PG",
         "llf": "llf-Latn-PG",
         "llf-Latn": "llf-Latn-PG",
         "llf-PG": "llf-Latn-PG",
@@ -11394,9 +11371,9 @@
         "llm": "llm-Latn-ID",
         "llm-ID": "llm-Latn-ID",
         "llm-Latn": "llm-Latn-ID",
-        "lln": "lln-Latn-ZZ",
-        "lln-Latn": "lln-Latn-ZZ",
-        "lln-ZZ": "lln-Latn-ZZ",
+        "lln": "lln-Latn-TD",
+        "lln-Latn": "lln-Latn-TD",
+        "lln-TD": "lln-Latn-TD",
         "llp": "llp-Latn-VU",
         "llp-Latn": "llp-Latn-VU",
         "llp-VU": "llp-Latn-VU",
@@ -11452,9 +11429,9 @@
         "lmo": "lmo-Latn-IT",
         "lmo-IT": "lmo-Latn-IT",
         "lmo-Latn": "lmo-Latn-IT",
-        "lmp": "lmp-Latn-ZZ",
-        "lmp-Latn": "lmp-Latn-ZZ",
-        "lmp-ZZ": "lmp-Latn-ZZ",
+        "lmp": "lmp-Latn-CM",
+        "lmp-CM": "lmp-Latn-CM",
+        "lmp-Latn": "lmp-Latn-CM",
         "lmq": "lmq-Latn-ID",
         "lmq-ID": "lmq-Latn-ID",
         "lmq-Latn": "lmq-Latn-ID",
@@ -11506,12 +11483,12 @@
         "lnn": "lnn-Latn-VU",
         "lnn-Latn": "lnn-Latn-VU",
         "lnn-VU": "lnn-Latn-VU",
-        "lns": "lns-Latn-ZZ",
-        "lns-Latn": "lns-Latn-ZZ",
-        "lns-ZZ": "lns-Latn-ZZ",
-        "lnu": "lnu-Latn-ZZ",
-        "lnu-Latn": "lnu-Latn-ZZ",
-        "lnu-ZZ": "lnu-Latn-ZZ",
+        "lns": "lns-Latn-CM",
+        "lns-CM": "lns-Latn-CM",
+        "lns-Latn": "lns-Latn-CM",
+        "lnu": "lnu-Latn-NG",
+        "lnu-Latn": "lnu-Latn-NG",
+        "lnu-NG": "lnu-Latn-NG",
         "lnw": "lnw-Latn-AU",
         "lnw-AU": "lnw-Latn-AU",
         "lnw-Latn": "lnw-Latn-AU",
@@ -11542,12 +11519,12 @@
         "loi": "loi-Latn-CI",
         "loi-CI": "loi-Latn-CI",
         "loi-Latn": "loi-Latn-CI",
-        "loj": "loj-Latn-ZZ",
-        "loj-Latn": "loj-Latn-ZZ",
-        "loj-ZZ": "loj-Latn-ZZ",
-        "lok": "lok-Latn-ZZ",
-        "lok-Latn": "lok-Latn-ZZ",
-        "lok-ZZ": "lok-Latn-ZZ",
+        "loj": "loj-Latn-PG",
+        "loj-Latn": "loj-Latn-PG",
+        "loj-PG": "loj-Latn-PG",
+        "lok": "lok-Latn-SL",
+        "lok-Latn": "lok-Latn-SL",
+        "lok-SL": "lok-Latn-SL",
         "lol": "lol-Latn-CD",
         "lol-CD": "lol-Latn-CD",
         "lol-Latn": "lol-Latn-CD",
@@ -11566,12 +11543,12 @@
         "loq": "loq-Latn-CD",
         "loq-CD": "loq-Latn-CD",
         "loq-Latn": "loq-Latn-CD",
-        "lor": "lor-Latn-ZZ",
-        "lor-Latn": "lor-Latn-ZZ",
-        "lor-ZZ": "lor-Latn-ZZ",
-        "los": "los-Latn-ZZ",
-        "los-Latn": "los-Latn-ZZ",
-        "los-ZZ": "los-Latn-ZZ",
+        "lor": "lor-Latn-CI",
+        "lor-CI": "lor-Latn-CI",
+        "lor-Latn": "lor-Latn-CI",
+        "los": "los-Latn-PG",
+        "los-Latn": "los-Latn-PG",
+        "los-PG": "los-Latn-PG",
         "lot": "lot-Latn-SS",
         "lot-Arab": "lot-Arab-SS",
         "lot-Latn": "lot-Latn-SS",
@@ -11877,9 +11854,10 @@
         "mav": "mav-Latn-BR",
         "mav-BR": "mav-Latn-BR",
         "mav-Latn": "mav-Latn-BR",
-        "maw": "maw-Latn-ZZ",
-        "maw-Latn": "maw-Latn-ZZ",
-        "maw-ZZ": "maw-Latn-ZZ",
+        "maw": "maw-Latn-GH",
+        "maw-Arab": "maw-Arab-GH",
+        "maw-GH": "maw-Latn-GH",
+        "maw-Latn": "maw-Latn-GH",
         "max": "max-Latn-ID",
         "max-ID": "max-Latn-ID",
         "max-Latn": "max-Latn-ID",
@@ -11901,9 +11879,9 @@
         "mbf": "mbf-Latn-SG",
         "mbf-Latn": "mbf-Latn-SG",
         "mbf-SG": "mbf-Latn-SG",
-        "mbh": "mbh-Latn-ZZ",
-        "mbh-Latn": "mbh-Latn-ZZ",
-        "mbh-ZZ": "mbh-Latn-ZZ",
+        "mbh": "mbh-Latn-PG",
+        "mbh-Latn": "mbh-Latn-PG",
+        "mbh-PG": "mbh-Latn-PG",
         "mbi": "mbi-Latn-PH",
         "mbi-Latn": "mbi-Latn-PH",
         "mbi-PH": "mbi-Latn-PH",
@@ -11922,15 +11900,15 @@
         "mbn": "mbn-Latn-CO",
         "mbn-CO": "mbn-Latn-CO",
         "mbn-Latn": "mbn-Latn-CO",
-        "mbo": "mbo-Latn-ZZ",
-        "mbo-Latn": "mbo-Latn-ZZ",
-        "mbo-ZZ": "mbo-Latn-ZZ",
+        "mbo": "mbo-Latn-CM",
+        "mbo-CM": "mbo-Latn-CM",
+        "mbo-Latn": "mbo-Latn-CM",
         "mbp": "mbp-Latn-CO",
         "mbp-CO": "mbp-Latn-CO",
         "mbp-Latn": "mbp-Latn-CO",
-        "mbq": "mbq-Latn-ZZ",
-        "mbq-Latn": "mbq-Latn-ZZ",
-        "mbq-ZZ": "mbq-Latn-ZZ",
+        "mbq": "mbq-Latn-PG",
+        "mbq-Latn": "mbq-Latn-PG",
+        "mbq-PG": "mbq-Latn-PG",
         "mbr": "mbr-Latn-CO",
         "mbr-CO": "mbr-Latn-CO",
         "mbr-Latn": "mbr-Latn-CO",
@@ -11940,15 +11918,15 @@
         "mbt": "mbt-Latn-PH",
         "mbt-Latn": "mbt-Latn-PH",
         "mbt-PH": "mbt-Latn-PH",
-        "mbu": "mbu-Latn-ZZ",
-        "mbu-Latn": "mbu-Latn-ZZ",
-        "mbu-ZZ": "mbu-Latn-ZZ",
+        "mbu": "mbu-Latn-NG",
+        "mbu-Latn": "mbu-Latn-NG",
+        "mbu-NG": "mbu-Latn-NG",
         "mbv": "mbv-Latn-GN",
         "mbv-GN": "mbv-Latn-GN",
         "mbv-Latn": "mbv-Latn-GN",
-        "mbw": "mbw-Latn-ZZ",
-        "mbw-Latn": "mbw-Latn-ZZ",
-        "mbw-ZZ": "mbw-Latn-ZZ",
+        "mbw": "mbw-Latn-PG",
+        "mbw-Latn": "mbw-Latn-PG",
+        "mbw-PG": "mbw-Latn-PG",
         "mbx": "mbx-Latn-PG",
         "mbx-Latn": "mbx-Latn-PG",
         "mbx-PG": "mbx-Latn-PG",
@@ -11982,9 +11960,9 @@
         "mch": "mch-Latn-VE",
         "mch-Latn": "mch-Latn-VE",
         "mch-VE": "mch-Latn-VE",
-        "mci": "mci-Latn-ZZ",
-        "mci-Latn": "mci-Latn-ZZ",
-        "mci-ZZ": "mci-Latn-ZZ",
+        "mci": "mci-Latn-PG",
+        "mci-Latn": "mci-Latn-PG",
+        "mci-PG": "mci-Latn-PG",
         "mcj": "mcj-Latn-NG",
         "mcj-Latn": "mcj-Latn-NG",
         "mcj-NG": "mcj-Latn-NG",
@@ -12003,24 +11981,24 @@
         "mco": "mco-Latn-MX",
         "mco-Latn": "mco-Latn-MX",
         "mco-MX": "mco-Latn-MX",
-        "mcp": "mcp-Latn-ZZ",
-        "mcp-Latn": "mcp-Latn-ZZ",
-        "mcp-ZZ": "mcp-Latn-ZZ",
-        "mcq": "mcq-Latn-ZZ",
-        "mcq-Latn": "mcq-Latn-ZZ",
-        "mcq-ZZ": "mcq-Latn-ZZ",
-        "mcr": "mcr-Latn-ZZ",
-        "mcr-Latn": "mcr-Latn-ZZ",
-        "mcr-ZZ": "mcr-Latn-ZZ",
+        "mcp": "mcp-Latn-CM",
+        "mcp-CM": "mcp-Latn-CM",
+        "mcp-Latn": "mcp-Latn-CM",
+        "mcq": "mcq-Latn-PG",
+        "mcq-Latn": "mcq-Latn-PG",
+        "mcq-PG": "mcq-Latn-PG",
+        "mcr": "mcr-Latn-PG",
+        "mcr-Latn": "mcr-Latn-PG",
+        "mcr-PG": "mcr-Latn-PG",
         "mcs": "mcs-Latn-CM",
         "mcs-CM": "mcs-Latn-CM",
         "mcs-Latn": "mcs-Latn-CM",
         "mct": "mct-Latn-CM",
         "mct-CM": "mct-Latn-CM",
         "mct-Latn": "mct-Latn-CM",
-        "mcu": "mcu-Latn-ZZ",
-        "mcu-Latn": "mcu-Latn-ZZ",
-        "mcu-ZZ": "mcu-Latn-ZZ",
+        "mcu": "mcu-Latn-CM",
+        "mcu-CM": "mcu-Latn-CM",
+        "mcu-Latn": "mcu-Latn-CM",
         "mcv": "mcv-Latn-PG",
         "mcv-Latn": "mcv-Latn-PG",
         "mcv-PG": "mcv-Latn-PG",
@@ -12036,9 +12014,9 @@
         "mcz": "mcz-Latn-PG",
         "mcz-Latn": "mcz-Latn-PG",
         "mcz-PG": "mcz-Latn-PG",
-        "mda": "mda-Latn-ZZ",
-        "mda-Latn": "mda-Latn-ZZ",
-        "mda-ZZ": "mda-Latn-ZZ",
+        "mda": "mda-Latn-NG",
+        "mda-Latn": "mda-Latn-NG",
+        "mda-NG": "mda-Latn-NG",
         "mdb": "mdb-Latn-PG",
         "mdb-Latn": "mdb-Latn-PG",
         "mdb-PG": "mdb-Latn-PG",
@@ -12048,9 +12026,10 @@
         "mdd": "mdd-Latn-CM",
         "mdd-CM": "mdd-Latn-CM",
         "mdd-Latn": "mdd-Latn-CM",
-        "mde": "mde-Arab-ZZ",
-        "mde-Arab": "mde-Arab-ZZ",
-        "mde-ZZ": "mde-Arab-ZZ",
+        "mde": "mde-Arab-TD",
+        "mde-Arab": "mde-Arab-TD",
+        "mde-Latn": "mde-Latn-TD",
+        "mde-TD": "mde-Arab-TD",
         "mdf": "mdf-Cyrl-RU",
         "mdf-Cyrl": "mdf-Cyrl-RU",
         "mdf-RU": "mdf-Cyrl-RU",
@@ -12063,9 +12042,9 @@
         "mdi": "mdi-Latn-CD",
         "mdi-CD": "mdi-Latn-CD",
         "mdi-Latn": "mdi-Latn-CD",
-        "mdj": "mdj-Latn-ZZ",
-        "mdj-Latn": "mdj-Latn-ZZ",
-        "mdj-ZZ": "mdj-Latn-ZZ",
+        "mdj": "mdj-Latn-CD",
+        "mdj-CD": "mdj-Latn-CD",
+        "mdj-Latn": "mdj-Latn-CD",
         "mdk": "mdk-Latn-CD",
         "mdk-CD": "mdk-Latn-CD",
         "mdk-Latn": "mdk-Latn-CD",
@@ -12099,9 +12078,10 @@
         "mdw": "mdw-Latn-CG",
         "mdw-CG": "mdw-Latn-CG",
         "mdw-Latn": "mdw-Latn-CG",
-        "mdx": "mdx-Ethi-ZZ",
-        "mdx-Ethi": "mdx-Ethi-ZZ",
-        "mdx-ZZ": "mdx-Ethi-ZZ",
+        "mdx": "mdx-Ethi-ET",
+        "mdx-ET": "mdx-Ethi-ET",
+        "mdx-Ethi": "mdx-Ethi-ET",
+        "mdx-Latn": "mdx-Latn-ET",
         "mdy": "mdy-Ethi-ET",
         "mdy-ET": "mdy-Ethi-ET",
         "mdy-Ethi": "mdy-Ethi-ET",
@@ -12118,21 +12098,21 @@
         "mec": "mec-Latn-AU",
         "mec-AU": "mec-Latn-AU",
         "mec-Latn": "mec-Latn-AU",
-        "med": "med-Latn-ZZ",
-        "med-Latn": "med-Latn-ZZ",
-        "med-ZZ": "med-Latn-ZZ",
-        "mee": "mee-Latn-ZZ",
-        "mee-Latn": "mee-Latn-ZZ",
-        "mee-ZZ": "mee-Latn-ZZ",
+        "med": "med-Latn-PG",
+        "med-Latn": "med-Latn-PG",
+        "med-PG": "med-Latn-PG",
+        "mee": "mee-Latn-PG",
+        "mee-Latn": "mee-Latn-PG",
+        "mee-PG": "mee-Latn-PG",
         "meh": "meh-Latn-MX",
         "meh-Latn": "meh-Latn-MX",
         "meh-MX": "meh-Latn-MX",
         "mej": "mej-Latn-ID",
         "mej-ID": "mej-Latn-ID",
         "mej-Latn": "mej-Latn-ID",
-        "mek": "mek-Latn-ZZ",
-        "mek-Latn": "mek-Latn-ZZ",
-        "mek-ZZ": "mek-Latn-ZZ",
+        "mek": "mek-Latn-PG",
+        "mek-Latn": "mek-Latn-PG",
+        "mek-PG": "mek-Latn-PG",
         "mel": "mel-Latn-MY",
         "mel-Latn": "mel-Latn-MY",
         "mel-MY": "mel-Latn-MY",
@@ -12158,12 +12138,12 @@
         "mes": "mes-Latn-TD",
         "mes-Latn": "mes-Latn-TD",
         "mes-TD": "mes-Latn-TD",
-        "met": "met-Latn-ZZ",
-        "met-Latn": "met-Latn-ZZ",
-        "met-ZZ": "met-Latn-ZZ",
-        "meu": "meu-Latn-ZZ",
-        "meu-Latn": "meu-Latn-ZZ",
-        "meu-ZZ": "meu-Latn-ZZ",
+        "met": "met-Latn-PG",
+        "met-Latn": "met-Latn-PG",
+        "met-PG": "met-Latn-PG",
+        "meu": "meu-Latn-PG",
+        "meu-Latn": "meu-Latn-PG",
+        "meu-PG": "meu-Latn-PG",
         "mev": "mev-Latn-LR",
         "mev-LR": "mev-Latn-LR",
         "mev-Latn": "mev-Latn-LR",
@@ -12218,18 +12198,18 @@
         "mfm": "mfm-Latn-NG",
         "mfm-Latn": "mfm-Latn-NG",
         "mfm-NG": "mfm-Latn-NG",
-        "mfn": "mfn-Latn-ZZ",
-        "mfn-Latn": "mfn-Latn-ZZ",
-        "mfn-ZZ": "mfn-Latn-ZZ",
-        "mfo": "mfo-Latn-ZZ",
-        "mfo-Latn": "mfo-Latn-ZZ",
-        "mfo-ZZ": "mfo-Latn-ZZ",
+        "mfn": "mfn-Latn-NG",
+        "mfn-Latn": "mfn-Latn-NG",
+        "mfn-NG": "mfn-Latn-NG",
+        "mfo": "mfo-Latn-NG",
+        "mfo-Latn": "mfo-Latn-NG",
+        "mfo-NG": "mfo-Latn-NG",
         "mfp": "mfp-Latn-ID",
         "mfp-ID": "mfp-Latn-ID",
         "mfp-Latn": "mfp-Latn-ID",
-        "mfq": "mfq-Latn-ZZ",
-        "mfq-Latn": "mfq-Latn-ZZ",
-        "mfq-ZZ": "mfq-Latn-ZZ",
+        "mfq": "mfq-Latn-TG",
+        "mfq-Latn": "mfq-Latn-TG",
+        "mfq-TG": "mfq-Latn-TG",
         "mfr": "mfr-Latn-AU",
         "mfr-AU": "mfr-Latn-AU",
         "mfr-Latn": "mfr-Latn-AU",
@@ -12289,9 +12269,9 @@
         "mgk": "mgk-Latn-ID",
         "mgk-ID": "mgk-Latn-ID",
         "mgk-Latn": "mgk-Latn-ID",
-        "mgl": "mgl-Latn-ZZ",
-        "mgl-Latn": "mgl-Latn-ZZ",
-        "mgl-ZZ": "mgl-Latn-ZZ",
+        "mgl": "mgl-Latn-PG",
+        "mgl-Latn": "mgl-Latn-PG",
+        "mgl-PG": "mgl-Latn-PG",
         "mgm": "mgm-Latn-TL",
         "mgm-Latn": "mgm-Latn-TL",
         "mgm-TL": "mgm-Latn-TL",
@@ -12352,18 +12332,18 @@
         "mhg": "mhg-Latn-AU",
         "mhg-AU": "mhg-Latn-AU",
         "mhg-Latn": "mhg-Latn-AU",
-        "mhi": "mhi-Latn-ZZ",
-        "mhi-Latn": "mhi-Latn-ZZ",
-        "mhi-ZZ": "mhi-Latn-ZZ",
+        "mhi": "mhi-Latn-UG",
+        "mhi-Latn": "mhi-Latn-UG",
+        "mhi-UG": "mhi-Latn-UG",
         "mhj": "mhj-Arab-AF",
         "mhj-AF": "mhj-Arab-AF",
         "mhj-Arab": "mhj-Arab-AF",
         "mhk": "mhk-Latn-CM",
         "mhk-CM": "mhk-Latn-CM",
         "mhk-Latn": "mhk-Latn-CM",
-        "mhl": "mhl-Latn-ZZ",
-        "mhl-Latn": "mhl-Latn-ZZ",
-        "mhl-ZZ": "mhl-Latn-ZZ",
+        "mhl": "mhl-Latn-PG",
+        "mhl-Latn": "mhl-Latn-PG",
+        "mhl-PG": "mhl-Latn-PG",
         "mhm": "mhm-Latn-MZ",
         "mhm-Latn": "mhm-Latn-MZ",
         "mhm-MZ": "mhm-Latn-MZ",
@@ -12418,9 +12398,9 @@
         "mie": "mie-Latn-MX",
         "mie-Latn": "mie-Latn-MX",
         "mie-MX": "mie-Latn-MX",
-        "mif": "mif-Latn-ZZ",
-        "mif-Latn": "mif-Latn-ZZ",
-        "mif-ZZ": "mif-Latn-ZZ",
+        "mif": "mif-Latn-CM",
+        "mif-CM": "mif-Latn-CM",
+        "mif-Latn": "mif-Latn-CM",
         "mig": "mig-Latn-MX",
         "mig-Latn": "mig-Latn-MX",
         "mig-MX": "mig-Latn-MX",
@@ -12463,9 +12443,9 @@
         "miu": "miu-Latn-MX",
         "miu-Latn": "miu-Latn-MX",
         "miu-MX": "miu-Latn-MX",
-        "miw": "miw-Latn-ZZ",
-        "miw-Latn": "miw-Latn-ZZ",
-        "miw-ZZ": "miw-Latn-ZZ",
+        "miw": "miw-Latn-PG",
+        "miw-Latn": "miw-Latn-PG",
+        "miw-PG": "miw-Latn-PG",
         "mix": "mix-Latn-MX",
         "mix-Latn": "mix-Latn-MX",
         "mix-MX": "mix-Latn-MX",
@@ -12562,18 +12542,19 @@
         "mkf": "mkf-Latn-NG",
         "mkf-Latn": "mkf-Latn-NG",
         "mkf-NG": "mkf-Latn-NG",
-        "mki": "mki-Arab-ZZ",
-        "mki-Arab": "mki-Arab-ZZ",
-        "mki-ZZ": "mki-Arab-ZZ",
+        "mki": "mki-Arab-PK",
+        "mki-Arab": "mki-Arab-PK",
+        "mki-Deva": "mki-Deva-IN",
+        "mki-PK": "mki-Arab-PK",
         "mkj": "mkj-Latn-FM",
         "mkj-FM": "mkj-Latn-FM",
         "mkj-Latn": "mkj-Latn-FM",
         "mkk": "mkk-Latn-CM",
         "mkk-CM": "mkk-Latn-CM",
         "mkk-Latn": "mkk-Latn-CM",
-        "mkl": "mkl-Latn-ZZ",
-        "mkl-Latn": "mkl-Latn-ZZ",
-        "mkl-ZZ": "mkl-Latn-ZZ",
+        "mkl": "mkl-Latn-BJ",
+        "mkl-BJ": "mkl-Latn-BJ",
+        "mkl-Latn": "mkl-Latn-BJ",
         "mkm": "mkm-Thai-TH",
         "mkm-TH": "mkm-Thai-TH",
         "mkm-Thai": "mkm-Thai-TH",
@@ -12583,9 +12564,9 @@
         "mko": "mko-Latn-NG",
         "mko-Latn": "mko-Latn-NG",
         "mko-NG": "mko-Latn-NG",
-        "mkp": "mkp-Latn-ZZ",
-        "mkp-Latn": "mkp-Latn-ZZ",
-        "mkp-ZZ": "mkp-Latn-ZZ",
+        "mkp": "mkp-Latn-PG",
+        "mkp-Latn": "mkp-Latn-PG",
+        "mkp-PG": "mkp-Latn-PG",
         "mkr": "mkr-Latn-PG",
         "mkr-Latn": "mkr-Latn-PG",
         "mkr-PG": "mkr-Latn-PG",
@@ -12601,9 +12582,9 @@
         "mkv": "mkv-Latn-VU",
         "mkv-Latn": "mkv-Latn-VU",
         "mkv-VU": "mkv-Latn-VU",
-        "mkw": "mkw-Latn-ZZ",
-        "mkw-Latn": "mkw-Latn-ZZ",
-        "mkw-ZZ": "mkw-Latn-ZZ",
+        "mkw": "mkw-Latn-CG",
+        "mkw-CG": "mkw-Latn-CG",
+        "mkw-Latn": "mkw-Latn-CG",
         "mkx": "mkx-Latn-PH",
         "mkx-Latn": "mkx-Latn-PH",
         "mkx-PH": "mkx-Latn-PH",
@@ -12626,9 +12607,9 @@
         "mlc": "mlc-Latn-VN",
         "mlc-Latn": "mlc-Latn-VN",
         "mlc-VN": "mlc-Latn-VN",
-        "mle": "mle-Latn-ZZ",
-        "mle-Latn": "mle-Latn-ZZ",
-        "mle-ZZ": "mle-Latn-ZZ",
+        "mle": "mle-Latn-PG",
+        "mle-Latn": "mle-Latn-PG",
+        "mle-PG": "mle-Latn-PG",
         "mlf": "mlf-Thai-LA",
         "mlf-LA": "mlf-Thai-LA",
         "mlf-Latn": "mlf-Latn-LA",
@@ -12654,9 +12635,9 @@
         "mlo": "mlo-Latn-SN",
         "mlo-Latn": "mlo-Latn-SN",
         "mlo-SN": "mlo-Latn-SN",
-        "mlp": "mlp-Latn-ZZ",
-        "mlp-Latn": "mlp-Latn-ZZ",
-        "mlp-ZZ": "mlp-Latn-ZZ",
+        "mlp": "mlp-Latn-PG",
+        "mlp-Latn": "mlp-Latn-PG",
+        "mlp-PG": "mlp-Latn-PG",
         "mlq": "mlq-Latn-SN",
         "mlq-Arab": "mlq-Arab-SN",
         "mlq-Latn": "mlq-Latn-SN",
@@ -12717,9 +12698,9 @@
         "mmn": "mmn-Latn-PH",
         "mmn-Latn": "mmn-Latn-PH",
         "mmn-PH": "mmn-Latn-PH",
-        "mmo": "mmo-Latn-ZZ",
-        "mmo-Latn": "mmo-Latn-ZZ",
-        "mmo-ZZ": "mmo-Latn-ZZ",
+        "mmo": "mmo-Latn-PG",
+        "mmo-Latn": "mmo-Latn-PG",
+        "mmo-PG": "mmo-Latn-PG",
         "mmp": "mmp-Latn-PG",
         "mmp-Latn": "mmp-Latn-PG",
         "mmp-PG": "mmp-Latn-PG",
@@ -12732,18 +12713,18 @@
         "mmt": "mmt-Latn-PG",
         "mmt-Latn": "mmt-Latn-PG",
         "mmt-PG": "mmt-Latn-PG",
-        "mmu": "mmu-Latn-ZZ",
-        "mmu-Latn": "mmu-Latn-ZZ",
-        "mmu-ZZ": "mmu-Latn-ZZ",
+        "mmu": "mmu-Latn-CM",
+        "mmu-CM": "mmu-Latn-CM",
+        "mmu-Latn": "mmu-Latn-CM",
         "mmv": "mmv-Latn-BR",
         "mmv-BR": "mmv-Latn-BR",
         "mmv-Latn": "mmv-Latn-BR",
         "mmw": "mmw-Latn-VU",
         "mmw-Latn": "mmw-Latn-VU",
         "mmw-VU": "mmw-Latn-VU",
-        "mmx": "mmx-Latn-ZZ",
-        "mmx-Latn": "mmx-Latn-ZZ",
-        "mmx-ZZ": "mmx-Latn-ZZ",
+        "mmx": "mmx-Latn-PG",
+        "mmx-Latn": "mmx-Latn-PG",
+        "mmx-PG": "mmx-Latn-PG",
         "mmy": "mmy-Latn-TD",
         "mmy-Latn": "mmy-Latn-TD",
         "mmy-TD": "mmy-Latn-TD",
@@ -12755,9 +12736,9 @@
         "mn-Cyrl": "mn-Cyrl-MN",
         "mn-MN": "mn-Cyrl-MN",
         "mn-Mong": "mn-Mong-CN",
-        "mna": "mna-Latn-ZZ",
-        "mna-Latn": "mna-Latn-ZZ",
-        "mna-ZZ": "mna-Latn-ZZ",
+        "mna": "mna-Latn-PG",
+        "mna-Latn": "mna-Latn-PG",
+        "mna-PG": "mna-Latn-PG",
         "mnb": "mnb-Latn-ID",
         "mnb-ID": "mnb-Latn-ID",
         "mnb-Latn": "mnb-Latn-ID",
@@ -12767,9 +12748,9 @@
         "mne": "mne-Latn-TD",
         "mne-Latn": "mne-Latn-TD",
         "mne-TD": "mne-Latn-TD",
-        "mnf": "mnf-Latn-ZZ",
-        "mnf-Latn": "mnf-Latn-ZZ",
-        "mnf-ZZ": "mnf-Latn-ZZ",
+        "mnf": "mnf-Latn-CM",
+        "mnf-CM": "mnf-Latn-CM",
+        "mnf-Latn": "mnf-Latn-CM",
         "mng": "mng-Latn-VN",
         "mng-Latn": "mng-Latn-VN",
         "mng-VN": "mng-Latn-VN",
@@ -12824,9 +12805,9 @@
         "mo": "mo-Latn-RO",
         "mo-Latn": "mo-Latn-RO",
         "mo-RO": "mo-Latn-RO",
-        "moa": "moa-Latn-ZZ",
-        "moa-Latn": "moa-Latn-ZZ",
-        "moa-ZZ": "moa-Latn-ZZ",
+        "moa": "moa-Latn-CI",
+        "moa-CI": "moa-Latn-CI",
+        "moa-Latn": "moa-Latn-CI",
         "moc": "moc-Latn-AR",
         "moc-AR": "moc-Latn-AR",
         "moc-Latn": "moc-Latn-AR",
@@ -12881,9 +12862,9 @@
         "mow": "mow-Latn-CG",
         "mow-CG": "mow-Latn-CG",
         "mow-Latn": "mow-Latn-CG",
-        "mox": "mox-Latn-ZZ",
-        "mox-Latn": "mox-Latn-ZZ",
-        "mox-ZZ": "mox-Latn-ZZ",
+        "mox": "mox-Latn-PG",
+        "mox-Latn": "mox-Latn-PG",
+        "mox-PG": "mox-Latn-PG",
         "moy": "moy-Latn-ET",
         "moy-ET": "moy-Latn-ET",
         "moy-Ethi": "moy-Ethi-ET",
@@ -12934,21 +12915,21 @@
         "mpo": "mpo-Latn-PG",
         "mpo-Latn": "mpo-Latn-PG",
         "mpo-PG": "mpo-Latn-PG",
-        "mpp": "mpp-Latn-ZZ",
-        "mpp-Latn": "mpp-Latn-ZZ",
-        "mpp-ZZ": "mpp-Latn-ZZ",
+        "mpp": "mpp-Latn-PG",
+        "mpp-Latn": "mpp-Latn-PG",
+        "mpp-PG": "mpp-Latn-PG",
         "mpq": "mpq-Latn-BR",
         "mpq-BR": "mpq-Latn-BR",
         "mpq-Latn": "mpq-Latn-BR",
         "mpr": "mpr-Latn-SB",
         "mpr-Latn": "mpr-Latn-SB",
         "mpr-SB": "mpr-Latn-SB",
-        "mps": "mps-Latn-ZZ",
-        "mps-Latn": "mps-Latn-ZZ",
-        "mps-ZZ": "mps-Latn-ZZ",
-        "mpt": "mpt-Latn-ZZ",
-        "mpt-Latn": "mpt-Latn-ZZ",
-        "mpt-ZZ": "mpt-Latn-ZZ",
+        "mps": "mps-Latn-PG",
+        "mps-Latn": "mps-Latn-PG",
+        "mps-PG": "mps-Latn-PG",
+        "mpt": "mpt-Latn-PG",
+        "mpt-Latn": "mpt-Latn-PG",
+        "mpt-PG": "mpt-Latn-PG",
         "mpu": "mpu-Latn-BR",
         "mpu-BR": "mpu-Latn-BR",
         "mpu-Latn": "mpu-Latn-BR",
@@ -12958,9 +12939,9 @@
         "mpw": "mpw-Latn-BR",
         "mpw-BR": "mpw-Latn-BR",
         "mpw-Latn": "mpw-Latn-BR",
-        "mpx": "mpx-Latn-ZZ",
-        "mpx-Latn": "mpx-Latn-ZZ",
-        "mpx-ZZ": "mpx-Latn-ZZ",
+        "mpx": "mpx-Latn-PG",
+        "mpx-Latn": "mpx-Latn-PG",
+        "mpx-PG": "mpx-Latn-PG",
         "mpy": "mpy-Latn-ID",
         "mpy-ID": "mpy-Latn-ID",
         "mpy-Latn": "mpy-Latn-ID",
@@ -12997,9 +12978,9 @@
         "mqk": "mqk-Latn-PH",
         "mqk-Latn": "mqk-Latn-PH",
         "mqk-PH": "mqk-Latn-PH",
-        "mql": "mql-Latn-ZZ",
-        "mql-Latn": "mql-Latn-ZZ",
-        "mql-ZZ": "mql-Latn-ZZ",
+        "mql": "mql-Latn-BJ",
+        "mql-BJ": "mql-Latn-BJ",
+        "mql-Latn": "mql-Latn-BJ",
         "mqm": "mqm-Latn-PF",
         "mqm-Latn": "mqm-Latn-PF",
         "mqm-PF": "mqm-Latn-PF",
@@ -13120,6 +13101,7 @@
         "mrz-ID": "mrz-Latn-ID",
         "mrz-Latn": "mrz-Latn-ID",
         "ms": "ms-Latn-MY",
+        "ms-Arab": "ms-Arab-CC",
         "ms-BN": "ms-Latn-BN",
         "ms-CC": "ms-Arab-CC",
         "ms-Latn": "ms-Latn-MY",
@@ -13200,27 +13182,27 @@
         "mtb": "mtb-Latn-CI",
         "mtb-CI": "mtb-Latn-CI",
         "mtb-Latn": "mtb-Latn-CI",
-        "mtc": "mtc-Latn-ZZ",
-        "mtc-Latn": "mtc-Latn-ZZ",
-        "mtc-ZZ": "mtc-Latn-ZZ",
+        "mtc": "mtc-Latn-PG",
+        "mtc-Latn": "mtc-Latn-PG",
+        "mtc-PG": "mtc-Latn-PG",
         "mtd": "mtd-Latn-ID",
         "mtd-ID": "mtd-Latn-ID",
         "mtd-Latn": "mtd-Latn-ID",
         "mte": "mte-Latn-SB",
         "mte-Latn": "mte-Latn-SB",
         "mte-SB": "mte-Latn-SB",
-        "mtf": "mtf-Latn-ZZ",
-        "mtf-Latn": "mtf-Latn-ZZ",
-        "mtf-ZZ": "mtf-Latn-ZZ",
+        "mtf": "mtf-Latn-PG",
+        "mtf-Latn": "mtf-Latn-PG",
+        "mtf-PG": "mtf-Latn-PG",
         "mtg": "mtg-Latn-ID",
         "mtg-ID": "mtg-Latn-ID",
         "mtg-Latn": "mtg-Latn-ID",
         "mth": "mth-Latn-ID",
         "mth-ID": "mth-Latn-ID",
         "mth-Latn": "mth-Latn-ID",
-        "mti": "mti-Latn-ZZ",
-        "mti-Latn": "mti-Latn-ZZ",
-        "mti-ZZ": "mti-Latn-ZZ",
+        "mti": "mti-Latn-PG",
+        "mti-Latn": "mti-Latn-PG",
+        "mti-PG": "mti-Latn-PG",
         "mtj": "mtj-Latn-ID",
         "mtj-ID": "mtj-Latn-ID",
         "mtj-Latn": "mtj-Latn-ID",
@@ -13308,9 +13290,10 @@
         "muq": "muq-Latn-CN",
         "muq-CN": "muq-Latn-CN",
         "muq-Latn": "muq-Latn-CN",
-        "mur": "mur-Latn-ZZ",
-        "mur-Latn": "mur-Latn-ZZ",
-        "mur-ZZ": "mur-Latn-ZZ",
+        "mur": "mur-Latn-SS",
+        "mur-Arab": "mur-Arab-SS",
+        "mur-Latn": "mur-Latn-SS",
+        "mur-SS": "mur-Latn-SS",
         "mus": "mus-Latn-US",
         "mus-Latn": "mus-Latn-US",
         "mus-US": "mus-Latn-US",
@@ -13333,9 +13316,9 @@
         "muz-ET": "muz-Ethi-ET",
         "muz-Ethi": "muz-Ethi-ET",
         "muz-Latn": "muz-Latn-ET",
-        "mva": "mva-Latn-ZZ",
-        "mva-Latn": "mva-Latn-ZZ",
-        "mva-ZZ": "mva-Latn-ZZ",
+        "mva": "mva-Latn-PG",
+        "mva-Latn": "mva-Latn-PG",
+        "mva-PG": "mva-Latn-PG",
         "mvd": "mvd-Latn-ID",
         "mvd-ID": "mvd-Latn-ID",
         "mvd-Latn": "mvd-Latn-ID",
@@ -13355,9 +13338,9 @@
         "mvl": "mvl-Latn-AU",
         "mvl-AU": "mvl-Latn-AU",
         "mvl-Latn": "mvl-Latn-AU",
-        "mvn": "mvn-Latn-ZZ",
-        "mvn-Latn": "mvn-Latn-ZZ",
-        "mvn-ZZ": "mvn-Latn-ZZ",
+        "mvn": "mvn-Latn-PG",
+        "mvn-Latn": "mvn-Latn-PG",
+        "mvn-PG": "mvn-Latn-PG",
         "mvo": "mvo-Latn-SB",
         "mvo-Latn": "mvo-Latn-SB",
         "mvo-SB": "mvo-Latn-SB",
@@ -13498,9 +13481,9 @@
         "mxl": "mxl-Latn-BJ",
         "mxl-BJ": "mxl-Latn-BJ",
         "mxl-Latn": "mxl-Latn-BJ",
-        "mxm": "mxm-Latn-ZZ",
-        "mxm-Latn": "mxm-Latn-ZZ",
-        "mxm-ZZ": "mxm-Latn-ZZ",
+        "mxm": "mxm-Latn-PG",
+        "mxm-Latn": "mxm-Latn-PG",
+        "mxm-PG": "mxm-Latn-PG",
         "mxn": "mxn-Latn-ID",
         "mxn-ID": "mxn-Latn-ID",
         "mxn-Latn": "mxn-Latn-ID",
@@ -13565,15 +13548,16 @@
         "myj": "myj-Latn-SS",
         "myj-Latn": "myj-Latn-SS",
         "myj-SS": "myj-Latn-SS",
-        "myk": "myk-Latn-ZZ",
-        "myk-Latn": "myk-Latn-ZZ",
-        "myk-ZZ": "myk-Latn-ZZ",
+        "myk": "myk-Latn-ML",
+        "myk-Latn": "myk-Latn-ML",
+        "myk-ML": "myk-Latn-ML",
         "myl": "myl-Latn-ID",
         "myl-ID": "myl-Latn-ID",
         "myl-Latn": "myl-Latn-ID",
-        "mym": "mym-Ethi-ZZ",
-        "mym-Ethi": "mym-Ethi-ZZ",
-        "mym-ZZ": "mym-Ethi-ZZ",
+        "mym": "mym-Ethi-ET",
+        "mym-ET": "mym-Ethi-ET",
+        "mym-Ethi": "mym-Ethi-ET",
+        "mym-Latn": "mym-Latn-ET",
         "myp": "myp-Latn-BR",
         "myp-BR": "myp-Latn-BR",
         "myp-Latn": "myp-Latn-BR",
@@ -13586,9 +13570,9 @@
         "myv": "myv-Cyrl-RU",
         "myv-Cyrl": "myv-Cyrl-RU",
         "myv-RU": "myv-Cyrl-RU",
-        "myw": "myw-Latn-ZZ",
-        "myw-Latn": "myw-Latn-ZZ",
-        "myw-ZZ": "myw-Latn-ZZ",
+        "myw": "myw-Latn-PG",
+        "myw-Latn": "myw-Latn-PG",
+        "myw-PG": "myw-Latn-PG",
         "myx": "myx-Latn-UG",
         "myx-Latn": "myx-Latn-UG",
         "myx-UG": "myx-Latn-UG",
@@ -13616,24 +13600,24 @@
         "mzj": "mzj-Latn-LR",
         "mzj-LR": "mzj-Latn-LR",
         "mzj-Latn": "mzj-Latn-LR",
-        "mzk": "mzk-Latn-ZZ",
-        "mzk-Latn": "mzk-Latn-ZZ",
-        "mzk-ZZ": "mzk-Latn-ZZ",
+        "mzk": "mzk-Latn-NG",
+        "mzk-Latn": "mzk-Latn-NG",
+        "mzk-NG": "mzk-Latn-NG",
         "mzl": "mzl-Latn-MX",
         "mzl-Latn": "mzl-Latn-MX",
         "mzl-MX": "mzl-Latn-MX",
-        "mzm": "mzm-Latn-ZZ",
-        "mzm-Latn": "mzm-Latn-ZZ",
-        "mzm-ZZ": "mzm-Latn-ZZ",
+        "mzm": "mzm-Latn-NG",
+        "mzm-Latn": "mzm-Latn-NG",
+        "mzm-NG": "mzm-Latn-NG",
         "mzn": "mzn-Arab-IR",
         "mzn-Arab": "mzn-Arab-IR",
         "mzn-IR": "mzn-Arab-IR",
         "mzo": "mzo-Latn-BR",
         "mzo-BR": "mzo-Latn-BR",
         "mzo-Latn": "mzo-Latn-BR",
-        "mzp": "mzp-Latn-ZZ",
-        "mzp-Latn": "mzp-Latn-ZZ",
-        "mzp-ZZ": "mzp-Latn-ZZ",
+        "mzp": "mzp-Latn-BO",
+        "mzp-BO": "mzp-Latn-BO",
+        "mzp-Latn": "mzp-Latn-BO",
         "mzq": "mzq-Latn-ID",
         "mzq-ID": "mzq-Latn-ID",
         "mzq-Latn": "mzq-Latn-ID",
@@ -13649,15 +13633,15 @@
         "mzv": "mzv-Latn-CF",
         "mzv-CF": "mzv-Latn-CF",
         "mzv-Latn": "mzv-Latn-CF",
-        "mzw": "mzw-Latn-ZZ",
-        "mzw-Latn": "mzw-Latn-ZZ",
-        "mzw-ZZ": "mzw-Latn-ZZ",
+        "mzw": "mzw-Latn-GH",
+        "mzw-GH": "mzw-Latn-GH",
+        "mzw-Latn": "mzw-Latn-GH",
         "mzx": "mzx-Latn-GY",
         "mzx-GY": "mzx-Latn-GY",
         "mzx-Latn": "mzx-Latn-GY",
-        "mzz": "mzz-Latn-ZZ",
-        "mzz-Latn": "mzz-Latn-ZZ",
-        "mzz-ZZ": "mzz-Latn-ZZ",
+        "mzz": "mzz-Latn-PG",
+        "mzz-Latn": "mzz-Latn-PG",
+        "mzz-PG": "mzz-Latn-PG",
         "na": "na-Latn-NR",
         "na-Latn": "na-Latn-NR",
         "na-NR": "na-Latn-NR",
@@ -13667,24 +13651,24 @@
         "nab": "nab-Latn-BR",
         "nab-BR": "nab-Latn-BR",
         "nab-Latn": "nab-Latn-BR",
-        "nac": "nac-Latn-ZZ",
-        "nac-Latn": "nac-Latn-ZZ",
-        "nac-ZZ": "nac-Latn-ZZ",
+        "nac": "nac-Latn-PG",
+        "nac-Latn": "nac-Latn-PG",
+        "nac-PG": "nac-Latn-PG",
         "nae": "nae-Latn-ID",
         "nae-ID": "nae-Latn-ID",
         "nae-Latn": "nae-Latn-ID",
-        "naf": "naf-Latn-ZZ",
-        "naf-Latn": "naf-Latn-ZZ",
-        "naf-ZZ": "naf-Latn-ZZ",
+        "naf": "naf-Latn-PG",
+        "naf-Latn": "naf-Latn-PG",
+        "naf-PG": "naf-Latn-PG",
         "nag": "nag-Latn-IN",
         "nag-IN": "nag-Latn-IN",
         "nag-Latn": "nag-Latn-IN",
         "naj": "naj-Latn-GN",
         "naj-GN": "naj-Latn-GN",
         "naj-Latn": "naj-Latn-GN",
-        "nak": "nak-Latn-ZZ",
-        "nak-Latn": "nak-Latn-ZZ",
-        "nak-ZZ": "nak-Latn-ZZ",
+        "nak": "nak-Latn-PG",
+        "nak-Latn": "nak-Latn-PG",
+        "nak-PG": "nak-Latn-PG",
         "nal": "nal-Latn-PG",
         "nal-Latn": "nal-Latn-PG",
         "nal-PG": "nal-Latn-PG",
@@ -13706,9 +13690,9 @@
         "nar": "nar-Latn-NG",
         "nar-Latn": "nar-Latn-NG",
         "nar-NG": "nar-Latn-NG",
-        "nas": "nas-Latn-ZZ",
-        "nas-Latn": "nas-Latn-ZZ",
-        "nas-ZZ": "nas-Latn-ZZ",
+        "nas": "nas-Latn-PG",
+        "nas-Latn": "nas-Latn-PG",
+        "nas-PG": "nas-Latn-PG",
         "nat": "nat-Latn-NG",
         "nat-Latn": "nat-Latn-NG",
         "nat-NG": "nat-Latn-NG",
@@ -13789,9 +13773,9 @@
         "nby": "nby-Latn-PG",
         "nby-Latn": "nby-Latn-PG",
         "nby-PG": "nby-Latn-PG",
-        "nca": "nca-Latn-ZZ",
-        "nca-Latn": "nca-Latn-ZZ",
-        "nca-ZZ": "nca-Latn-ZZ",
+        "nca": "nca-Latn-PG",
+        "nca-Latn": "nca-Latn-PG",
+        "nca-PG": "nca-Latn-PG",
         "ncb": "ncb-Latn-IN",
         "ncb-Deva": "ncb-Deva-IN",
         "ncb-IN": "ncb-Latn-IN",
@@ -13802,12 +13786,12 @@
         "ncd": "ncd-Deva-NP",
         "ncd-Deva": "ncd-Deva-NP",
         "ncd-NP": "ncd-Deva-NP",
-        "nce": "nce-Latn-ZZ",
-        "nce-Latn": "nce-Latn-ZZ",
-        "nce-ZZ": "nce-Latn-ZZ",
-        "ncf": "ncf-Latn-ZZ",
-        "ncf-Latn": "ncf-Latn-ZZ",
-        "ncf-ZZ": "ncf-Latn-ZZ",
+        "nce": "nce-Latn-PG",
+        "nce-Latn": "nce-Latn-PG",
+        "nce-PG": "nce-Latn-PG",
+        "ncf": "ncf-Latn-PG",
+        "ncf-Latn": "ncf-Latn-PG",
+        "ncf-PG": "ncf-Latn-PG",
         "ncg": "ncg-Latn-CA",
         "ncg-CA": "ncg-Latn-CA",
         "ncg-Latn": "ncg-Latn-CA",
@@ -13832,9 +13816,9 @@
         "ncn": "ncn-Latn-PG",
         "ncn-Latn": "ncn-Latn-PG",
         "ncn-PG": "ncn-Latn-PG",
-        "nco": "nco-Latn-ZZ",
-        "nco-Latn": "nco-Latn-ZZ",
-        "nco-ZZ": "nco-Latn-ZZ",
+        "nco": "nco-Latn-PG",
+        "nco-Latn": "nco-Latn-PG",
+        "nco-PG": "nco-Latn-PG",
         "ncq": "ncq-Laoo-LA",
         "ncq-LA": "ncq-Laoo-LA",
         "ncq-Laoo": "ncq-Laoo-LA",
@@ -13846,9 +13830,9 @@
         "nct-Beng": "nct-Beng-IN",
         "nct-IN": "nct-Latn-IN",
         "nct-Latn": "nct-Latn-IN",
-        "ncu": "ncu-Latn-ZZ",
-        "ncu-Latn": "ncu-Latn-ZZ",
-        "ncu-ZZ": "ncu-Latn-ZZ",
+        "ncu": "ncu-Latn-GH",
+        "ncu-GH": "ncu-Latn-GH",
+        "ncu-Latn": "ncu-Latn-GH",
         "ncx": "ncx-Latn-MX",
         "ncx-Latn": "ncx-Latn-MX",
         "ncx-MX": "ncx-Latn-MX",
@@ -13937,9 +13921,9 @@
         "nea": "nea-Latn-ID",
         "nea-ID": "nea-Latn-ID",
         "nea-Latn": "nea-Latn-ID",
-        "neb": "neb-Latn-ZZ",
-        "neb-Latn": "neb-Latn-ZZ",
-        "neb-ZZ": "neb-Latn-ZZ",
+        "neb": "neb-Latn-CI",
+        "neb-CI": "neb-Latn-CI",
+        "neb-Latn": "neb-Latn-CI",
         "nec": "nec-Latn-ID",
         "nec-ID": "nec-Latn-ID",
         "nec-Latn": "nec-Latn-ID",
@@ -13988,9 +13972,9 @@
         "new": "new-Deva-NP",
         "new-Deva": "new-Deva-NP",
         "new-NP": "new-Deva-NP",
-        "nex": "nex-Latn-ZZ",
-        "nex-Latn": "nex-Latn-ZZ",
-        "nex-ZZ": "nex-Latn-ZZ",
+        "nex": "nex-Latn-PG",
+        "nex-Latn": "nex-Latn-PG",
+        "nex-PG": "nex-Latn-PG",
         "ney": "ney-Latn-CI",
         "ney-CI": "ney-Latn-CI",
         "ney-Latn": "ney-Latn-CI",
@@ -14006,21 +13990,21 @@
         "nfl": "nfl-Latn-SB",
         "nfl-Latn": "nfl-Latn-SB",
         "nfl-SB": "nfl-Latn-SB",
-        "nfr": "nfr-Latn-ZZ",
-        "nfr-Latn": "nfr-Latn-ZZ",
-        "nfr-ZZ": "nfr-Latn-ZZ",
+        "nfr": "nfr-Latn-GH",
+        "nfr-GH": "nfr-Latn-GH",
+        "nfr-Latn": "nfr-Latn-GH",
         "nfu": "nfu-Latn-CM",
         "nfu-CM": "nfu-Latn-CM",
         "nfu-Latn": "nfu-Latn-CM",
         "ng": "ng-Latn-NA",
         "ng-Latn": "ng-Latn-NA",
         "ng-NA": "ng-Latn-NA",
-        "nga": "nga-Latn-ZZ",
-        "nga-Latn": "nga-Latn-ZZ",
-        "nga-ZZ": "nga-Latn-ZZ",
-        "ngb": "ngb-Latn-ZZ",
-        "ngb-Latn": "ngb-Latn-ZZ",
-        "ngb-ZZ": "ngb-Latn-ZZ",
+        "nga": "nga-Latn-CD",
+        "nga-CD": "nga-Latn-CD",
+        "nga-Latn": "nga-Latn-CD",
+        "ngb": "ngb-Latn-CD",
+        "ngb-CD": "ngb-Latn-CD",
+        "ngb-Latn": "ngb-Latn-CD",
         "ngc": "ngc-Latn-CD",
         "ngc-CD": "ngc-Latn-CD",
         "ngc-Latn": "ngc-Latn-CD",
@@ -14090,9 +14074,9 @@
         "nha": "nha-Latn-AU",
         "nha-AU": "nha-Latn-AU",
         "nha-Latn": "nha-Latn-AU",
-        "nhb": "nhb-Latn-ZZ",
-        "nhb-Latn": "nhb-Latn-ZZ",
-        "nhb-ZZ": "nhb-Latn-ZZ",
+        "nhb": "nhb-Latn-CI",
+        "nhb-CI": "nhb-Latn-CI",
+        "nhb-Latn": "nhb-Latn-CI",
         "nhc": "nhc-Latn-MX",
         "nhc-Latn": "nhc-Latn-MX",
         "nhc-MX": "nhc-Latn-MX",
@@ -14165,18 +14149,18 @@
         "nie": "nie-Latn-TD",
         "nie-Latn": "nie-Latn-TD",
         "nie-TD": "nie-Latn-TD",
-        "nif": "nif-Latn-ZZ",
-        "nif-Latn": "nif-Latn-ZZ",
-        "nif-ZZ": "nif-Latn-ZZ",
+        "nif": "nif-Latn-PG",
+        "nif-Latn": "nif-Latn-PG",
+        "nif-PG": "nif-Latn-PG",
         "nig": "nig-Latn-AU",
         "nig-AU": "nig-Latn-AU",
         "nig-Latn": "nig-Latn-AU",
         "nih": "nih-Latn-TZ",
         "nih-Latn": "nih-Latn-TZ",
         "nih-TZ": "nih-Latn-TZ",
-        "nii": "nii-Latn-ZZ",
-        "nii-Latn": "nii-Latn-ZZ",
-        "nii-ZZ": "nii-Latn-ZZ",
+        "nii": "nii-Latn-PG",
+        "nii-Latn": "nii-Latn-PG",
+        "nii-PG": "nii-Latn-PG",
         "nij": "nij-Latn-ID",
         "nij-ID": "nij-Latn-ID",
         "nij-Latn": "nij-Latn-ID",
@@ -14186,9 +14170,9 @@
         "nim": "nim-Latn-TZ",
         "nim-Latn": "nim-Latn-TZ",
         "nim-TZ": "nim-Latn-TZ",
-        "nin": "nin-Latn-ZZ",
-        "nin-Latn": "nin-Latn-ZZ",
-        "nin-ZZ": "nin-Latn-ZZ",
+        "nin": "nin-Latn-NG",
+        "nin-Latn": "nin-Latn-NG",
+        "nin-NG": "nin-Latn-NG",
         "nio": "nio-Cyrl-RU",
         "nio-Cyrl": "nio-Cyrl-RU",
         "nio-RU": "nio-Cyrl-RU",
@@ -14217,12 +14201,12 @@
         "nix": "nix-Latn-CD",
         "nix-CD": "nix-Latn-CD",
         "nix-Latn": "nix-Latn-CD",
-        "niy": "niy-Latn-ZZ",
-        "niy-Latn": "niy-Latn-ZZ",
-        "niy-ZZ": "niy-Latn-ZZ",
-        "niz": "niz-Latn-ZZ",
-        "niz-Latn": "niz-Latn-ZZ",
-        "niz-ZZ": "niz-Latn-ZZ",
+        "niy": "niy-Latn-CD",
+        "niy-CD": "niy-Latn-CD",
+        "niy-Latn": "niy-Latn-CD",
+        "niz": "niz-Latn-PG",
+        "niz-Latn": "niz-Latn-PG",
+        "niz-PG": "niz-Latn-PG",
         "nja": "nja-Latn-NG",
         "nja-Latn": "nja-Latn-NG",
         "nja-NG": "nja-Latn-NG",
@@ -14293,9 +14277,9 @@
         "nkf": "nkf-Latn-IN",
         "nkf-IN": "nkf-Latn-IN",
         "nkf-Latn": "nkf-Latn-IN",
-        "nkg": "nkg-Latn-ZZ",
-        "nkg-Latn": "nkg-Latn-ZZ",
-        "nkg-ZZ": "nkg-Latn-ZZ",
+        "nkg": "nkg-Latn-PG",
+        "nkg-Latn": "nkg-Latn-PG",
+        "nkg-PG": "nkg-Latn-PG",
         "nkh": "nkh-Latn-IN",
         "nkh-IN": "nkh-Latn-IN",
         "nkh-Latn": "nkh-Latn-IN",
@@ -14315,9 +14299,9 @@
         "nkn": "nkn-Latn-AO",
         "nkn-AO": "nkn-Latn-AO",
         "nkn-Latn": "nkn-Latn-AO",
-        "nko": "nko-Latn-ZZ",
-        "nko-Latn": "nko-Latn-ZZ",
-        "nko-ZZ": "nko-Latn-ZZ",
+        "nko": "nko-Latn-GH",
+        "nko-GH": "nko-Latn-GH",
+        "nko-Latn": "nko-Latn-GH",
         "nkq": "nkq-Latn-GH",
         "nkq-GH": "nkq-Latn-GH",
         "nkq-Latn": "nkq-Latn-GH",
@@ -14475,9 +14459,9 @@
         "nmx": "nmx-Latn-PG",
         "nmx-Latn": "nmx-Latn-PG",
         "nmx-PG": "nmx-Latn-PG",
-        "nmz": "nmz-Latn-ZZ",
-        "nmz-Latn": "nmz-Latn-ZZ",
-        "nmz-ZZ": "nmz-Latn-ZZ",
+        "nmz": "nmz-Latn-TG",
+        "nmz-Latn": "nmz-Latn-TG",
+        "nmz-TG": "nmz-Latn-TG",
         "nn": "nn-Latn-NO",
         "nn-Latn": "nn-Latn-NO",
         "nn-NO": "nn-Latn-NO",
@@ -14496,9 +14480,9 @@
         "nne": "nne-Latn-AO",
         "nne-AO": "nne-Latn-AO",
         "nne-Latn": "nne-Latn-AO",
-        "nnf": "nnf-Latn-ZZ",
-        "nnf-Latn": "nnf-Latn-ZZ",
-        "nnf-ZZ": "nnf-Latn-ZZ",
+        "nnf": "nnf-Latn-PG",
+        "nnf-Latn": "nnf-Latn-PG",
+        "nnf-PG": "nnf-Latn-PG",
         "nng": "nng-Latn-IN",
         "nng-Beng": "nng-Beng-IN",
         "nng-IN": "nng-Latn-IN",
@@ -14512,15 +14496,15 @@
         "nnj": "nnj-Latn-ET",
         "nnj-ET": "nnj-Latn-ET",
         "nnj-Latn": "nnj-Latn-ET",
-        "nnk": "nnk-Latn-ZZ",
-        "nnk-Latn": "nnk-Latn-ZZ",
-        "nnk-ZZ": "nnk-Latn-ZZ",
+        "nnk": "nnk-Latn-PG",
+        "nnk-Latn": "nnk-Latn-PG",
+        "nnk-PG": "nnk-Latn-PG",
         "nnl": "nnl-Latn-IN",
         "nnl-IN": "nnl-Latn-IN",
         "nnl-Latn": "nnl-Latn-IN",
-        "nnm": "nnm-Latn-ZZ",
-        "nnm-Latn": "nnm-Latn-ZZ",
-        "nnm-ZZ": "nnm-Latn-ZZ",
+        "nnm": "nnm-Latn-PG",
+        "nnm-Latn": "nnm-Latn-PG",
+        "nnm-PG": "nnm-Latn-PG",
         "nnn": "nnn-Latn-TD",
         "nnn-Latn": "nnn-Latn-TD",
         "nnn-TD": "nnn-Latn-TD",
@@ -14592,9 +14576,9 @@
         "non": "non-Runr-SE",
         "non-Runr": "non-Runr-SE",
         "non-SE": "non-Runr-SE",
-        "nop": "nop-Latn-ZZ",
-        "nop-Latn": "nop-Latn-ZZ",
-        "nop-ZZ": "nop-Latn-ZZ",
+        "nop": "nop-Latn-PG",
+        "nop-Latn": "nop-Latn-PG",
+        "nop-PG": "nop-Latn-PG",
         "noq": "noq-Latn-CD",
         "noq-CD": "noq-Latn-CD",
         "noq-Latn": "noq-Latn-CD",
@@ -14604,9 +14588,9 @@
         "not": "not-Latn-PE",
         "not-Latn": "not-Latn-PE",
         "not-PE": "not-Latn-PE",
-        "nou": "nou-Latn-ZZ",
-        "nou-Latn": "nou-Latn-ZZ",
-        "nou-ZZ": "nou-Latn-ZZ",
+        "nou": "nou-Latn-PG",
+        "nou-Latn": "nou-Latn-PG",
+        "nou-PG": "nou-Latn-PG",
         "nov": "nov-Latn-001",
         "nov-001": "nov-Latn-001",
         "nov-Latn": "nov-Latn-001",
@@ -14679,9 +14663,9 @@
         "nra": "nra-Latn-GA",
         "nra-GA": "nra-Latn-GA",
         "nra-Latn": "nra-Latn-GA",
-        "nrb": "nrb-Latn-ZZ",
-        "nrb-Latn": "nrb-Latn-ZZ",
-        "nrb-ZZ": "nrb-Latn-ZZ",
+        "nrb": "nrb-Latn-ER",
+        "nrb-ER": "nrb-Latn-ER",
+        "nrb-Latn": "nrb-Latn-ER",
         "nre": "nre-Latn-IN",
         "nre-IN": "nre-Latn-IN",
         "nre-Latn": "nre-Latn-IN",
@@ -14747,18 +14731,18 @@
         "nsm": "nsm-Latn-IN",
         "nsm-IN": "nsm-Latn-IN",
         "nsm-Latn": "nsm-Latn-IN",
-        "nsn": "nsn-Latn-ZZ",
-        "nsn-Latn": "nsn-Latn-ZZ",
-        "nsn-ZZ": "nsn-Latn-ZZ",
+        "nsn": "nsn-Latn-PG",
+        "nsn-Latn": "nsn-Latn-PG",
+        "nsn-PG": "nsn-Latn-PG",
         "nso": "nso-Latn-ZA",
         "nso-Latn": "nso-Latn-ZA",
         "nso-ZA": "nso-Latn-ZA",
         "nsq": "nsq-Latn-US",
         "nsq-Latn": "nsq-Latn-US",
         "nsq-US": "nsq-Latn-US",
-        "nss": "nss-Latn-ZZ",
-        "nss-Latn": "nss-Latn-ZZ",
-        "nss-ZZ": "nss-Latn-ZZ",
+        "nss": "nss-Latn-PG",
+        "nss-Latn": "nss-Latn-PG",
+        "nss-PG": "nss-Latn-PG",
         "nst": "nst-Tnsa-IN",
         "nst-IN": "nst-Tnsa-IN",
         "nst-Tnsa": "nst-Tnsa-IN",
@@ -14798,18 +14782,18 @@
         "ntk": "ntk-Latn-TZ",
         "ntk-Latn": "ntk-Latn-TZ",
         "ntk-TZ": "ntk-Latn-TZ",
-        "ntm": "ntm-Latn-ZZ",
-        "ntm-Latn": "ntm-Latn-ZZ",
-        "ntm-ZZ": "ntm-Latn-ZZ",
+        "ntm": "ntm-Latn-BJ",
+        "ntm-BJ": "ntm-Latn-BJ",
+        "ntm-Latn": "ntm-Latn-BJ",
         "nto": "nto-Latn-CD",
         "nto-CD": "nto-Latn-CD",
         "nto-Latn": "nto-Latn-CD",
         "ntp": "ntp-Latn-MX",
         "ntp-Latn": "ntp-Latn-MX",
         "ntp-MX": "ntp-Latn-MX",
-        "ntr": "ntr-Latn-ZZ",
-        "ntr-Latn": "ntr-Latn-ZZ",
-        "ntr-ZZ": "ntr-Latn-ZZ",
+        "ntr": "ntr-Latn-GH",
+        "ntr-GH": "ntr-Latn-GH",
+        "ntr-Latn": "ntr-Latn-GH",
         "ntu": "ntu-Latn-SB",
         "ntu-Latn": "ntu-Latn-SB",
         "ntu-SB": "ntu-Latn-SB",
@@ -14843,9 +14827,9 @@
         "nuh": "nuh-Latn-NG",
         "nuh-Latn": "nuh-Latn-NG",
         "nuh-NG": "nuh-Latn-NG",
-        "nui": "nui-Latn-ZZ",
-        "nui-Latn": "nui-Latn-ZZ",
-        "nui-ZZ": "nui-Latn-ZZ",
+        "nui": "nui-Latn-GQ",
+        "nui-GQ": "nui-Latn-GQ",
+        "nui-Latn": "nui-Latn-GQ",
         "nuj": "nuj-Latn-UG",
         "nuj-Latn": "nuj-Latn-UG",
         "nuj-UG": "nuj-Latn-UG",
@@ -14861,9 +14845,10 @@
         "nuo": "nuo-Latn-VN",
         "nuo-Latn": "nuo-Latn-VN",
         "nuo-VN": "nuo-Latn-VN",
-        "nup": "nup-Latn-ZZ",
-        "nup-Latn": "nup-Latn-ZZ",
-        "nup-ZZ": "nup-Latn-ZZ",
+        "nup": "nup-Latn-NG",
+        "nup-Arab": "nup-Arab-NG",
+        "nup-Latn": "nup-Latn-NG",
+        "nup-NG": "nup-Latn-NG",
         "nuq": "nuq-Latn-PG",
         "nuq-Latn": "nuq-Latn-PG",
         "nuq-PG": "nuq-Latn-PG",
@@ -14879,15 +14864,15 @@
         "nuu": "nuu-Latn-CD",
         "nuu-CD": "nuu-Latn-CD",
         "nuu-Latn": "nuu-Latn-CD",
-        "nuv": "nuv-Latn-ZZ",
-        "nuv-Latn": "nuv-Latn-ZZ",
-        "nuv-ZZ": "nuv-Latn-ZZ",
+        "nuv": "nuv-Latn-BF",
+        "nuv-BF": "nuv-Latn-BF",
+        "nuv-Latn": "nuv-Latn-BF",
         "nuw": "nuw-Latn-FM",
         "nuw-FM": "nuw-Latn-FM",
         "nuw-Latn": "nuw-Latn-FM",
-        "nux": "nux-Latn-ZZ",
-        "nux-Latn": "nux-Latn-ZZ",
-        "nux-ZZ": "nux-Latn-ZZ",
+        "nux": "nux-Latn-PG",
+        "nux-Latn": "nux-Latn-PG",
+        "nux-PG": "nux-Latn-PG",
         "nuy": "nuy-Latn-AU",
         "nuy-AU": "nuy-Latn-AU",
         "nuy-Latn": "nuy-Latn-AU",
@@ -14906,9 +14891,9 @@
         "nvo": "nvo-Latn-CM",
         "nvo-CM": "nvo-Latn-CM",
         "nvo-Latn": "nvo-Latn-CM",
-        "nwb": "nwb-Latn-ZZ",
-        "nwb-Latn": "nwb-Latn-ZZ",
-        "nwb-ZZ": "nwb-Latn-ZZ",
+        "nwb": "nwb-Latn-CI",
+        "nwb-CI": "nwb-Latn-CI",
+        "nwb-Latn": "nwb-Latn-CI",
         "nwc": "nwc-Newa-NP",
         "nwc-Brah": "nwc-Brah-NP",
         "nwc-Deva": "nwc-Deva-NP",
@@ -14966,9 +14951,9 @@
         "nxq": "nxq-Latn-CN",
         "nxq-CN": "nxq-Latn-CN",
         "nxq-Latn": "nxq-Latn-CN",
-        "nxr": "nxr-Latn-ZZ",
-        "nxr-Latn": "nxr-Latn-ZZ",
-        "nxr-ZZ": "nxr-Latn-ZZ",
+        "nxr": "nxr-Latn-PG",
+        "nxr-Latn": "nxr-Latn-PG",
+        "nxr-PG": "nxr-Latn-PG",
         "nxx": "nxx-Latn-ID",
         "nxx-ID": "nxx-Latn-ID",
         "nxx-Latn": "nxx-Latn-ID",
@@ -15137,9 +15122,9 @@
         "ogb": "ogb-Latn-NG",
         "ogb-Latn": "ogb-Latn-NG",
         "ogb-NG": "ogb-Latn-NG",
-        "ogc": "ogc-Latn-ZZ",
-        "ogc-Latn": "ogc-Latn-ZZ",
-        "ogc-ZZ": "ogc-Latn-ZZ",
+        "ogc": "ogc-Latn-NG",
+        "ogc-Latn": "ogc-Latn-NG",
+        "ogc-NG": "ogc-Latn-NG",
         "ogg": "ogg-Latn-NG",
         "ogg-Latn": "ogg-Latn-NG",
         "ogg-NG": "ogg-Latn-NG",
@@ -15211,18 +15196,18 @@
         "oko": "oko-Hani-KR",
         "oko-Hani": "oko-Hani-KR",
         "oko-KR": "oko-Hani-KR",
-        "okr": "okr-Latn-ZZ",
-        "okr-Latn": "okr-Latn-ZZ",
-        "okr-ZZ": "okr-Latn-ZZ",
+        "okr": "okr-Latn-NG",
+        "okr-Latn": "okr-Latn-NG",
+        "okr-NG": "okr-Latn-NG",
         "oks": "oks-Latn-NG",
         "oks-Latn": "oks-Latn-NG",
         "oks-NG": "oks-Latn-NG",
         "oku": "oku-Latn-CM",
         "oku-CM": "oku-Latn-CM",
         "oku-Latn": "oku-Latn-CM",
-        "okv": "okv-Latn-ZZ",
-        "okv-Latn": "okv-Latn-ZZ",
-        "okv-ZZ": "okv-Latn-ZZ",
+        "okv": "okv-Latn-PG",
+        "okv-Latn": "okv-Latn-PG",
+        "okv-PG": "okv-Latn-PG",
         "okx": "okx-Latn-NG",
         "okx-Latn": "okx-Latn-NG",
         "okx-NG": "okx-Latn-NG",
@@ -15305,9 +15290,9 @@
         "one": "one-Latn-CA",
         "one-CA": "one-Latn-CA",
         "one-Latn": "one-Latn-CA",
-        "ong": "ong-Latn-ZZ",
-        "ong-Latn": "ong-Latn-ZZ",
-        "ong-ZZ": "ong-Latn-ZZ",
+        "ong": "ong-Latn-PG",
+        "ong-Latn": "ong-Latn-PG",
+        "ong-PG": "ong-Latn-PG",
         "oni": "oni-Latn-ID",
         "oni-ID": "oni-Latn-ID",
         "oni-Latn": "oni-Latn-ID",
@@ -15317,9 +15302,9 @@
         "onk": "onk-Latn-PG",
         "onk-Latn": "onk-Latn-PG",
         "onk-PG": "onk-Latn-PG",
-        "onn": "onn-Latn-ZZ",
-        "onn-Latn": "onn-Latn-ZZ",
-        "onn-ZZ": "onn-Latn-ZZ",
+        "onn": "onn-Latn-PG",
+        "onn-Latn": "onn-Latn-PG",
+        "onn-PG": "onn-Latn-PG",
         "ono": "ono-Latn-CA",
         "ono-CA": "ono-Latn-CA",
         "ono-Latn": "ono-Latn-CA",
@@ -15330,9 +15315,9 @@
         "onr": "onr-Latn-PG",
         "onr-Latn": "onr-Latn-PG",
         "onr-PG": "onr-Latn-PG",
-        "ons": "ons-Latn-ZZ",
-        "ons-Latn": "ons-Latn-ZZ",
-        "ons-ZZ": "ons-Latn-ZZ",
+        "ons": "ons-Latn-PG",
+        "ons-Latn": "ons-Latn-PG",
+        "ons-PG": "ons-Latn-PG",
         "ont": "ont-Latn-PG",
         "ont-Latn": "ont-Latn-PG",
         "ont-PG": "ont-Latn-PG",
@@ -15357,9 +15342,9 @@
         "opk": "opk-Latn-ID",
         "opk-ID": "opk-Latn-ID",
         "opk-Latn": "opk-Latn-ID",
-        "opm": "opm-Latn-ZZ",
-        "opm-Latn": "opm-Latn-ZZ",
-        "opm-ZZ": "opm-Latn-ZZ",
+        "opm": "opm-Latn-PG",
+        "opm-Latn": "opm-Latn-PG",
+        "opm-PG": "opm-Latn-PG",
         "opo": "opo-Latn-PG",
         "opo-Latn": "opo-Latn-PG",
         "opo-PG": "opo-Latn-PG",
@@ -15388,9 +15373,9 @@
         "orn": "orn-Latn-MY",
         "orn-Latn": "orn-Latn-MY",
         "orn-MY": "orn-Latn-MY",
-        "oro": "oro-Latn-ZZ",
-        "oro-Latn": "oro-Latn-ZZ",
-        "oro-ZZ": "oro-Latn-ZZ",
+        "oro": "oro-Latn-PG",
+        "oro-Latn": "oro-Latn-PG",
+        "oro-PG": "oro-Latn-PG",
         "orr": "orr-Latn-NG",
         "orr-Latn": "orr-Latn-NG",
         "orr-NG": "orr-Latn-NG",
@@ -15400,9 +15385,9 @@
         "ort": "ort-Telu-IN",
         "ort-IN": "ort-Telu-IN",
         "ort-Telu": "ort-Telu-IN",
-        "oru": "oru-Arab-ZZ",
-        "oru-Arab": "oru-Arab-ZZ",
-        "oru-ZZ": "oru-Arab-ZZ",
+        "oru": "oru-Arab-PK",
+        "oru-Arab": "oru-Arab-PK",
+        "oru-PK": "oru-Arab-PK",
         "orv": "orv-Cyrl-RU",
         "orv-Cyrl": "orv-Cyrl-RU",
         "orv-RU": "orv-Cyrl-RU",
@@ -15443,9 +15428,9 @@
         "osx": "osx-Latn-DE",
         "osx-DE": "osx-Latn-DE",
         "osx-Latn": "osx-Latn-DE",
-        "ota": "ota-Arab-ZZ",
-        "ota-Arab": "ota-Arab-ZZ",
-        "ota-ZZ": "ota-Arab-ZZ",
+        "ota": "ota-Arab-TR",
+        "ota-Arab": "ota-Arab-TR",
+        "ota-TR": "ota-Arab-TR",
         "otb": "otb-Tibt-CN",
         "otb-CN": "otb-Tibt-CN",
         "otb-Tibt": "otb-Tibt-CN",
@@ -15503,9 +15488,6 @@
         "oue": "oue-Latn-PG",
         "oue-Latn": "oue-Latn-PG",
         "oue-PG": "oue-Latn-PG",
-        "oui": "oui-Ougr-143",
-        "oui-143": "oui-Ougr-143",
-        "oui-Ougr": "oui-Ougr-143",
         "oum": "oum-Latn-PG",
         "oum-Latn": "oum-Latn-PG",
         "oum-PG": "oum-Latn-PG",
@@ -15527,9 +15509,9 @@
         "oyy": "oyy-Latn-PG",
         "oyy-Latn": "oyy-Latn-PG",
         "oyy-PG": "oyy-Latn-PG",
-        "ozm": "ozm-Latn-ZZ",
-        "ozm-Latn": "ozm-Latn-ZZ",
-        "ozm-ZZ": "ozm-Latn-ZZ",
+        "ozm": "ozm-Latn-CM",
+        "ozm-CM": "ozm-Latn-CM",
+        "ozm-Latn": "ozm-Latn-CM",
         "pa": "pa-Guru-IN",
         "pa-Arab": "pa-Arab-PK",
         "pa-Guru": "pa-Guru-IN",
@@ -15622,9 +15604,9 @@
         "pbh": "pbh-Latn-VE",
         "pbh-Latn": "pbh-Latn-VE",
         "pbh-VE": "pbh-Latn-VE",
-        "pbi": "pbi-Latn-ZZ",
-        "pbi-Latn": "pbi-Latn-ZZ",
-        "pbi-ZZ": "pbi-Latn-ZZ",
+        "pbi": "pbi-Latn-CM",
+        "pbi-CM": "pbi-Latn-CM",
+        "pbi-Latn": "pbi-Latn-CM",
         "pbl": "pbl-Latn-NG",
         "pbl-Latn": "pbl-Latn-NG",
         "pbl-NG": "pbl-Latn-NG",
@@ -15730,9 +15712,9 @@
         "peb": "peb-Latn-US",
         "peb-Latn": "peb-Latn-US",
         "peb-US": "peb-Latn-US",
-        "ped": "ped-Latn-ZZ",
-        "ped-Latn": "ped-Latn-ZZ",
-        "ped-ZZ": "ped-Latn-ZZ",
+        "ped": "ped-Latn-PG",
+        "ped-Latn": "ped-Latn-PG",
+        "ped-PG": "ped-Latn-PG",
         "pee": "pee-Latn-ID",
         "pee-ID": "pee-Latn-ID",
         "pee-Latn": "pee-Latn-ID",
@@ -15763,9 +15745,9 @@
         "pev": "pev-Latn-VE",
         "pev-Latn": "pev-Latn-VE",
         "pev-VE": "pev-Latn-VE",
-        "pex": "pex-Latn-ZZ",
-        "pex-Latn": "pex-Latn-ZZ",
-        "pex-ZZ": "pex-Latn-ZZ",
+        "pex": "pex-Latn-PG",
+        "pex-Latn": "pex-Latn-PG",
+        "pex-PG": "pex-Latn-PG",
         "pey": "pey-Latn-ID",
         "pey-ID": "pey-Latn-ID",
         "pey-Latn": "pey-Latn-ID",
@@ -15820,9 +15802,9 @@
         "phk": "phk-Mymr-IN",
         "phk-IN": "phk-Mymr-IN",
         "phk-Mymr": "phk-Mymr-IN",
-        "phl": "phl-Arab-ZZ",
-        "phl-Arab": "phl-Arab-ZZ",
-        "phl-ZZ": "phl-Arab-ZZ",
+        "phl": "phl-Arab-PK",
+        "phl-Arab": "phl-Arab-PK",
+        "phl-PK": "phl-Arab-PK",
         "phm": "phm-Latn-MZ",
         "phm-Latn": "phm-Latn-MZ",
         "phm-MZ": "phm-Latn-MZ",
@@ -15877,9 +15859,9 @@
         "pij": "pij-Latn-CO",
         "pij-CO": "pij-Latn-CO",
         "pij-Latn": "pij-Latn-CO",
-        "pil": "pil-Latn-ZZ",
-        "pil-Latn": "pil-Latn-ZZ",
-        "pil-ZZ": "pil-Latn-ZZ",
+        "pil": "pil-Latn-BJ",
+        "pil-BJ": "pil-Latn-BJ",
+        "pil-Latn": "pil-Latn-BJ",
         "pim": "pim-Latn-US",
         "pim-Latn": "pim-Latn-US",
         "pim-US": "pim-Latn-US",
@@ -15889,9 +15871,9 @@
         "pio": "pio-Latn-CO",
         "pio-CO": "pio-Latn-CO",
         "pio-Latn": "pio-Latn-CO",
-        "pip": "pip-Latn-ZZ",
-        "pip-Latn": "pip-Latn-ZZ",
-        "pip-ZZ": "pip-Latn-ZZ",
+        "pip": "pip-Latn-NG",
+        "pip-Latn": "pip-Latn-NG",
+        "pip-NG": "pip-Latn-NG",
         "pir": "pir-Latn-BR",
         "pir-BR": "pir-Latn-BR",
         "pir-Latn": "pir-Latn-BR",
@@ -15953,9 +15935,9 @@
         "pl": "pl-Latn-PL",
         "pl-Latn": "pl-Latn-PL",
         "pl-PL": "pl-Latn-PL",
-        "pla": "pla-Latn-ZZ",
-        "pla-Latn": "pla-Latn-ZZ",
-        "pla-ZZ": "pla-Latn-ZZ",
+        "pla": "pla-Latn-PG",
+        "pla-Latn": "pla-Latn-PG",
+        "pla-PG": "pla-Latn-PG",
         "plb": "plb-Latn-VU",
         "plb-Latn": "plb-Latn-VU",
         "plb-VU": "plb-Latn-VU",
@@ -16079,9 +16061,9 @@
         "pne": "pne-Latn-MY",
         "pne-Latn": "pne-Latn-MY",
         "pne-MY": "pne-Latn-MY",
-        "png": "png-Latn-ZZ",
-        "png-Latn": "png-Latn-ZZ",
-        "png-ZZ": "png-Latn-ZZ",
+        "png": "png-Latn-NG",
+        "png-Latn": "png-Latn-NG",
+        "png-NG": "png-Latn-NG",
         "pnh": "pnh-Latn-CK",
         "pnh-CK": "pnh-Latn-CK",
         "pnh-Latn": "pnh-Latn-CK",
@@ -16100,9 +16082,9 @@
         "pnm": "pnm-Latn-MY",
         "pnm-Latn": "pnm-Latn-MY",
         "pnm-MY": "pnm-Latn-MY",
-        "pnn": "pnn-Latn-ZZ",
-        "pnn-Latn": "pnn-Latn-ZZ",
-        "pnn-ZZ": "pnn-Latn-ZZ",
+        "pnn": "pnn-Latn-PG",
+        "pnn-Latn": "pnn-Latn-PG",
+        "pnn-PG": "pnn-Latn-PG",
         "pno": "pno-Latn-PE",
         "pno-Latn": "pno-Latn-PE",
         "pno-PE": "pno-Latn-PE",
@@ -16184,9 +16166,6 @@
         "poy": "poy-Latn-TZ",
         "poy-Latn": "poy-Latn-TZ",
         "poy-TZ": "poy-Latn-TZ",
-        "ppa": "ppa-Deva-IN",
-        "ppa-Deva": "ppa-Deva-IN",
-        "ppa-IN": "ppa-Deva-IN",
         "ppe": "ppe-Latn-PG",
         "ppe-Latn": "ppe-Latn-PG",
         "ppe-PG": "ppe-Latn-PG",
@@ -16205,9 +16184,9 @@
         "ppn": "ppn-Latn-PG",
         "ppn-Latn": "ppn-Latn-PG",
         "ppn-PG": "ppn-Latn-PG",
-        "ppo": "ppo-Latn-ZZ",
-        "ppo-Latn": "ppo-Latn-ZZ",
-        "ppo-ZZ": "ppo-Latn-ZZ",
+        "ppo": "ppo-Latn-PG",
+        "ppo-Latn": "ppo-Latn-PG",
+        "ppo-PG": "ppo-Latn-PG",
         "ppp": "ppp-Latn-CD",
         "ppp-CD": "ppp-Latn-CD",
         "ppp-Latn": "ppp-Latn-CD",
@@ -16241,9 +16220,9 @@
         "prf": "prf-Latn-PH",
         "prf-Latn": "prf-Latn-PH",
         "prf-PH": "prf-Latn-PH",
-        "prg": "prg-Latn-001",
-        "prg-001": "prg-Latn-001",
-        "prg-Latn": "prg-Latn-001",
+        "prg": "prg-Latn-PL",
+        "prg-Latn": "prg-Latn-PL",
+        "prg-PL": "prg-Latn-PL",
         "prh": "prh-Latn-PH",
         "prh-Latn": "prh-Latn-PH",
         "prh-PH": "prh-Latn-PH",
@@ -16306,9 +16285,9 @@
         "psq": "psq-Latn-PG",
         "psq-Latn": "psq-Latn-PG",
         "psq-PG": "psq-Latn-PG",
-        "pss": "pss-Latn-ZZ",
-        "pss-Latn": "pss-Latn-ZZ",
-        "pss-ZZ": "pss-Latn-ZZ",
+        "pss": "pss-Latn-PG",
+        "pss-Latn": "pss-Latn-PG",
+        "pss-PG": "pss-Latn-PG",
         "pst": "pst-Arab-PK",
         "pst-Arab": "pst-Arab-PK",
         "pst-PK": "pst-Arab-PK",
@@ -16342,9 +16321,9 @@
         "pto": "pto-Latn-BR",
         "pto-BR": "pto-Latn-BR",
         "pto-Latn": "pto-Latn-BR",
-        "ptp": "ptp-Latn-ZZ",
-        "ptp-Latn": "ptp-Latn-ZZ",
-        "ptp-ZZ": "ptp-Latn-ZZ",
+        "ptp": "ptp-Latn-PG",
+        "ptp-Latn": "ptp-Latn-PG",
+        "ptp-PG": "ptp-Latn-PG",
         "ptr": "ptr-Latn-VU",
         "ptr-Latn": "ptr-Latn-VU",
         "ptr-VU": "ptr-Latn-VU",
@@ -16414,9 +16393,9 @@
         "puy": "puy-Latn-US",
         "puy-Latn": "puy-Latn-US",
         "puy-US": "puy-Latn-US",
-        "pwa": "pwa-Latn-ZZ",
-        "pwa-Latn": "pwa-Latn-ZZ",
-        "pwa-ZZ": "pwa-Latn-ZZ",
+        "pwa": "pwa-Latn-PG",
+        "pwa-Latn": "pwa-Latn-PG",
+        "pwa-PG": "pwa-Latn-PG",
         "pwb": "pwb-Latn-NG",
         "pwb-Latn": "pwb-Latn-NG",
         "pwb-NG": "pwb-Latn-NG",
@@ -16652,9 +16631,9 @@
         "rah-Beng": "rah-Beng-IN",
         "rah-IN": "rah-Beng-IN",
         "rah-Latn": "rah-Latn-IN",
-        "rai": "rai-Latn-ZZ",
-        "rai-Latn": "rai-Latn-ZZ",
-        "rai-ZZ": "rai-Latn-ZZ",
+        "rai": "rai-Latn-PG",
+        "rai-Latn": "rai-Latn-PG",
+        "rai-PG": "rai-Latn-PG",
         "raj": "raj-Deva-IN",
         "raj-Deva": "raj-Deva-IN",
         "raj-IN": "raj-Deva-IN",
@@ -16667,9 +16646,9 @@
         "ran": "ran-Latn-ID",
         "ran-ID": "ran-Latn-ID",
         "ran-Latn": "ran-Latn-ID",
-        "rao": "rao-Latn-ZZ",
-        "rao-Latn": "rao-Latn-ZZ",
-        "rao-ZZ": "rao-Latn-ZZ",
+        "rao": "rao-Latn-PG",
+        "rao-Latn": "rao-Latn-PG",
+        "rao-PG": "rao-Latn-PG",
         "rap": "rap-Latn-CL",
         "rap-CL": "rap-Latn-CL",
         "rap-Latn": "rap-Latn-CL",
@@ -16728,18 +16707,18 @@
         "rej": "rej-Latn-ID",
         "rej-ID": "rej-Latn-ID",
         "rej-Latn": "rej-Latn-ID",
-        "rel": "rel-Latn-ZZ",
-        "rel-Latn": "rel-Latn-ZZ",
-        "rel-ZZ": "rel-Latn-ZZ",
+        "rel": "rel-Latn-KE",
+        "rel-KE": "rel-Latn-KE",
+        "rel-Latn": "rel-Latn-KE",
         "rem": "rem-Latn-PE",
         "rem-Latn": "rem-Latn-PE",
         "rem-PE": "rem-Latn-PE",
         "ren": "ren-Latn-VN",
         "ren-Latn": "ren-Latn-VN",
         "ren-VN": "ren-Latn-VN",
-        "res": "res-Latn-ZZ",
-        "res-Latn": "res-Latn-ZZ",
-        "res-ZZ": "res-Latn-ZZ",
+        "res": "res-Latn-NG",
+        "res-Latn": "res-Latn-NG",
+        "res-NG": "res-Latn-NG",
         "ret": "ret-Latn-ID",
         "ret-ID": "ret-Latn-ID",
         "ret-Latn": "ret-Latn-ID",
@@ -16893,9 +16872,6 @@
         "rn": "rn-Latn-BI",
         "rn-BI": "rn-Latn-BI",
         "rn-Latn": "rn-Latn-BI",
-        "rna": "rna-Latn-ZZ",
-        "rna-Latn": "rna-Latn-ZZ",
-        "rna-ZZ": "rna-Latn-ZZ",
         "rnd": "rnd-Latn-CD",
         "rnd-CD": "rnd-Latn-CD",
         "rnd-Latn": "rnd-Latn-CD",
@@ -16940,12 +16916,13 @@
         "rol-Latn": "rol-Latn-PH",
         "rol-PH": "rol-Latn-PH",
         "rom": "rom-Latn-RO",
-        "rom-Cyrl": "rom-Cyrl-RO",
+        "rom-BG": "rom-Cyrl-BG",
+        "rom-Cyrl": "rom-Cyrl-BG",
         "rom-Latn": "rom-Latn-RO",
         "rom-RO": "rom-Latn-RO",
-        "roo": "roo-Latn-ZZ",
-        "roo-Latn": "roo-Latn-ZZ",
-        "roo-ZZ": "roo-Latn-ZZ",
+        "roo": "roo-Latn-PG",
+        "roo-Latn": "roo-Latn-PG",
+        "roo-PG": "roo-Latn-PG",
         "rop": "rop-Latn-AU",
         "rop-AU": "rop-Latn-AU",
         "rop-Latn": "rop-Latn-AU",
@@ -16967,9 +16944,9 @@
         "rri": "rri-Latn-SB",
         "rri-Latn": "rri-Latn-SB",
         "rri-SB": "rri-Latn-SB",
-        "rro": "rro-Latn-ZZ",
-        "rro-Latn": "rro-Latn-ZZ",
-        "rro-ZZ": "rro-Latn-ZZ",
+        "rro": "rro-Latn-PG",
+        "rro-Latn": "rro-Latn-PG",
+        "rro-PG": "rro-Latn-PG",
         "rrt": "rrt-Latn-AU",
         "rrt-AU": "rrt-Latn-AU",
         "rrt-Latn": "rrt-Latn-AU",
@@ -17056,9 +17033,9 @@
         "rwm": "rwm-Latn-UG",
         "rwm-Latn": "rwm-Latn-UG",
         "rwm-UG": "rwm-Latn-UG",
-        "rwo": "rwo-Latn-ZZ",
-        "rwo-Latn": "rwo-Latn-ZZ",
-        "rwo-ZZ": "rwo-Latn-ZZ",
+        "rwo": "rwo-Latn-PG",
+        "rwo-Latn": "rwo-Latn-PG",
+        "rwo-PG": "rwo-Latn-PG",
         "rwr": "rwr-Deva-IN",
         "rwr-Deva": "rwr-Deva-IN",
         "rwr-IN": "rwr-Deva-IN",
@@ -17139,9 +17116,9 @@
         "saz": "saz-Saur-IN",
         "saz-IN": "saz-Saur-IN",
         "saz-Saur": "saz-Saur-IN",
-        "sba": "sba-Latn-ZZ",
-        "sba-Latn": "sba-Latn-ZZ",
-        "sba-ZZ": "sba-Latn-ZZ",
+        "sba": "sba-Latn-TD",
+        "sba-Latn": "sba-Latn-TD",
+        "sba-TD": "sba-Latn-TD",
         "sbb": "sbb-Latn-SB",
         "sbb-Latn": "sbb-Latn-SB",
         "sbb-SB": "sbb-Latn-SB",
@@ -17151,9 +17128,9 @@
         "sbd": "sbd-Latn-BF",
         "sbd-BF": "sbd-Latn-BF",
         "sbd-Latn": "sbd-Latn-BF",
-        "sbe": "sbe-Latn-ZZ",
-        "sbe-Latn": "sbe-Latn-ZZ",
-        "sbe-ZZ": "sbe-Latn-ZZ",
+        "sbe": "sbe-Latn-PG",
+        "sbe-Latn": "sbe-Latn-PG",
+        "sbe-PG": "sbe-Latn-PG",
         "sbg": "sbg-Latn-ID",
         "sbg-ID": "sbg-Latn-ID",
         "sbg-Latn": "sbg-Latn-ID",
@@ -17240,9 +17217,10 @@
         "sck": "sck-Deva-IN",
         "sck-Deva": "sck-Deva-IN",
         "sck-IN": "sck-Deva-IN",
-        "scl": "scl-Arab-ZZ",
-        "scl-Arab": "scl-Arab-ZZ",
-        "scl-ZZ": "scl-Arab-ZZ",
+        "scl": "scl-Arab-PK",
+        "scl-Arab": "scl-Arab-PK",
+        "scl-IN": "scl-Arab-IN",
+        "scl-PK": "scl-Arab-PK",
         "scn": "scn-Latn-IT",
         "scn-IT": "scn-Latn-IT",
         "scn-Latn": "scn-Latn-IT",
@@ -17455,15 +17433,15 @@
         "sgu": "sgu-Latn-ID",
         "sgu-ID": "sgu-Latn-ID",
         "sgu-Latn": "sgu-Latn-ID",
-        "sgw": "sgw-Ethi-ZZ",
-        "sgw-Ethi": "sgw-Ethi-ZZ",
-        "sgw-ZZ": "sgw-Ethi-ZZ",
+        "sgw": "sgw-Ethi-ET",
+        "sgw-ET": "sgw-Ethi-ET",
+        "sgw-Ethi": "sgw-Ethi-ET",
         "sgy": "sgy-Arab-AF",
         "sgy-AF": "sgy-Arab-AF",
         "sgy-Arab": "sgy-Arab-AF",
-        "sgz": "sgz-Latn-ZZ",
-        "sgz-Latn": "sgz-Latn-ZZ",
-        "sgz-ZZ": "sgz-Latn-ZZ",
+        "sgz": "sgz-Latn-PG",
+        "sgz-Latn": "sgz-Latn-PG",
+        "sgz-PG": "sgz-Latn-PG",
         "sha": "sha-Latn-NG",
         "sha-Latn": "sha-Latn-NG",
         "sha-NG": "sha-Latn-NG",
@@ -17491,9 +17469,10 @@
         "shj": "shj-Latn-SD",
         "shj-Latn": "shj-Latn-SD",
         "shj-SD": "shj-Latn-SD",
-        "shk": "shk-Latn-ZZ",
-        "shk-Latn": "shk-Latn-ZZ",
-        "shk-ZZ": "shk-Latn-ZZ",
+        "shk": "shk-Latn-SS",
+        "shk-Arab": "shk-Arab-SS",
+        "shk-Latn": "shk-Latn-SS",
+        "shk-SS": "shk-Latn-SS",
         "shm": "shm-Arab-IR",
         "shm-Arab": "shm-Arab-IR",
         "shm-IR": "shm-Arab-IR",
@@ -17518,10 +17497,10 @@
         "sht": "sht-Latn-US",
         "sht-Latn": "sht-Latn-US",
         "sht-US": "sht-Latn-US",
-        "shu": "shu-Arab-ZZ",
-        "shu-Arab": "shu-Arab-ZZ",
+        "shu": "shu-Arab-TD",
+        "shu-Arab": "shu-Arab-TD",
+        "shu-Latn": "shu-Latn-TD",
         "shu-TD": "shu-Arab-TD",
-        "shu-ZZ": "shu-Arab-ZZ",
         "shv": "shv-Arab-OM",
         "shv-Arab": "shv-Arab-OM",
         "shv-OM": "shv-Arab-OM",
@@ -17555,9 +17534,9 @@
         "sif": "sif-Latn-BF",
         "sif-BF": "sif-Latn-BF",
         "sif-Latn": "sif-Latn-BF",
-        "sig": "sig-Latn-ZZ",
-        "sig-Latn": "sig-Latn-ZZ",
-        "sig-ZZ": "sig-Latn-ZZ",
+        "sig": "sig-Latn-GH",
+        "sig-GH": "sig-Latn-GH",
+        "sig-Latn": "sig-Latn-GH",
         "sih": "sih-Latn-NC",
         "sih-Latn": "sih-Latn-NC",
         "sih-NC": "sih-Latn-NC",
@@ -17570,12 +17549,12 @@
         "sik": "sik-Latn-BR",
         "sik-BR": "sik-Latn-BR",
         "sik-Latn": "sik-Latn-BR",
-        "sil": "sil-Latn-ZZ",
-        "sil-Latn": "sil-Latn-ZZ",
-        "sil-ZZ": "sil-Latn-ZZ",
-        "sim": "sim-Latn-ZZ",
-        "sim-Latn": "sim-Latn-ZZ",
-        "sim-ZZ": "sim-Latn-ZZ",
+        "sil": "sil-Latn-GH",
+        "sil-GH": "sil-Latn-GH",
+        "sil-Latn": "sil-Latn-GH",
+        "sim": "sim-Latn-PG",
+        "sim-Latn": "sim-Latn-PG",
+        "sim-PG": "sim-Latn-PG",
         "sip": "sip-Tibt-IN",
         "sip-IN": "sip-Tibt-IN",
         "sip-Tibt": "sip-Tibt-IN",
@@ -17631,9 +17610,9 @@
         "sjp-Beng": "sjp-Beng-IN",
         "sjp-Deva": "sjp-Deva-IN",
         "sjp-IN": "sjp-Deva-IN",
-        "sjr": "sjr-Latn-ZZ",
-        "sjr-Latn": "sjr-Latn-ZZ",
-        "sjr-ZZ": "sjr-Latn-ZZ",
+        "sjr": "sjr-Latn-PG",
+        "sjr-Latn": "sjr-Latn-PG",
+        "sjr-PG": "sjr-Latn-PG",
         "sjt": "sjt-Cyrl-RU",
         "sjt-Cyrl": "sjt-Cyrl-RU",
         "sjt-RU": "sjt-Cyrl-RU",
@@ -17652,9 +17631,9 @@
         "skb": "skb-Thai-TH",
         "skb-TH": "skb-Thai-TH",
         "skb-Thai": "skb-Thai-TH",
-        "skc": "skc-Latn-ZZ",
-        "skc-Latn": "skc-Latn-ZZ",
-        "skc-ZZ": "skc-Latn-ZZ",
+        "skc": "skc-Latn-PG",
+        "skc-Latn": "skc-Latn-PG",
+        "skc-PG": "skc-Latn-PG",
         "skd": "skd-Latn-US",
         "skd-Latn": "skd-Latn-US",
         "skd-US": "skd-Latn-US",
@@ -17694,9 +17673,9 @@
         "skr": "skr-Arab-PK",
         "skr-Arab": "skr-Arab-PK",
         "skr-PK": "skr-Arab-PK",
-        "sks": "sks-Latn-ZZ",
-        "sks-Latn": "sks-Latn-ZZ",
-        "sks-ZZ": "sks-Latn-ZZ",
+        "sks": "sks-Latn-PG",
+        "sks-Latn": "sks-Latn-PG",
+        "sks-PG": "sks-Latn-PG",
         "skt": "skt-Latn-CD",
         "skt-CD": "skt-Latn-CD",
         "skt-Latn": "skt-Latn-CD",
@@ -17724,9 +17703,9 @@
         "slc": "slc-Latn-CO",
         "slc-CO": "slc-Latn-CO",
         "slc-Latn": "slc-Latn-CO",
-        "sld": "sld-Latn-ZZ",
-        "sld-Latn": "sld-Latn-ZZ",
-        "sld-ZZ": "sld-Latn-ZZ",
+        "sld": "sld-Latn-BF",
+        "sld-BF": "sld-Latn-BF",
+        "sld-Latn": "sld-Latn-BF",
         "slg": "slg-Latn-ID",
         "slg-ID": "slg-Latn-ID",
         "slg-Latn": "slg-Latn-ID",
@@ -17739,9 +17718,9 @@
         "slj": "slj-Latn-BR",
         "slj-BR": "slj-Latn-BR",
         "slj-Latn": "slj-Latn-BR",
-        "sll": "sll-Latn-ZZ",
-        "sll-Latn": "sll-Latn-ZZ",
-        "sll-ZZ": "sll-Latn-ZZ",
+        "sll": "sll-Latn-PG",
+        "sll-Latn": "sll-Latn-PG",
+        "sll-PG": "sll-Latn-PG",
         "slm": "slm-Latn-PH",
         "slm-Latn": "slm-Latn-PH",
         "slm-PH": "slm-Latn-PH",
@@ -17785,9 +17764,6 @@
         "smc": "smc-Latn-PG",
         "smc-Latn": "smc-Latn-PG",
         "smc-PG": "smc-Latn-PG",
-        "smd": "smd-Latn-AO",
-        "smd-AO": "smd-Latn-AO",
-        "smd-Latn": "smd-Latn-AO",
         "smf": "smf-Latn-PG",
         "smf-Latn": "smf-Latn-PG",
         "smf-PG": "smf-Latn-PG",
@@ -17812,9 +17788,9 @@
         "smp": "smp-Samr-IL",
         "smp-IL": "smp-Samr-IL",
         "smp-Samr": "smp-Samr-IL",
-        "smq": "smq-Latn-ZZ",
-        "smq-Latn": "smq-Latn-ZZ",
-        "smq-ZZ": "smq-Latn-ZZ",
+        "smq": "smq-Latn-PG",
+        "smq-Latn": "smq-Latn-PG",
+        "smq-PG": "smq-Latn-PG",
         "smr": "smr-Latn-ID",
         "smr-ID": "smr-Latn-ID",
         "smr-Latn": "smr-Latn-ID",
@@ -17842,12 +17818,9 @@
         "sn": "sn-Latn-ZW",
         "sn-Latn": "sn-Latn-ZW",
         "sn-ZW": "sn-Latn-ZW",
-        "snb": "snb-Latn-MY",
-        "snb-Latn": "snb-Latn-MY",
-        "snb-MY": "snb-Latn-MY",
-        "snc": "snc-Latn-ZZ",
-        "snc-Latn": "snc-Latn-ZZ",
-        "snc-ZZ": "snc-Latn-ZZ",
+        "snc": "snc-Latn-PG",
+        "snc-Latn": "snc-Latn-PG",
+        "snc-PG": "snc-Latn-PG",
         "sne": "sne-Latn-MY",
         "sne-Latn": "sne-Latn-MY",
         "sne-MY": "sne-Latn-MY",
@@ -17879,9 +17852,9 @@
         "sno": "sno-Latn-US",
         "sno-Latn": "sno-Latn-US",
         "sno-US": "sno-Latn-US",
-        "snp": "snp-Latn-ZZ",
-        "snp-Latn": "snp-Latn-ZZ",
-        "snp-ZZ": "snp-Latn-ZZ",
+        "snp": "snp-Latn-PG",
+        "snp-Latn": "snp-Latn-PG",
+        "snp-PG": "snp-Latn-PG",
         "snq": "snq-Latn-GA",
         "snq-GA": "snq-Latn-GA",
         "snq-Latn": "snq-Latn-GA",
@@ -17900,12 +17873,12 @@
         "snw": "snw-Latn-GH",
         "snw-GH": "snw-Latn-GH",
         "snw-Latn": "snw-Latn-GH",
-        "snx": "snx-Latn-ZZ",
-        "snx-Latn": "snx-Latn-ZZ",
-        "snx-ZZ": "snx-Latn-ZZ",
-        "sny": "sny-Latn-ZZ",
-        "sny-Latn": "sny-Latn-ZZ",
-        "sny-ZZ": "sny-Latn-ZZ",
+        "snx": "snx-Latn-PG",
+        "snx-Latn": "snx-Latn-PG",
+        "snx-PG": "snx-Latn-PG",
+        "sny": "sny-Latn-PG",
+        "sny-Latn": "sny-Latn-PG",
+        "sny-PG": "sny-Latn-PG",
         "snz": "snz-Latn-PG",
         "snz-Latn": "snz-Latn-PG",
         "snz-PG": "snz-Latn-PG",
@@ -17935,9 +17908,9 @@
         "soi": "soi-Deva-NP",
         "soi-Deva": "soi-Deva-NP",
         "soi-NP": "soi-Deva-NP",
-        "sok": "sok-Latn-ZZ",
-        "sok-Latn": "sok-Latn-ZZ",
-        "sok-ZZ": "sok-Latn-ZZ",
+        "sok": "sok-Latn-TD",
+        "sok-Latn": "sok-Latn-TD",
+        "sok-TD": "sok-Latn-TD",
         "sol": "sol-Latn-PG",
         "sol-Latn": "sol-Latn-PG",
         "sol-PG": "sol-Latn-PG",
@@ -17947,9 +17920,9 @@
         "sop": "sop-Latn-CD",
         "sop-CD": "sop-Latn-CD",
         "sop-Latn": "sop-Latn-CD",
-        "soq": "soq-Latn-ZZ",
-        "soq-Latn": "soq-Latn-ZZ",
-        "soq-ZZ": "soq-Latn-ZZ",
+        "soq": "soq-Latn-PG",
+        "soq-Latn": "soq-Latn-PG",
+        "soq-PG": "soq-Latn-PG",
         "sor": "sor-Latn-TD",
         "sor-Latn": "sor-Latn-TD",
         "sor-TD": "sor-Latn-TD",
@@ -17968,9 +17941,9 @@
         "sox": "sox-Latn-CM",
         "sox-CM": "sox-Latn-CM",
         "sox-Latn": "sox-Latn-CM",
-        "soy": "soy-Latn-ZZ",
-        "soy-Latn": "soy-Latn-ZZ",
-        "soy-ZZ": "soy-Latn-ZZ",
+        "soy": "soy-Latn-BJ",
+        "soy-BJ": "soy-Latn-BJ",
+        "soy-Latn": "soy-Latn-BJ",
         "soz": "soz-Latn-TZ",
         "soz-Latn": "soz-Latn-TZ",
         "soz-TZ": "soz-Latn-TZ",
@@ -17980,9 +17953,9 @@
         "spc": "spc-Latn-VE",
         "spc-Latn": "spc-Latn-VE",
         "spc-VE": "spc-Latn-VE",
-        "spd": "spd-Latn-ZZ",
-        "spd-Latn": "spd-Latn-ZZ",
-        "spd-ZZ": "spd-Latn-ZZ",
+        "spd": "spd-Latn-PG",
+        "spd-Latn": "spd-Latn-PG",
+        "spd-PG": "spd-Latn-PG",
         "spe": "spe-Latn-PG",
         "spe-Latn": "spe-Latn-PG",
         "spe-PG": "spe-Latn-PG",
@@ -17995,9 +17968,9 @@
         "spk": "spk-Latn-PG",
         "spk-Latn": "spk-Latn-PG",
         "spk-PG": "spk-Latn-PG",
-        "spl": "spl-Latn-ZZ",
-        "spl-Latn": "spl-Latn-ZZ",
-        "spl-ZZ": "spl-Latn-ZZ",
+        "spl": "spl-Latn-PG",
+        "spl-Latn": "spl-Latn-PG",
+        "spl-PG": "spl-Latn-PG",
         "spm": "spm-Latn-PG",
         "spm-Latn": "spm-Latn-PG",
         "spm-PG": "spm-Latn-PG",
@@ -18016,9 +17989,9 @@
         "spr": "spr-Latn-ID",
         "spr-ID": "spr-Latn-ID",
         "spr-Latn": "spr-Latn-ID",
-        "sps": "sps-Latn-ZZ",
-        "sps-Latn": "sps-Latn-ZZ",
-        "sps-ZZ": "sps-Latn-ZZ",
+        "sps": "sps-Latn-PG",
+        "sps-Latn": "sps-Latn-PG",
+        "sps-PG": "sps-Latn-PG",
         "spt": "spt-Tibt-IN",
         "spt-IN": "spt-Tibt-IN",
         "spt-Tibt": "spt-Tibt-IN",
@@ -18136,9 +18109,9 @@
         "ssc": "ssc-Latn-TZ",
         "ssc-Latn": "ssc-Latn-TZ",
         "ssc-TZ": "ssc-Latn-TZ",
-        "ssd": "ssd-Latn-ZZ",
-        "ssd-Latn": "ssd-Latn-ZZ",
-        "ssd-ZZ": "ssd-Latn-ZZ",
+        "ssd": "ssd-Latn-PG",
+        "ssd-Latn": "ssd-Latn-PG",
+        "ssd-PG": "ssd-Latn-PG",
         "sse": "sse-Latn-PH",
         "sse-Arab": "sse-Arab-PH",
         "sse-Latn": "sse-Latn-PH",
@@ -18146,9 +18119,9 @@
         "ssf": "ssf-Latn-TW",
         "ssf-Latn": "ssf-Latn-TW",
         "ssf-TW": "ssf-Latn-TW",
-        "ssg": "ssg-Latn-ZZ",
-        "ssg-Latn": "ssg-Latn-ZZ",
-        "ssg-ZZ": "ssg-Latn-ZZ",
+        "ssg": "ssg-Latn-PG",
+        "ssg-Latn": "ssg-Latn-PG",
+        "ssg-PG": "ssg-Latn-PG",
         "ssh": "ssh-Arab-AE",
         "ssh-AE": "ssh-Arab-AE",
         "ssh-Arab": "ssh-Arab-AE",
@@ -18221,9 +18194,9 @@
         "stj": "stj-Latn-BF",
         "stj-BF": "stj-Latn-BF",
         "stj-Latn": "stj-Latn-BF",
-        "stk": "stk-Latn-ZZ",
-        "stk-Latn": "stk-Latn-ZZ",
-        "stk-ZZ": "stk-Latn-ZZ",
+        "stk": "stk-Latn-PG",
+        "stk-Latn": "stk-Latn-PG",
+        "stk-PG": "stk-Latn-PG",
         "stl": "stl-Latn-NL",
         "stl-Latn": "stl-Latn-NL",
         "stl-NL": "stl-Latn-NL",
@@ -18264,18 +18237,18 @@
         "su": "su-Latn-ID",
         "su-ID": "su-Latn-ID",
         "su-Latn": "su-Latn-ID",
-        "sua": "sua-Latn-ZZ",
-        "sua-Latn": "sua-Latn-ZZ",
-        "sua-ZZ": "sua-Latn-ZZ",
+        "sua": "sua-Latn-PG",
+        "sua-Latn": "sua-Latn-PG",
+        "sua-PG": "sua-Latn-PG",
         "sub": "sub-Latn-CD",
         "sub-CD": "sub-Latn-CD",
         "sub-Latn": "sub-Latn-CD",
         "suc": "suc-Latn-PH",
         "suc-Latn": "suc-Latn-PH",
         "suc-PH": "suc-Latn-PH",
-        "sue": "sue-Latn-ZZ",
-        "sue-Latn": "sue-Latn-ZZ",
-        "sue-ZZ": "sue-Latn-ZZ",
+        "sue": "sue-Latn-PG",
+        "sue-Latn": "sue-Latn-PG",
+        "sue-PG": "sue-Latn-PG",
         "sug": "sug-Latn-PG",
         "sug-Latn": "sug-Latn-PG",
         "sug-PG": "sug-Latn-PG",
@@ -18295,9 +18268,9 @@
         "suq-ET": "suq-Latn-ET",
         "suq-Ethi": "suq-Ethi-ET",
         "suq-Latn": "suq-Latn-ET",
-        "sur": "sur-Latn-ZZ",
-        "sur-Latn": "sur-Latn-ZZ",
-        "sur-ZZ": "sur-Latn-ZZ",
+        "sur": "sur-Latn-NG",
+        "sur-Latn": "sur-Latn-NG",
+        "sur-NG": "sur-Latn-NG",
         "sus": "sus-Latn-GN",
         "sus-GN": "sus-Latn-GN",
         "sus-Latn": "sus-Latn-GN",
@@ -18352,9 +18325,6 @@
         "swb": "swb-Arab-YT",
         "swb-Arab": "swb-Arab-YT",
         "swb-YT": "swb-Arab-YT",
-        "swc": "swc-Latn-CD",
-        "swc-CD": "swc-Latn-CD",
-        "swc-Latn": "swc-Latn-CD",
         "swf": "swf-Latn-CD",
         "swf-CD": "swf-Latn-CD",
         "swf-Latn": "swf-Latn-CD",
@@ -18376,9 +18346,9 @@
         "swo": "swo-Latn-BR",
         "swo-BR": "swo-Latn-BR",
         "swo-Latn": "swo-Latn-BR",
-        "swp": "swp-Latn-ZZ",
-        "swp-Latn": "swp-Latn-ZZ",
-        "swp-ZZ": "swp-Latn-ZZ",
+        "swp": "swp-Latn-PG",
+        "swp-Latn": "swp-Latn-PG",
+        "swp-PG": "swp-Latn-PG",
         "swq": "swq-Latn-CM",
         "swq-CM": "swq-Latn-CM",
         "swq-Latn": "swq-Latn-CM",
@@ -18425,9 +18395,9 @@
         "sxu-DE": "sxu-Latn-DE",
         "sxu-Latn": "sxu-Latn-DE",
         "sxu-Runr": "sxu-Runr-DE",
-        "sxw": "sxw-Latn-ZZ",
-        "sxw-Latn": "sxw-Latn-ZZ",
-        "sxw-ZZ": "sxw-Latn-ZZ",
+        "sxw": "sxw-Latn-BJ",
+        "sxw-BJ": "sxw-Latn-BJ",
+        "sxw-Latn": "sxw-Latn-BJ",
         "sya": "sya-Latn-ID",
         "sya-ID": "sya-Latn-ID",
         "sya-Latn": "sya-Latn-ID",
@@ -18531,21 +18501,22 @@
         "tak": "tak-Latn-NG",
         "tak-Latn": "tak-Latn-NG",
         "tak-NG": "tak-Latn-NG",
-        "tal": "tal-Latn-ZZ",
-        "tal-Latn": "tal-Latn-ZZ",
-        "tal-ZZ": "tal-Latn-ZZ",
-        "tan": "tan-Latn-ZZ",
-        "tan-Latn": "tan-Latn-ZZ",
-        "tan-ZZ": "tan-Latn-ZZ",
+        "tal": "tal-Latn-NG",
+        "tal-Latn": "tal-Latn-NG",
+        "tal-NG": "tal-Latn-NG",
+        "tan": "tan-Latn-NG",
+        "tan-Latn": "tan-Latn-NG",
+        "tan-NG": "tan-Latn-NG",
         "tao": "tao-Latn-TW",
         "tao-Latn": "tao-Latn-TW",
         "tao-TW": "tao-Latn-TW",
         "tap": "tap-Latn-CD",
         "tap-CD": "tap-Latn-CD",
         "tap-Latn": "tap-Latn-CD",
-        "taq": "taq-Latn-ZZ",
-        "taq-Latn": "taq-Latn-ZZ",
-        "taq-ZZ": "taq-Latn-ZZ",
+        "taq": "taq-Latn-ML",
+        "taq-Latn": "taq-Latn-ML",
+        "taq-ML": "taq-Latn-ML",
+        "taq-Tfng": "taq-Tfng-ML",
         "tar": "tar-Latn-MX",
         "tar-Latn": "tar-Latn-MX",
         "tar-MX": "tar-Latn-MX",
@@ -18575,21 +18546,21 @@
         "tba": "tba-Latn-BR",
         "tba-BR": "tba-Latn-BR",
         "tba-Latn": "tba-Latn-BR",
-        "tbc": "tbc-Latn-ZZ",
-        "tbc-Latn": "tbc-Latn-ZZ",
-        "tbc-ZZ": "tbc-Latn-ZZ",
-        "tbd": "tbd-Latn-ZZ",
-        "tbd-Latn": "tbd-Latn-ZZ",
-        "tbd-ZZ": "tbd-Latn-ZZ",
+        "tbc": "tbc-Latn-PG",
+        "tbc-Latn": "tbc-Latn-PG",
+        "tbc-PG": "tbc-Latn-PG",
+        "tbd": "tbd-Latn-PG",
+        "tbd-Latn": "tbd-Latn-PG",
+        "tbd-PG": "tbd-Latn-PG",
         "tbe": "tbe-Latn-SB",
         "tbe-Latn": "tbe-Latn-SB",
         "tbe-SB": "tbe-Latn-SB",
-        "tbf": "tbf-Latn-ZZ",
-        "tbf-Latn": "tbf-Latn-ZZ",
-        "tbf-ZZ": "tbf-Latn-ZZ",
-        "tbg": "tbg-Latn-ZZ",
-        "tbg-Latn": "tbg-Latn-ZZ",
-        "tbg-ZZ": "tbg-Latn-ZZ",
+        "tbf": "tbf-Latn-PG",
+        "tbf-Latn": "tbf-Latn-PG",
+        "tbf-PG": "tbf-Latn-PG",
+        "tbg": "tbg-Latn-PG",
+        "tbg-Latn": "tbg-Latn-PG",
+        "tbg-PG": "tbg-Latn-PG",
         "tbh": "tbh-Latn-AU",
         "tbh-AU": "tbh-Latn-AU",
         "tbh-Latn": "tbh-Latn-AU",
@@ -18613,9 +18584,9 @@
         "tbn": "tbn-Latn-CO",
         "tbn-CO": "tbn-Latn-CO",
         "tbn-Latn": "tbn-Latn-CO",
-        "tbo": "tbo-Latn-ZZ",
-        "tbo-Latn": "tbo-Latn-ZZ",
-        "tbo-ZZ": "tbo-Latn-ZZ",
+        "tbo": "tbo-Latn-PG",
+        "tbo-Latn": "tbo-Latn-PG",
+        "tbo-PG": "tbo-Latn-PG",
         "tbp": "tbp-Latn-ID",
         "tbp-ID": "tbp-Latn-ID",
         "tbp-Latn": "tbp-Latn-ID",
@@ -18640,9 +18611,9 @@
         "tby": "tby-Latn-ID",
         "tby-ID": "tby-Latn-ID",
         "tby-Latn": "tby-Latn-ID",
-        "tbz": "tbz-Latn-ZZ",
-        "tbz-Latn": "tbz-Latn-ZZ",
-        "tbz-ZZ": "tbz-Latn-ZZ",
+        "tbz": "tbz-Latn-BJ",
+        "tbz-BJ": "tbz-Latn-BJ",
+        "tbz-Latn": "tbz-Latn-BJ",
         "tca": "tca-Latn-BR",
         "tca-BR": "tca-Latn-BR",
         "tca-Latn": "tca-Latn-BR",
@@ -18667,9 +18638,9 @@
         "tch": "tch-Latn-TC",
         "tch-Latn": "tch-Latn-TC",
         "tch-TC": "tch-Latn-TC",
-        "tci": "tci-Latn-ZZ",
-        "tci-Latn": "tci-Latn-ZZ",
-        "tci-ZZ": "tci-Latn-ZZ",
+        "tci": "tci-Latn-PG",
+        "tci-Latn": "tci-Latn-PG",
+        "tci-PG": "tci-Latn-PG",
         "tck": "tck-Latn-GA",
         "tck-GA": "tck-Latn-GA",
         "tck-Latn": "tck-Latn-GA",
@@ -18764,9 +18735,6 @@
         "tdt": "tdt-Latn-TL",
         "tdt-Latn": "tdt-Latn-TL",
         "tdt-TL": "tdt-Latn-TL",
-        "tdu": "tdu-Latn-MY",
-        "tdu-Latn": "tdu-Latn-MY",
-        "tdu-MY": "tdu-Latn-MY",
         "tdv": "tdv-Latn-NG",
         "tdv-Latn": "tdv-Latn-NG",
         "tdv-NG": "tdv-Latn-NG",
@@ -18789,9 +18757,9 @@
         "tec": "tec-Latn-KE",
         "tec-KE": "tec-Latn-KE",
         "tec-Latn": "tec-Latn-KE",
-        "ted": "ted-Latn-ZZ",
-        "ted-Latn": "ted-Latn-ZZ",
-        "ted-ZZ": "ted-Latn-ZZ",
+        "ted": "ted-Latn-CI",
+        "ted-CI": "ted-Latn-CI",
+        "ted-Latn": "ted-Latn-CI",
         "tee": "tee-Latn-MX",
         "tee-Latn": "tee-Latn-MX",
         "tee-MX": "tee-Latn-MX",
@@ -18846,9 +18814,9 @@
         "tey": "tey-Latn-SD",
         "tey-Latn": "tey-Latn-SD",
         "tey-SD": "tey-Latn-SD",
-        "tfi": "tfi-Latn-ZZ",
-        "tfi-Latn": "tfi-Latn-ZZ",
-        "tfi-ZZ": "tfi-Latn-ZZ",
+        "tfi": "tfi-Latn-BJ",
+        "tfi-BJ": "tfi-Latn-BJ",
+        "tfi-Latn": "tfi-Latn-BJ",
         "tfn": "tfn-Latn-US",
         "tfn-Latn": "tfn-Latn-US",
         "tfn-US": "tfn-Latn-US",
@@ -18872,9 +18840,9 @@
         "tgb": "tgb-Latn-MY",
         "tgb-Latn": "tgb-Latn-MY",
         "tgb-MY": "tgb-Latn-MY",
-        "tgc": "tgc-Latn-ZZ",
-        "tgc-Latn": "tgc-Latn-ZZ",
-        "tgc-ZZ": "tgc-Latn-ZZ",
+        "tgc": "tgc-Latn-PG",
+        "tgc-Latn": "tgc-Latn-PG",
+        "tgc-PG": "tgc-Latn-PG",
         "tgd": "tgd-Latn-NG",
         "tgd-Latn": "tgd-Latn-NG",
         "tgd-NG": "tgd-Latn-NG",
@@ -18896,9 +18864,9 @@
         "tgn": "tgn-Latn-PH",
         "tgn-Latn": "tgn-Latn-PH",
         "tgn-PH": "tgn-Latn-PH",
-        "tgo": "tgo-Latn-ZZ",
-        "tgo-Latn": "tgo-Latn-ZZ",
-        "tgo-ZZ": "tgo-Latn-ZZ",
+        "tgo": "tgo-Latn-PG",
+        "tgo-Latn": "tgo-Latn-PG",
+        "tgo-PG": "tgo-Latn-PG",
         "tgp": "tgp-Latn-VU",
         "tgp-Latn": "tgp-Latn-VU",
         "tgp-VU": "tgp-Latn-VU",
@@ -18913,9 +18881,9 @@
         "tgt-Latn": "tgt-Latn-PH",
         "tgt-PH": "tgt-Latn-PH",
         "tgt-Tagb": "tgt-Tagb-PH",
-        "tgu": "tgu-Latn-ZZ",
-        "tgu-Latn": "tgu-Latn-ZZ",
-        "tgu-ZZ": "tgu-Latn-ZZ",
+        "tgu": "tgu-Latn-PG",
+        "tgu-Latn": "tgu-Latn-PG",
+        "tgu-PG": "tgu-Latn-PG",
         "tgv": "tgv-Latn-BR",
         "tgv-BR": "tgv-Latn-BR",
         "tgv-Latn": "tgv-Latn-BR",
@@ -18996,9 +18964,9 @@
         "tic": "tic-Latn-SD",
         "tic-Latn": "tic-Latn-SD",
         "tic-SD": "tic-Latn-SD",
-        "tif": "tif-Latn-ZZ",
-        "tif-Latn": "tif-Latn-ZZ",
-        "tif-ZZ": "tif-Latn-ZZ",
+        "tif": "tif-Latn-PG",
+        "tif-Latn": "tif-Latn-PG",
+        "tif-PG": "tif-Latn-PG",
         "tig": "tig-Ethi-ER",
         "tig-ER": "tig-Ethi-ER",
         "tig-Ethi": "tig-Ethi-ER",
@@ -19011,21 +18979,21 @@
         "tij": "tij-Deva-NP",
         "tij-Deva": "tij-Deva-NP",
         "tij-NP": "tij-Deva-NP",
-        "tik": "tik-Latn-ZZ",
-        "tik-Latn": "tik-Latn-ZZ",
-        "tik-ZZ": "tik-Latn-ZZ",
+        "tik": "tik-Latn-CM",
+        "tik-CM": "tik-Latn-CM",
+        "tik-Latn": "tik-Latn-CM",
         "til": "til-Latn-US",
         "til-Latn": "til-Latn-US",
         "til-US": "til-Latn-US",
-        "tim": "tim-Latn-ZZ",
-        "tim-Latn": "tim-Latn-ZZ",
-        "tim-ZZ": "tim-Latn-ZZ",
+        "tim": "tim-Latn-PG",
+        "tim-Latn": "tim-Latn-PG",
+        "tim-PG": "tim-Latn-PG",
         "tin": "tin-Cyrl-RU",
         "tin-Cyrl": "tin-Cyrl-RU",
         "tin-RU": "tin-Cyrl-RU",
-        "tio": "tio-Latn-ZZ",
-        "tio-Latn": "tio-Latn-ZZ",
-        "tio-ZZ": "tio-Latn-ZZ",
+        "tio": "tio-Latn-PG",
+        "tio-Latn": "tio-Latn-PG",
+        "tio-PG": "tio-Latn-PG",
         "tip": "tip-Latn-ID",
         "tip-ID": "tip-Latn-ID",
         "tip-Latn": "tip-Latn-ID",
@@ -19155,9 +19123,9 @@
         "tld": "tld-Latn-ID",
         "tld-ID": "tld-Latn-ID",
         "tld-Latn": "tld-Latn-ID",
-        "tlf": "tlf-Latn-ZZ",
-        "tlf-Latn": "tlf-Latn-ZZ",
-        "tlf-ZZ": "tlf-Latn-ZZ",
+        "tlf": "tlf-Latn-PG",
+        "tlf-Latn": "tlf-Latn-PG",
+        "tlf-PG": "tlf-Latn-PG",
         "tlg": "tlg-Latn-ID",
         "tlg-ID": "tlg-Latn-ID",
         "tlg-Latn": "tlg-Latn-ID",
@@ -19204,9 +19172,9 @@
         "tlv": "tlv-Latn-ID",
         "tlv-ID": "tlv-Latn-ID",
         "tlv-Latn": "tlv-Latn-ID",
-        "tlx": "tlx-Latn-ZZ",
-        "tlx-Latn": "tlx-Latn-ZZ",
-        "tlx-ZZ": "tlx-Latn-ZZ",
+        "tlx": "tlx-Latn-PG",
+        "tlx-Latn": "tlx-Latn-PG",
+        "tlx-PG": "tlx-Latn-PG",
         "tly": "tly-Latn-AZ",
         "tly-AZ": "tly-Latn-AZ",
         "tly-Latn": "tly-Latn-AZ",
@@ -19273,9 +19241,9 @@
         "tmw": "tmw-Latn-MY",
         "tmw-Latn": "tmw-Latn-MY",
         "tmw-MY": "tmw-Latn-MY",
-        "tmy": "tmy-Latn-ZZ",
-        "tmy-Latn": "tmy-Latn-ZZ",
-        "tmy-ZZ": "tmy-Latn-ZZ",
+        "tmy": "tmy-Latn-PG",
+        "tmy-Latn": "tmy-Latn-PG",
+        "tmy-PG": "tmy-Latn-PG",
         "tmz": "tmz-Latn-VE",
         "tmz-Latn": "tmz-Latn-VE",
         "tmz-VE": "tmz-Latn-VE",
@@ -19297,9 +19265,9 @@
         "tng": "tng-Latn-TD",
         "tng-Latn": "tng-Latn-TD",
         "tng-TD": "tng-Latn-TD",
-        "tnh": "tnh-Latn-ZZ",
-        "tnh-Latn": "tnh-Latn-ZZ",
-        "tnh-ZZ": "tnh-Latn-ZZ",
+        "tnh": "tnh-Latn-PG",
+        "tnh-Latn": "tnh-Latn-PG",
+        "tnh-PG": "tnh-Latn-PG",
         "tni": "tni-Latn-ID",
         "tni-ID": "tni-Latn-ID",
         "tni-Latn": "tni-Latn-ID",
@@ -19357,9 +19325,9 @@
         "tod": "tod-Latn-GN",
         "tod-GN": "tod-Latn-GN",
         "tod-Latn": "tod-Latn-GN",
-        "tof": "tof-Latn-ZZ",
-        "tof-Latn": "tof-Latn-ZZ",
-        "tof-ZZ": "tof-Latn-ZZ",
+        "tof": "tof-Latn-PG",
+        "tof-Latn": "tof-Latn-PG",
+        "tof-PG": "tof-Latn-PG",
         "tog": "tog-Latn-MW",
         "tog-Latn": "tog-Latn-MW",
         "tog-MW": "tog-Latn-MW",
@@ -19387,9 +19355,9 @@
         "top": "top-Latn-MX",
         "top-Latn": "top-Latn-MX",
         "top-MX": "top-Latn-MX",
-        "toq": "toq-Latn-ZZ",
-        "toq-Latn": "toq-Latn-ZZ",
-        "toq-ZZ": "toq-Latn-ZZ",
+        "toq": "toq-Latn-SS",
+        "toq-Latn": "toq-Latn-SS",
+        "toq-SS": "toq-Latn-SS",
         "tor": "tor-Latn-CD",
         "tor-CD": "tor-Latn-CD",
         "tor-Latn": "tor-Latn-CD",
@@ -19442,9 +19410,9 @@
         "tpl": "tpl-Latn-MX",
         "tpl-Latn": "tpl-Latn-MX",
         "tpl-MX": "tpl-Latn-MX",
-        "tpm": "tpm-Latn-ZZ",
-        "tpm-Latn": "tpm-Latn-ZZ",
-        "tpm-ZZ": "tpm-Latn-ZZ",
+        "tpm": "tpm-Latn-GH",
+        "tpm-GH": "tpm-Latn-GH",
+        "tpm-Latn": "tpm-Latn-GH",
         "tpn": "tpn-Latn-BR",
         "tpn-BR": "tpn-Latn-BR",
         "tpn-Latn": "tpn-Latn-BR",
@@ -19469,9 +19437,9 @@
         "tpy": "tpy-Latn-BR",
         "tpy-BR": "tpy-Latn-BR",
         "tpy-Latn": "tpy-Latn-BR",
-        "tpz": "tpz-Latn-ZZ",
-        "tpz-Latn": "tpz-Latn-ZZ",
-        "tpz-ZZ": "tpz-Latn-ZZ",
+        "tpz": "tpz-Latn-PG",
+        "tpz-Latn": "tpz-Latn-PG",
+        "tpz-PG": "tpz-Latn-PG",
         "tqb": "tqb-Latn-BR",
         "tqb-BR": "tqb-Latn-BR",
         "tqb-Latn": "tqb-Latn-BR",
@@ -19484,9 +19452,9 @@
         "tqn": "tqn-Latn-US",
         "tqn-Latn": "tqn-Latn-US",
         "tqn-US": "tqn-Latn-US",
-        "tqo": "tqo-Latn-ZZ",
-        "tqo-Latn": "tqo-Latn-ZZ",
-        "tqo-ZZ": "tqo-Latn-ZZ",
+        "tqo": "tqo-Latn-PG",
+        "tqo-Latn": "tqo-Latn-PG",
+        "tqo-PG": "tqo-Latn-PG",
         "tqp": "tqp-Latn-PG",
         "tqp-Latn": "tqp-Latn-PG",
         "tqp-PG": "tqp-Latn-PG",
@@ -19593,9 +19561,6 @@
         "tsd": "tsd-Grek-GR",
         "tsd-GR": "tsd-Grek-GR",
         "tsd-Grek": "tsd-Grek-GR",
-        "tsf": "tsf-Deva-NP",
-        "tsf-Deva": "tsf-Deva-NP",
-        "tsf-NP": "tsf-Deva-NP",
         "tsg": "tsg-Latn-PH",
         "tsg-Latn": "tsg-Latn-PH",
         "tsg-PH": "tsg-Latn-PH",
@@ -19626,9 +19591,9 @@
         "tsv": "tsv-Latn-GA",
         "tsv-GA": "tsv-Latn-GA",
         "tsv-Latn": "tsv-Latn-GA",
-        "tsw": "tsw-Latn-ZZ",
-        "tsw-Latn": "tsw-Latn-ZZ",
-        "tsw-ZZ": "tsw-Latn-ZZ",
+        "tsw": "tsw-Latn-NG",
+        "tsw-Latn": "tsw-Latn-NG",
+        "tsw-NG": "tsw-Latn-NG",
         "tsx": "tsx-Latn-PG",
         "tsx-Latn": "tsx-Latn-PG",
         "tsx-PG": "tsx-Latn-PG",
@@ -19644,12 +19609,12 @@
         "ttc": "ttc-Latn-GT",
         "ttc-GT": "ttc-Latn-GT",
         "ttc-Latn": "ttc-Latn-GT",
-        "ttd": "ttd-Latn-ZZ",
-        "ttd-Latn": "ttd-Latn-ZZ",
-        "ttd-ZZ": "ttd-Latn-ZZ",
-        "tte": "tte-Latn-ZZ",
-        "tte-Latn": "tte-Latn-ZZ",
-        "tte-ZZ": "tte-Latn-ZZ",
+        "ttd": "ttd-Latn-PG",
+        "ttd-Latn": "ttd-Latn-PG",
+        "ttd-PG": "ttd-Latn-PG",
+        "tte": "tte-Latn-PG",
+        "tte-Latn": "tte-Latn-PG",
+        "tte-PG": "tte-Latn-PG",
         "ttf": "ttf-Latn-CM",
         "ttf-CM": "ttf-Latn-CM",
         "ttf-Latn": "ttf-Latn-CM",
@@ -19680,9 +19645,9 @@
         "ttp": "ttp-Latn-ID",
         "ttp-ID": "ttp-Latn-ID",
         "ttp-Latn": "ttp-Latn-ID",
-        "ttr": "ttr-Latn-ZZ",
-        "ttr-Latn": "ttr-Latn-ZZ",
-        "ttr-ZZ": "ttr-Latn-ZZ",
+        "ttr": "ttr-Latn-NG",
+        "ttr-Latn": "ttr-Latn-NG",
+        "ttr-NG": "ttr-Latn-NG",
         "tts": "tts-Thai-TH",
         "tts-TH": "tts-Thai-TH",
         "tts-Thai": "tts-Thai-TH",
@@ -19722,18 +19687,18 @@
         "tug": "tug-Latn-TD",
         "tug-Latn": "tug-Latn-TD",
         "tug-TD": "tug-Latn-TD",
-        "tuh": "tuh-Latn-ZZ",
-        "tuh-Latn": "tuh-Latn-ZZ",
-        "tuh-ZZ": "tuh-Latn-ZZ",
+        "tuh": "tuh-Latn-PG",
+        "tuh-Latn": "tuh-Latn-PG",
+        "tuh-PG": "tuh-Latn-PG",
         "tui": "tui-Latn-CM",
         "tui-CM": "tui-Latn-CM",
         "tui-Latn": "tui-Latn-CM",
         "tuj": "tuj-Latn-ID",
         "tuj-ID": "tuj-Latn-ID",
         "tuj-Latn": "tuj-Latn-ID",
-        "tul": "tul-Latn-ZZ",
-        "tul-Latn": "tul-Latn-ZZ",
-        "tul-ZZ": "tul-Latn-ZZ",
+        "tul": "tul-Latn-NG",
+        "tul-Latn": "tul-Latn-NG",
+        "tul-NG": "tul-Latn-NG",
         "tum": "tum-Latn-MW",
         "tum-Latn": "tum-Latn-MW",
         "tum-MW": "tum-Latn-MW",
@@ -19743,9 +19708,9 @@
         "tuo": "tuo-Latn-BR",
         "tuo-BR": "tuo-Latn-BR",
         "tuo-Latn": "tuo-Latn-BR",
-        "tuq": "tuq-Latn-ZZ",
-        "tuq-Latn": "tuq-Latn-ZZ",
-        "tuq-ZZ": "tuq-Latn-ZZ",
+        "tuq": "tuq-Latn-TD",
+        "tuq-Latn": "tuq-Latn-TD",
+        "tuq-TD": "tuq-Latn-TD",
         "tus": "tus-Latn-CA",
         "tus-CA": "tus-Latn-CA",
         "tus-Latn": "tus-Latn-CA",
@@ -19767,9 +19732,9 @@
         "tva": "tva-Latn-SB",
         "tva-Latn": "tva-Latn-SB",
         "tva-SB": "tva-Latn-SB",
-        "tvd": "tvd-Latn-ZZ",
-        "tvd-Latn": "tvd-Latn-ZZ",
-        "tvd-ZZ": "tvd-Latn-ZZ",
+        "tvd": "tvd-Latn-NG",
+        "tvd-Latn": "tvd-Latn-NG",
+        "tvd-NG": "tvd-Latn-NG",
         "tve": "tve-Latn-ID",
         "tve-ID": "tve-Latn-ID",
         "tve-Latn": "tve-Latn-ID",
@@ -19794,9 +19759,9 @@
         "tvt": "tvt-Latn-IN",
         "tvt-IN": "tvt-Latn-IN",
         "tvt-Latn": "tvt-Latn-IN",
-        "tvu": "tvu-Latn-ZZ",
-        "tvu-Latn": "tvu-Latn-ZZ",
-        "tvu-ZZ": "tvu-Latn-ZZ",
+        "tvu": "tvu-Latn-CM",
+        "tvu-CM": "tvu-Latn-CM",
+        "tvu-Latn": "tvu-Latn-CM",
         "tvw": "tvw-Latn-ID",
         "tvw-ID": "tvw-Latn-ID",
         "tvw-Latn": "tvw-Latn-ID",
@@ -19821,9 +19786,10 @@
         "twg": "twg-Latn-ID",
         "twg-ID": "twg-Latn-ID",
         "twg-Latn": "twg-Latn-ID",
-        "twh": "twh-Latn-ZZ",
-        "twh-Latn": "twh-Latn-ZZ",
-        "twh-ZZ": "twh-Latn-ZZ",
+        "twh": "twh-Latn-VN",
+        "twh-Latn": "twh-Latn-VN",
+        "twh-Tavt": "twh-Tavt-VN",
+        "twh-VN": "twh-Latn-VN",
         "twl": "twl-Latn-MZ",
         "twl-Latn": "twl-Latn-MZ",
         "twl-MZ": "twl-Latn-MZ",
@@ -19905,9 +19871,9 @@
         "ty": "ty-Latn-PF",
         "ty-Latn": "ty-Latn-PF",
         "ty-PF": "ty-Latn-PF",
-        "tya": "tya-Latn-ZZ",
-        "tya-Latn": "tya-Latn-ZZ",
-        "tya-ZZ": "tya-Latn-ZZ",
+        "tya": "tya-Latn-PG",
+        "tya-Latn": "tya-Latn-PG",
+        "tya-PG": "tya-Latn-PG",
         "tye": "tye-Latn-NG",
         "tye-Latn": "tye-Latn-NG",
         "tye-NG": "tye-Latn-NG",
@@ -19993,9 +19959,9 @@
         "ubr": "ubr-Latn-PG",
         "ubr-Latn": "ubr-Latn-PG",
         "ubr-PG": "ubr-Latn-PG",
-        "ubu": "ubu-Latn-ZZ",
-        "ubu-Latn": "ubu-Latn-ZZ",
-        "ubu-ZZ": "ubu-Latn-ZZ",
+        "ubu": "ubu-Latn-PG",
+        "ubu-Latn": "ubu-Latn-PG",
+        "ubu-PG": "ubu-Latn-PG",
         "uda": "uda-Latn-NG",
         "uda-Latn": "uda-Latn-NG",
         "uda-NG": "uda-Latn-NG",
@@ -20168,36 +20134,8 @@
         "una-Latn": "una-Latn-PG",
         "una-PG": "una-Latn-PG",
         "und": "en-Latn-US",
-        "und-002": "en-Latn-NG",
-        "und-003": "en-Latn-US",
-        "und-005": "pt-Latn-BR",
-        "und-009": "en-Latn-AU",
-        "und-011": "en-Latn-NG",
-        "und-013": "es-Latn-MX",
-        "und-014": "sw-Latn-TZ",
-        "und-015": "ar-Arab-EG",
-        "und-017": "sw-Latn-CD",
-        "und-018": "en-Latn-ZA",
-        "und-019": "en-Latn-US",
-        "und-021": "en-Latn-US",
-        "und-029": "es-Latn-CU",
-        "und-030": "zh-Hans-CN",
-        "und-034": "hi-Deva-IN",
-        "und-035": "id-Latn-ID",
-        "und-039": "it-Latn-IT",
-        "und-053": "en-Latn-AU",
-        "und-054": "en-Latn-PG",
-        "und-057": "en-Latn-GU",
-        "und-061": "sm-Latn-WS",
-        "und-142": "zh-Hans-CN",
-        "und-143": "uz-Latn-UZ",
-        "und-145": "ar-Arab-SA",
-        "und-150": "ru-Cyrl-RU",
-        "und-151": "ru-Cyrl-RU",
-        "und-154": "en-Latn-GB",
-        "und-155": "de-Latn-DE",
-        "und-202": "en-Latn-NG",
         "und-419": "es-Latn-419",
+        "und-AC": "en-Latn-AC",
         "und-AD": "ca-Latn-AD",
         "und-AE": "ar-Arab-AE",
         "und-AF": "fa-Arab-AF",
@@ -20206,7 +20144,7 @@
         "und-AL": "sq-Latn-AL",
         "und-AM": "hy-Armn-AM",
         "und-AO": "pt-Latn-AO",
-        "und-AQ": "und-Latn-AQ",
+        "und-AQ": "en-Latn-AQ",
         "und-AR": "es-Latn-AR",
         "und-AS": "sm-Latn-AS",
         "und-AT": "de-Latn-AT",
@@ -20218,11 +20156,13 @@
         "und-Aghb": "udi-Aghb-RU",
         "und-Ahom": "aho-Ahom-IN",
         "und-Arab": "ar-Arab-EG",
+        "und-Arab-AF": "fa-Arab-AF",
         "und-Arab-CC": "ms-Arab-CC",
         "und-Arab-CN": "ug-Arab-CN",
         "und-Arab-GB": "ur-Arab-GB",
         "und-Arab-ID": "ms-Arab-ID",
         "und-Arab-IN": "ur-Arab-IN",
+        "und-Arab-IR": "fa-Arab-IR",
         "und-Arab-KH": "cja-Arab-KH",
         "und-Arab-MM": "rhg-Arab-MM",
         "und-Arab-MN": "kk-Arab-MN",
@@ -20254,7 +20194,7 @@
         "und-BR": "pt-Latn-BR",
         "und-BS": "en-Latn-BS",
         "und-BT": "dz-Tibt-BT",
-        "und-BV": "und-Latn-BV",
+        "und-BV": "en-Latn-BV",
         "und-BW": "en-Latn-BW",
         "und-BY": "be-Cyrl-BY",
         "und-BZ": "en-Latn-BZ",
@@ -20270,7 +20210,7 @@
         "und-Bugi": "bug-Bugi-ID",
         "und-Buhd": "bku-Buhd-PH",
         "und-CA": "en-Latn-CA",
-        "und-CC": "en-Latn-CC",
+        "und-CC": "ms-Arab-CC",
         "und-CD": "sw-Latn-CD",
         "und-CF": "fr-Latn-CF",
         "und-CG": "fr-Latn-CG",
@@ -20281,7 +20221,8 @@
         "und-CM": "fr-Latn-CM",
         "und-CN": "zh-Hans-CN",
         "und-CO": "es-Latn-CO",
-        "und-CP": "und-Latn-CP",
+        "und-CP": "en-Latn-CP",
+        "und-CQ": "en-Latn-CQ",
         "und-CR": "es-Latn-CR",
         "und-CU": "es-Latn-CU",
         "und-CV": "pt-Latn-CV",
@@ -20296,18 +20237,24 @@
         "und-Cher": "chr-Cher-US",
         "und-Chrs": "xco-Chrs-UZ",
         "und-Copt": "cop-Copt-EG",
-        "und-Cpmn": "und-Cpmn-CY",
-        "und-Cpmn-CY": "und-Cpmn-CY",
         "und-Cprt": "grc-Cprt-CY",
         "und-Cyrl": "ru-Cyrl-RU",
         "und-Cyrl-AL": "mk-Cyrl-AL",
         "und-Cyrl-BA": "sr-Cyrl-BA",
+        "und-Cyrl-BG": "bg-Cyrl-BG",
+        "und-Cyrl-BY": "be-Cyrl-BY",
         "und-Cyrl-GE": "ab-Cyrl-GE",
         "und-Cyrl-GR": "mk-Cyrl-GR",
+        "und-Cyrl-KG": "ky-Cyrl-KG",
         "und-Cyrl-MD": "uk-Cyrl-MD",
+        "und-Cyrl-MK": "mk-Cyrl-MK",
+        "und-Cyrl-MN": "mn-Cyrl-MN",
         "und-Cyrl-RO": "bg-Cyrl-RO",
+        "und-Cyrl-RS": "sr-Cyrl-RS",
         "und-Cyrl-SK": "uk-Cyrl-SK",
+        "und-Cyrl-TJ": "tg-Cyrl-TJ",
         "und-Cyrl-TR": "kbd-Cyrl-TR",
+        "und-Cyrl-UA": "uk-Cyrl-UA",
         "und-Cyrl-XK": "sr-Cyrl-XK",
         "und-DE": "de-Latn-DE",
         "und-DG": "en-Latn-DG",
@@ -20320,6 +20267,7 @@
         "und-Deva-BT": "ne-Deva-BT",
         "und-Deva-FJ": "hif-Deva-FJ",
         "und-Deva-MU": "bho-Deva-MU",
+        "und-Deva-NP": "ne-Deva-NP",
         "und-Deva-PK": "btv-Deva-PK",
         "und-Diak": "dv-Diak-MV",
         "und-Dogr": "doi-Dogr-IN",
@@ -20332,12 +20280,11 @@
         "und-ER": "ti-Ethi-ER",
         "und-ES": "es-Latn-ES",
         "und-ET": "am-Ethi-ET",
-        "und-EU": "en-Latn-IE",
-        "und-EZ": "de-Latn-EZ",
         "und-Egyp": "egy-Egyp-EG",
         "und-Elba": "sq-Elba-AL",
         "und-Elym": "arc-Elym-IR",
         "und-Ethi": "am-Ethi-ET",
+        "und-Ethi-ER": "ti-Ethi-ER",
         "und-FI": "fi-Latn-FI",
         "und-FJ": "en-Latn-FJ",
         "und-FK": "en-Latn-FK",
@@ -20358,7 +20305,7 @@
         "und-GP": "fr-Latn-GP",
         "und-GQ": "es-Latn-GQ",
         "und-GR": "el-Grek-GR",
-        "und-GS": "und-Latn-GS",
+        "und-GS": "en-Latn-GS",
         "und-GT": "es-Latn-GT",
         "und-GU": "en-Latn-GU",
         "und-GW": "pt-Latn-GW",
@@ -20374,7 +20321,7 @@
         "und-Gujr": "gu-Gujr-IN",
         "und-Guru": "pa-Guru-IN",
         "und-HK": "zh-Hant-HK",
-        "und-HM": "und-Latn-HM",
+        "und-HM": "en-Latn-HM",
         "und-HN": "es-Latn-HN",
         "und-HR": "hr-Latn-HR",
         "und-HT": "ht-Latn-HT",
@@ -20392,7 +20339,7 @@
         "und-Hebr-US": "yi-Hebr-US",
         "und-Hira": "ja-Hira-JP",
         "und-Hluw": "hlu-Hluw-TR",
-        "und-Hmng": "hnj-Hmng-LA",
+        "und-Hmng": "hnj-Hmng-US",
         "und-Hmnp": "hnj-Hmnp-US",
         "und-Hung": "hu-Hung-HU",
         "und-IC": "es-Latn-IC",
@@ -20457,26 +20404,161 @@
         "und-Laoo-TH": "hnj-Laoo-TH",
         "und-Laoo-US": "hnj-Laoo-US",
         "und-Laoo-VN": "hnj-Laoo-VN",
-        "und-Latn": "und-Latn-AQ",
+        "und-Latn": "en-Latn-US",
+        "und-Latn-419": "es-Latn-419",
+        "und-Latn-AD": "ca-Latn-AD",
         "und-Latn-AF": "tk-Latn-AF",
+        "und-Latn-AL": "sq-Latn-AL",
         "und-Latn-AM": "ku-Latn-AM",
+        "und-Latn-AO": "pt-Latn-AO",
+        "und-Latn-AR": "es-Latn-AR",
+        "und-Latn-AS": "sm-Latn-AS",
+        "und-Latn-AT": "de-Latn-AT",
+        "und-Latn-AW": "nl-Latn-AW",
+        "und-Latn-AX": "sv-Latn-AX",
+        "und-Latn-AZ": "az-Latn-AZ",
+        "und-Latn-BA": "bs-Latn-BA",
+        "und-Latn-BE": "nl-Latn-BE",
+        "und-Latn-BF": "fr-Latn-BF",
+        "und-Latn-BI": "rn-Latn-BI",
+        "und-Latn-BJ": "fr-Latn-BJ",
+        "und-Latn-BL": "fr-Latn-BL",
+        "und-Latn-BN": "ms-Latn-BN",
+        "und-Latn-BO": "es-Latn-BO",
+        "und-Latn-BQ": "pap-Latn-BQ",
+        "und-Latn-BR": "pt-Latn-BR",
+        "und-Latn-CD": "sw-Latn-CD",
+        "und-Latn-CF": "fr-Latn-CF",
+        "und-Latn-CG": "fr-Latn-CG",
+        "und-Latn-CH": "de-Latn-CH",
+        "und-Latn-CI": "fr-Latn-CI",
+        "und-Latn-CL": "es-Latn-CL",
+        "und-Latn-CM": "fr-Latn-CM",
         "und-Latn-CN": "za-Latn-CN",
+        "und-Latn-CO": "es-Latn-CO",
+        "und-Latn-CR": "es-Latn-CR",
+        "und-Latn-CU": "es-Latn-CU",
+        "und-Latn-CV": "pt-Latn-CV",
+        "und-Latn-CW": "pap-Latn-CW",
         "und-Latn-CY": "tr-Latn-CY",
+        "und-Latn-CZ": "cs-Latn-CZ",
+        "und-Latn-DE": "de-Latn-DE",
+        "und-Latn-DJ": "aa-Latn-DJ",
+        "und-Latn-DK": "da-Latn-DK",
+        "und-Latn-DO": "es-Latn-DO",
         "und-Latn-DZ": "fr-Latn-DZ",
+        "und-Latn-EA": "es-Latn-EA",
+        "und-Latn-EC": "es-Latn-EC",
+        "und-Latn-EE": "et-Latn-EE",
+        "und-Latn-ES": "es-Latn-ES",
         "und-Latn-ET": "en-Latn-ET",
+        "und-Latn-FI": "fi-Latn-FI",
+        "und-Latn-FO": "fo-Latn-FO",
+        "und-Latn-FR": "fr-Latn-FR",
+        "und-Latn-GA": "fr-Latn-GA",
         "und-Latn-GE": "ku-Latn-GE",
+        "und-Latn-GF": "fr-Latn-GF",
+        "und-Latn-GH": "ak-Latn-GH",
+        "und-Latn-GL": "kl-Latn-GL",
+        "und-Latn-GN": "fr-Latn-GN",
+        "und-Latn-GP": "fr-Latn-GP",
+        "und-Latn-GQ": "es-Latn-GQ",
+        "und-Latn-GT": "es-Latn-GT",
+        "und-Latn-GW": "pt-Latn-GW",
+        "und-Latn-HN": "es-Latn-HN",
+        "und-Latn-HR": "hr-Latn-HR",
+        "und-Latn-HT": "ht-Latn-HT",
+        "und-Latn-HU": "hu-Latn-HU",
+        "und-Latn-IC": "es-Latn-IC",
+        "und-Latn-ID": "id-Latn-ID",
         "und-Latn-IR": "tk-Latn-IR",
+        "und-Latn-IS": "is-Latn-IS",
+        "und-Latn-IT": "it-Latn-IT",
+        "und-Latn-KE": "sw-Latn-KE",
         "und-Latn-KM": "fr-Latn-KM",
+        "und-Latn-LI": "de-Latn-LI",
+        "und-Latn-LS": "st-Latn-LS",
+        "und-Latn-LT": "lt-Latn-LT",
+        "und-Latn-LU": "fr-Latn-LU",
+        "und-Latn-LV": "lv-Latn-LV",
         "und-Latn-MA": "fr-Latn-MA",
+        "und-Latn-MC": "fr-Latn-MC",
+        "und-Latn-MD": "ro-Latn-MD",
+        "und-Latn-ME": "sr-Latn-ME",
+        "und-Latn-MF": "fr-Latn-MF",
+        "und-Latn-MG": "mg-Latn-MG",
         "und-Latn-MK": "sq-Latn-MK",
+        "und-Latn-ML": "bm-Latn-ML",
         "und-Latn-MM": "kac-Latn-MM",
         "und-Latn-MO": "pt-Latn-MO",
+        "und-Latn-MQ": "fr-Latn-MQ",
         "und-Latn-MR": "fr-Latn-MR",
+        "und-Latn-MT": "mt-Latn-MT",
+        "und-Latn-MU": "mfe-Latn-MU",
+        "und-Latn-MX": "es-Latn-MX",
+        "und-Latn-MY": "ms-Latn-MY",
+        "und-Latn-MZ": "pt-Latn-MZ",
+        "und-Latn-NA": "af-Latn-NA",
+        "und-Latn-NC": "fr-Latn-NC",
+        "und-Latn-NE": "ha-Latn-NE",
+        "und-Latn-NI": "es-Latn-NI",
+        "und-Latn-NL": "nl-Latn-NL",
+        "und-Latn-NO": "nb-Latn-NO",
+        "und-Latn-PA": "es-Latn-PA",
+        "und-Latn-PE": "es-Latn-PE",
+        "und-Latn-PF": "fr-Latn-PF",
+        "und-Latn-PG": "tpi-Latn-PG",
+        "und-Latn-PH": "fil-Latn-PH",
+        "und-Latn-PL": "pl-Latn-PL",
+        "und-Latn-PM": "fr-Latn-PM",
+        "und-Latn-PR": "es-Latn-PR",
+        "und-Latn-PT": "pt-Latn-PT",
+        "und-Latn-PW": "pau-Latn-PW",
+        "und-Latn-PY": "gn-Latn-PY",
+        "und-Latn-RE": "fr-Latn-RE",
+        "und-Latn-RO": "ro-Latn-RO",
+        "und-Latn-RS": "sr-Latn-RS",
         "und-Latn-RU": "krl-Latn-RU",
+        "und-Latn-RW": "rw-Latn-RW",
+        "und-Latn-SC": "fr-Latn-SC",
+        "und-Latn-SE": "sv-Latn-SE",
+        "und-Latn-SI": "sl-Latn-SI",
+        "und-Latn-SJ": "nb-Latn-SJ",
+        "und-Latn-SK": "sk-Latn-SK",
+        "und-Latn-SL": "kri-Latn-SL",
+        "und-Latn-SM": "it-Latn-SM",
+        "und-Latn-SN": "fr-Latn-SN",
+        "und-Latn-SO": "so-Latn-SO",
+        "und-Latn-SR": "nl-Latn-SR",
+        "und-Latn-ST": "pt-Latn-ST",
+        "und-Latn-SV": "es-Latn-SV",
         "und-Latn-SY": "fr-Latn-SY",
+        "und-Latn-TD": "fr-Latn-TD",
+        "und-Latn-TF": "fr-Latn-TF",
+        "und-Latn-TG": "fr-Latn-TG",
+        "und-Latn-TK": "tkl-Latn-TK",
+        "und-Latn-TL": "pt-Latn-TL",
+        "und-Latn-TM": "tk-Latn-TM",
         "und-Latn-TN": "fr-Latn-TN",
+        "und-Latn-TO": "to-Latn-TO",
+        "und-Latn-TR": "tr-Latn-TR",
+        "und-Latn-TV": "tvl-Latn-TV",
         "und-Latn-TW": "trv-Latn-TW",
+        "und-Latn-TZ": "sw-Latn-TZ",
         "und-Latn-UA": "pl-Latn-UA",
+        "und-Latn-UG": "sw-Latn-UG",
+        "und-Latn-UY": "es-Latn-UY",
+        "und-Latn-UZ": "uz-Latn-UZ",
+        "und-Latn-VA": "it-Latn-VA",
+        "und-Latn-VE": "es-Latn-VE",
+        "und-Latn-VN": "vi-Latn-VN",
+        "und-Latn-VU": "bi-Latn-VU",
+        "und-Latn-WF": "fr-Latn-WF",
+        "und-Latn-WS": "sm-Latn-WS",
+        "und-Latn-XK": "sq-Latn-XK",
+        "und-Latn-YT": "fr-Latn-YT",
+        "und-Latn-ZM": "bem-Latn-ZM",
+        "und-Latn-ZW": "sn-Latn-ZW",
         "und-Lepc": "lep-Lepc-IN",
         "und-Limb": "lif-Limb-IN",
         "und-Lina": "lab-Lina-GR",
@@ -20534,7 +20616,7 @@
         "und-NL": "nl-Latn-NL",
         "und-NO": "nb-Latn-NO",
         "und-NP": "ne-Deva-NP",
-        "und-NR": "na-Latn-NR",
+        "und-NR": "en-Latn-NR",
         "und-NU": "en-Latn-NU",
         "und-NZ": "en-Latn-NZ",
         "und-Nagm": "unr-Nagm-IN",
@@ -20551,7 +20633,6 @@
         "und-Orya": "or-Orya-IN",
         "und-Osge": "osa-Osge-US",
         "und-Osma": "so-Osma-SO",
-        "und-Ougr": "oui-Ougr-143",
         "und-PA": "es-Latn-PA",
         "und-PE": "es-Latn-PE",
         "und-PF": "fr-Latn-PF",
@@ -20576,7 +20657,6 @@
         "und-Plrd": "hmd-Plrd-CN",
         "und-Prti": "xpr-Prti-IR",
         "und-QA": "ar-Arab-QA",
-        "und-QO": "en-Latn-DG",
         "und-RE": "fr-Latn-RE",
         "und-RO": "ro-Latn-RO",
         "und-RS": "sr-Cyrl-RS",
@@ -20595,17 +20675,17 @@
         "und-SI": "sl-Latn-SI",
         "und-SJ": "nb-Latn-SJ",
         "und-SK": "sk-Latn-SK",
-        "und-SL": "en-Latn-SL",
+        "und-SL": "kri-Latn-SL",
         "und-SM": "it-Latn-SM",
         "und-SN": "fr-Latn-SN",
         "und-SO": "so-Latn-SO",
         "und-SR": "nl-Latn-SR",
-        "und-SS": "en-Latn-SS",
+        "und-SS": "ar-Arab-SS",
         "und-ST": "pt-Latn-ST",
         "und-SV": "es-Latn-SV",
         "und-SX": "en-Latn-SX",
         "und-SY": "ar-Arab-SY",
-        "und-SZ": "ss-Latn-SZ",
+        "und-SZ": "en-Latn-SZ",
         "und-Samr": "smp-Samr-IL",
         "und-Sarb": "xsa-Sarb-YE",
         "und-Saur": "saz-Saur-IN",
@@ -20622,6 +20702,7 @@
         "und-Sund": "su-Sund-ID",
         "und-Sylo": "syl-Sylo-BD",
         "und-Syrc": "syr-Syrc-IQ",
+        "und-TA": "en-Latn-TA",
         "und-TC": "en-Latn-TC",
         "und-TD": "fr-Latn-TD",
         "und-TF": "fr-Latn-TF",
@@ -20654,6 +20735,7 @@
         "und-Thai-KH": "kdt-Thai-KH",
         "und-Thai-LA": "kdt-Thai-LA",
         "und-Tibt": "bo-Tibt-CN",
+        "und-Tibt-BT": "dz-Tibt-BT",
         "und-Tirh": "mai-Tirh-IN",
         "und-Tnsa": "nst-Tnsa-IN",
         "und-Toto": "txo-Toto-IN",
@@ -20686,7 +20768,7 @@
         "und-Yezi": "ku-Yezi-GE",
         "und-Yiii": "ii-Yiii-CN",
         "und-ZA": "en-Latn-ZA",
-        "und-ZM": "en-Latn-ZM",
+        "und-ZM": "bem-Latn-ZM",
         "und-ZW": "sn-Latn-ZW",
         "und-Zanb": "cmg-Zanb-MN",
         "une": "une-Latn-NG",
@@ -20721,9 +20803,6 @@
         "unz": "unz-Latn-ID",
         "unz-ID": "unz-Latn-ID",
         "unz-Latn": "unz-Latn-ID",
-        "uok": "uok-Latn-ZZ",
-        "uok-Latn": "uok-Latn-ZZ",
-        "uok-ZZ": "uok-Latn-ZZ",
         "uon": "uon-Latn-TW",
         "uon-Latn": "uon-Latn-TW",
         "uon-TW": "uon-Latn-TW",
@@ -20758,9 +20837,9 @@
         "urh": "urh-Latn-NG",
         "urh-Latn": "urh-Latn-NG",
         "urh-NG": "urh-Latn-NG",
-        "uri": "uri-Latn-ZZ",
-        "uri-Latn": "uri-Latn-ZZ",
-        "uri-ZZ": "uri-Latn-ZZ",
+        "uri": "uri-Latn-PG",
+        "uri-Latn": "uri-Latn-PG",
+        "uri-PG": "uri-Latn-PG",
         "urk": "urk-Thai-TH",
         "urk-TH": "urk-Thai-TH",
         "urk-Thai": "urk-Thai-TH",
@@ -20779,18 +20858,18 @@
         "urr": "urr-Latn-VU",
         "urr-Latn": "urr-Latn-VU",
         "urr-VU": "urr-Latn-VU",
-        "urt": "urt-Latn-ZZ",
-        "urt-Latn": "urt-Latn-ZZ",
-        "urt-ZZ": "urt-Latn-ZZ",
+        "urt": "urt-Latn-PG",
+        "urt-Latn": "urt-Latn-PG",
+        "urt-PG": "urt-Latn-PG",
         "uru": "uru-Latn-BR",
         "uru-BR": "uru-Latn-BR",
         "uru-Latn": "uru-Latn-BR",
         "urv": "urv-Latn-PG",
         "urv-Latn": "urv-Latn-PG",
         "urv-PG": "urv-Latn-PG",
-        "urw": "urw-Latn-ZZ",
-        "urw-Latn": "urw-Latn-ZZ",
-        "urw-ZZ": "urw-Latn-ZZ",
+        "urw": "urw-Latn-PG",
+        "urw-Latn": "urw-Latn-PG",
+        "urw-PG": "urw-Latn-PG",
         "urx": "urx-Latn-PG",
         "urx-Latn": "urx-Latn-PG",
         "urx-PG": "urx-Latn-PG",
@@ -20800,9 +20879,9 @@
         "urz": "urz-Latn-BR",
         "urz-BR": "urz-Latn-BR",
         "urz-Latn": "urz-Latn-BR",
-        "usa": "usa-Latn-ZZ",
-        "usa-Latn": "usa-Latn-ZZ",
-        "usa-ZZ": "usa-Latn-ZZ",
+        "usa": "usa-Latn-PG",
+        "usa-Latn": "usa-Latn-PG",
+        "usa-PG": "usa-Latn-PG",
         "ush": "ush-Arab-PK",
         "ush-Arab": "ush-Arab-PK",
         "ush-PK": "ush-Arab-PK",
@@ -20828,15 +20907,15 @@
         "ute": "ute-Latn-US",
         "ute-Latn": "ute-Latn-US",
         "ute-US": "ute-Latn-US",
-        "uth": "uth-Latn-ZZ",
-        "uth-Latn": "uth-Latn-ZZ",
-        "uth-ZZ": "uth-Latn-ZZ",
+        "uth": "uth-Latn-NG",
+        "uth-Latn": "uth-Latn-NG",
+        "uth-NG": "uth-Latn-NG",
         "utp": "utp-Latn-SB",
         "utp-Latn": "utp-Latn-SB",
         "utp-SB": "utp-Latn-SB",
-        "utr": "utr-Latn-ZZ",
-        "utr-Latn": "utr-Latn-ZZ",
-        "utr-ZZ": "utr-Latn-ZZ",
+        "utr": "utr-Latn-NG",
+        "utr-Latn": "utr-Latn-NG",
+        "utr-NG": "utr-Latn-NG",
         "utu": "utu-Latn-PG",
         "utu-Latn": "utu-Latn-PG",
         "utu-PG": "utu-Latn-PG",
@@ -20850,12 +20929,12 @@
         "uve": "uve-Latn-NC",
         "uve-Latn": "uve-Latn-NC",
         "uve-NC": "uve-Latn-NC",
-        "uvh": "uvh-Latn-ZZ",
-        "uvh-Latn": "uvh-Latn-ZZ",
-        "uvh-ZZ": "uvh-Latn-ZZ",
-        "uvl": "uvl-Latn-ZZ",
-        "uvl-Latn": "uvl-Latn-ZZ",
-        "uvl-ZZ": "uvl-Latn-ZZ",
+        "uvh": "uvh-Latn-PG",
+        "uvh-Latn": "uvh-Latn-PG",
+        "uvh-PG": "uvh-Latn-PG",
+        "uvl": "uvl-Latn-PG",
+        "uvl-Latn": "uvl-Latn-PG",
+        "uvl-PG": "uvl-Latn-PG",
         "uwa": "uwa-Latn-AU",
         "uwa-AU": "uwa-Latn-AU",
         "uwa-Latn": "uwa-Latn-AU",
@@ -20880,9 +20959,9 @@
         "vaf": "vaf-Arab-IR",
         "vaf-Arab": "vaf-Arab-IR",
         "vaf-IR": "vaf-Arab-IR",
-        "vag": "vag-Latn-ZZ",
-        "vag-Latn": "vag-Latn-ZZ",
-        "vag-ZZ": "vag-Latn-ZZ",
+        "vag": "vag-Latn-GH",
+        "vag-GH": "vag-Latn-GH",
+        "vag-Latn": "vag-Latn-GH",
         "vah": "vah-Deva-IN",
         "vah-Deva": "vah-Deva-IN",
         "vah-IN": "vah-Deva-IN",
@@ -20898,9 +20977,9 @@
         "vam": "vam-Latn-PG",
         "vam-Latn": "vam-Latn-PG",
         "vam-PG": "vam-Latn-PG",
-        "van": "van-Latn-ZZ",
-        "van-Latn": "van-Latn-ZZ",
-        "van-ZZ": "van-Latn-ZZ",
+        "van": "van-Latn-PG",
+        "van-Latn": "van-Latn-PG",
+        "van-PG": "van-Latn-PG",
         "vao": "vao-Latn-VU",
         "vao-Latn": "vao-Latn-VU",
         "vao-VU": "vao-Latn-VU",
@@ -20975,9 +21054,9 @@
         "vit": "vit-Latn-NG",
         "vit-Latn": "vit-Latn-NG",
         "vit-NG": "vit-Latn-NG",
-        "viv": "viv-Latn-ZZ",
-        "viv-Latn": "viv-Latn-ZZ",
-        "viv-ZZ": "viv-Latn-ZZ",
+        "viv": "viv-Latn-PG",
+        "viv-Latn": "viv-Latn-PG",
+        "viv-PG": "viv-Latn-PG",
         "vka": "vka-Latn-AU",
         "vka-AU": "vka-Latn-AU",
         "vka-Latn": "vka-Latn-AU",
@@ -21123,9 +21202,9 @@
         "vun": "vun-Latn-TZ",
         "vun-Latn": "vun-Latn-TZ",
         "vun-TZ": "vun-Latn-TZ",
-        "vut": "vut-Latn-ZZ",
-        "vut-Latn": "vut-Latn-ZZ",
-        "vut-ZZ": "vut-Latn-ZZ",
+        "vut": "vut-Latn-CM",
+        "vut-CM": "vut-Latn-CM",
+        "vut-Latn": "vut-Latn-CM",
         "vwa": "vwa-Latn-CN",
         "vwa-CN": "vwa-Latn-CN",
         "vwa-Latn": "vwa-Latn-CN",
@@ -21160,18 +21239,18 @@
         "wai": "wai-Latn-ID",
         "wai-ID": "wai-Latn-ID",
         "wai-Latn": "wai-Latn-ID",
-        "waj": "waj-Latn-ZZ",
-        "waj-Latn": "waj-Latn-ZZ",
-        "waj-ZZ": "waj-Latn-ZZ",
+        "waj": "waj-Latn-PG",
+        "waj-Latn": "waj-Latn-PG",
+        "waj-PG": "waj-Latn-PG",
         "wal": "wal-Ethi-ET",
         "wal-ET": "wal-Ethi-ET",
         "wal-Ethi": "wal-Ethi-ET",
         "wam": "wam-Latn-US",
         "wam-Latn": "wam-Latn-US",
         "wam-US": "wam-Latn-US",
-        "wan": "wan-Latn-ZZ",
-        "wan-Latn": "wan-Latn-ZZ",
-        "wan-ZZ": "wan-Latn-ZZ",
+        "wan": "wan-Latn-CI",
+        "wan-CI": "wan-Latn-CI",
+        "wan-Latn": "wan-Latn-CI",
         "wap": "wap-Latn-GY",
         "wap-GY": "wap-Latn-GY",
         "wap-Latn": "wap-Latn-GY",
@@ -21258,9 +21337,9 @@
         "wca": "wca-Latn-BR",
         "wca-BR": "wca-Latn-BR",
         "wca-Latn": "wca-Latn-BR",
-        "wci": "wci-Latn-ZZ",
-        "wci-Latn": "wci-Latn-ZZ",
-        "wci-ZZ": "wci-Latn-ZZ",
+        "wci": "wci-Latn-TG",
+        "wci-Latn": "wci-Latn-TG",
+        "wci-TG": "wci-Latn-TG",
         "wdd": "wdd-Latn-GA",
         "wdd-GA": "wdd-Latn-GA",
         "wdd-Latn": "wdd-Latn-GA",
@@ -21306,9 +21385,9 @@
         "wep": "wep-Latn-DE",
         "wep-DE": "wep-Latn-DE",
         "wep-Latn": "wep-Latn-DE",
-        "wer": "wer-Latn-ZZ",
-        "wer-Latn": "wer-Latn-ZZ",
-        "wer-ZZ": "wer-Latn-ZZ",
+        "wer": "wer-Latn-PG",
+        "wer-Latn": "wer-Latn-PG",
+        "wer-PG": "wer-Latn-PG",
         "wes": "wes-Latn-CM",
         "wes-CM": "wes-Latn-CM",
         "wes-Latn": "wes-Latn-CM",
@@ -21333,9 +21412,9 @@
         "wgg": "wgg-Latn-AU",
         "wgg-AU": "wgg-Latn-AU",
         "wgg-Latn": "wgg-Latn-AU",
-        "wgi": "wgi-Latn-ZZ",
-        "wgi-Latn": "wgi-Latn-ZZ",
-        "wgi-ZZ": "wgi-Latn-ZZ",
+        "wgi": "wgi-Latn-PG",
+        "wgi-Latn": "wgi-Latn-PG",
+        "wgi-PG": "wgi-Latn-PG",
         "wgo": "wgo-Latn-ID",
         "wgo-ID": "wgo-Latn-ID",
         "wgo-Latn": "wgo-Latn-ID",
@@ -21348,18 +21427,18 @@
         "wha": "wha-Latn-ID",
         "wha-ID": "wha-Latn-ID",
         "wha-Latn": "wha-Latn-ID",
-        "whg": "whg-Latn-ZZ",
-        "whg-Latn": "whg-Latn-ZZ",
-        "whg-ZZ": "whg-Latn-ZZ",
+        "whg": "whg-Latn-PG",
+        "whg-Latn": "whg-Latn-PG",
+        "whg-PG": "whg-Latn-PG",
         "whk": "whk-Latn-ID",
         "whk-ID": "whk-Latn-ID",
         "whk-Latn": "whk-Latn-ID",
         "whu": "whu-Latn-ID",
         "whu-ID": "whu-Latn-ID",
         "whu-Latn": "whu-Latn-ID",
-        "wib": "wib-Latn-ZZ",
-        "wib-Latn": "wib-Latn-ZZ",
-        "wib-ZZ": "wib-Latn-ZZ",
+        "wib": "wib-Latn-BF",
+        "wib-BF": "wib-Latn-BF",
+        "wib-Latn": "wib-Latn-BF",
         "wic": "wic-Latn-US",
         "wic-Latn": "wic-Latn-US",
         "wic-US": "wic-Latn-US",
@@ -21396,21 +21475,21 @@
         "wir": "wir-Latn-BR",
         "wir-BR": "wir-Latn-BR",
         "wir-Latn": "wir-Latn-BR",
-        "wiu": "wiu-Latn-ZZ",
-        "wiu-Latn": "wiu-Latn-ZZ",
-        "wiu-ZZ": "wiu-Latn-ZZ",
-        "wiv": "wiv-Latn-ZZ",
-        "wiv-Latn": "wiv-Latn-ZZ",
-        "wiv-ZZ": "wiv-Latn-ZZ",
+        "wiu": "wiu-Latn-PG",
+        "wiu-Latn": "wiu-Latn-PG",
+        "wiu-PG": "wiu-Latn-PG",
+        "wiv": "wiv-Latn-PG",
+        "wiv-Latn": "wiv-Latn-PG",
+        "wiv-PG": "wiv-Latn-PG",
         "wiy": "wiy-Latn-US",
         "wiy-Latn": "wiy-Latn-US",
         "wiy-US": "wiy-Latn-US",
-        "wja": "wja-Latn-ZZ",
-        "wja-Latn": "wja-Latn-ZZ",
-        "wja-ZZ": "wja-Latn-ZZ",
-        "wji": "wji-Latn-ZZ",
-        "wji-Latn": "wji-Latn-ZZ",
-        "wji-ZZ": "wji-Latn-ZZ",
+        "wja": "wja-Latn-NG",
+        "wja-Latn": "wja-Latn-NG",
+        "wja-NG": "wja-Latn-NG",
+        "wji": "wji-Latn-NG",
+        "wji-Latn": "wji-Latn-NG",
+        "wji-NG": "wji-Latn-NG",
         "wka": "wka-Latn-TZ",
         "wka-Latn": "wka-Latn-TZ",
         "wka-TZ": "wka-Latn-TZ",
@@ -21489,9 +21568,9 @@
         "wmn": "wmn-Latn-NC",
         "wmn-Latn": "wmn-Latn-NC",
         "wmn-NC": "wmn-Latn-NC",
-        "wmo": "wmo-Latn-ZZ",
-        "wmo-Latn": "wmo-Latn-ZZ",
-        "wmo-ZZ": "wmo-Latn-ZZ",
+        "wmo": "wmo-Latn-PG",
+        "wmo-Latn": "wmo-Latn-PG",
+        "wmo-PG": "wmo-Latn-PG",
         "wms": "wms-Latn-ID",
         "wms-ID": "wms-Latn-ID",
         "wms-Latn": "wms-Latn-ID",
@@ -21508,9 +21587,9 @@
         "wnb": "wnb-Latn-PG",
         "wnb-Latn": "wnb-Latn-PG",
         "wnb-PG": "wnb-Latn-PG",
-        "wnc": "wnc-Latn-ZZ",
-        "wnc-Latn": "wnc-Latn-ZZ",
-        "wnc-ZZ": "wnc-Latn-ZZ",
+        "wnc": "wnc-Latn-PG",
+        "wnc-Latn": "wnc-Latn-PG",
+        "wnc-PG": "wnc-Latn-PG",
         "wnd": "wnd-Latn-AU",
         "wnd-AU": "wnd-Latn-AU",
         "wnd-Latn": "wnd-Latn-AU",
@@ -21538,9 +21617,9 @@
         "wnp": "wnp-Latn-PG",
         "wnp-Latn": "wnp-Latn-PG",
         "wnp-PG": "wnp-Latn-PG",
-        "wnu": "wnu-Latn-ZZ",
-        "wnu-Latn": "wnu-Latn-ZZ",
-        "wnu-ZZ": "wnu-Latn-ZZ",
+        "wnu": "wnu-Latn-PG",
+        "wnu-Latn": "wnu-Latn-PG",
+        "wnu-PG": "wnu-Latn-PG",
         "wnw": "wnw-Latn-US",
         "wnw-Latn": "wnw-Latn-US",
         "wnw-US": "wnw-Latn-US",
@@ -21553,9 +21632,9 @@
         "woa": "woa-Latn-AU",
         "woa-AU": "woa-Latn-AU",
         "woa-Latn": "woa-Latn-AU",
-        "wob": "wob-Latn-ZZ",
-        "wob-Latn": "wob-Latn-ZZ",
-        "wob-ZZ": "wob-Latn-ZZ",
+        "wob": "wob-Latn-CI",
+        "wob-CI": "wob-Latn-CI",
+        "wob-Latn": "wob-Latn-CI",
         "woc": "woc-Latn-PG",
         "woc-Latn": "woc-Latn-PG",
         "woc-PG": "woc-Latn-PG",
@@ -21590,9 +21669,9 @@
         "wor": "wor-Latn-ID",
         "wor-ID": "wor-Latn-ID",
         "wor-Latn": "wor-Latn-ID",
-        "wos": "wos-Latn-ZZ",
-        "wos-Latn": "wos-Latn-ZZ",
-        "wos-ZZ": "wos-Latn-ZZ",
+        "wos": "wos-Latn-PG",
+        "wos-Latn": "wos-Latn-PG",
+        "wos-PG": "wos-Latn-PG",
         "wow": "wow-Latn-ID",
         "wow-ID": "wow-Latn-ID",
         "wow-Latn": "wow-Latn-ID",
@@ -21629,9 +21708,9 @@
         "wrr": "wrr-Latn-AU",
         "wrr-AU": "wrr-Latn-AU",
         "wrr-Latn": "wrr-Latn-AU",
-        "wrs": "wrs-Latn-ZZ",
-        "wrs-Latn": "wrs-Latn-ZZ",
-        "wrs-ZZ": "wrs-Latn-ZZ",
+        "wrs": "wrs-Latn-PG",
+        "wrs-Latn": "wrs-Latn-PG",
+        "wrs-PG": "wrs-Latn-PG",
         "wru": "wru-Latn-ID",
         "wru-ID": "wru-Latn-ID",
         "wru-Latn": "wru-Latn-ID",
@@ -21656,9 +21735,9 @@
         "wsi": "wsi-Latn-VU",
         "wsi-Latn": "wsi-Latn-VU",
         "wsi-VU": "wsi-Latn-VU",
-        "wsk": "wsk-Latn-ZZ",
-        "wsk-Latn": "wsk-Latn-ZZ",
-        "wsk-ZZ": "wsk-Latn-ZZ",
+        "wsk": "wsk-Latn-PG",
+        "wsk-Latn": "wsk-Latn-PG",
+        "wsk-PG": "wsk-Latn-PG",
         "wsr": "wsr-Latn-PG",
         "wsr-Latn": "wsr-Latn-PG",
         "wsr-PG": "wsr-Latn-PG",
@@ -21717,18 +21796,18 @@
         "wuu": "wuu-Hans-CN",
         "wuu-CN": "wuu-Hans-CN",
         "wuu-Hans": "wuu-Hans-CN",
-        "wuv": "wuv-Latn-ZZ",
-        "wuv-Latn": "wuv-Latn-ZZ",
-        "wuv-ZZ": "wuv-Latn-ZZ",
+        "wuv": "wuv-Latn-PG",
+        "wuv-Latn": "wuv-Latn-PG",
+        "wuv-PG": "wuv-Latn-PG",
         "wux": "wux-Latn-AU",
         "wux-AU": "wux-Latn-AU",
         "wux-Latn": "wux-Latn-AU",
         "wuy": "wuy-Latn-ID",
         "wuy-ID": "wuy-Latn-ID",
         "wuy-Latn": "wuy-Latn-ID",
-        "wwa": "wwa-Latn-ZZ",
-        "wwa-Latn": "wwa-Latn-ZZ",
-        "wwa-ZZ": "wwa-Latn-ZZ",
+        "wwa": "wwa-Latn-BJ",
+        "wwa-BJ": "wwa-Latn-BJ",
+        "wwa-Latn": "wwa-Latn-BJ",
         "wwb": "wwb-Latn-AU",
         "wwb-AU": "wwb-Latn-AU",
         "wwb-Latn": "wwb-Latn-AU",
@@ -21822,9 +21901,9 @@
         "xbg": "xbg-Latn-AU",
         "xbg-AU": "xbg-Latn-AU",
         "xbg-Latn": "xbg-Latn-AU",
-        "xbi": "xbi-Latn-ZZ",
-        "xbi-Latn": "xbi-Latn-ZZ",
-        "xbi-ZZ": "xbi-Latn-ZZ",
+        "xbi": "xbi-Latn-PG",
+        "xbi-Latn": "xbi-Latn-PG",
+        "xbi-PG": "xbi-Latn-PG",
         "xbj": "xbj-Latn-AU",
         "xbj-AU": "xbj-Latn-AU",
         "xbj-Latn": "xbj-Latn-AU",
@@ -21882,9 +21961,9 @@
         "xer": "xer-Latn-BR",
         "xer-BR": "xer-Latn-BR",
         "xer-Latn": "xer-Latn-BR",
-        "xes": "xes-Latn-ZZ",
-        "xes-Latn": "xes-Latn-ZZ",
-        "xes-ZZ": "xes-Latn-ZZ",
+        "xes": "xes-Latn-PG",
+        "xes-Latn": "xes-Latn-PG",
+        "xes-PG": "xes-Latn-PG",
         "xet": "xet-Latn-BR",
         "xet-BR": "xet-Latn-BR",
         "xet-Latn": "xet-Latn-BR",
@@ -22005,9 +22084,9 @@
         "xkz": "xkz-Latn-BT",
         "xkz-BT": "xkz-Latn-BT",
         "xkz-Latn": "xkz-Latn-BT",
-        "xla": "xla-Latn-ZZ",
-        "xla-Latn": "xla-Latn-ZZ",
-        "xla-ZZ": "xla-Latn-ZZ",
+        "xla": "xla-Latn-PG",
+        "xla-Latn": "xla-Latn-PG",
+        "xla-PG": "xla-Latn-PG",
         "xlc": "xlc-Lyci-TR",
         "xlc-Lyci": "xlc-Lyci-TR",
         "xlc-TR": "xlc-Lyci-TR",
@@ -22139,9 +22218,10 @@
         "xom-Ethi": "xom-Ethi-ET",
         "xom-Latn": "xom-Latn-SD",
         "xom-SD": "xom-Latn-SD",
-        "xon": "xon-Latn-ZZ",
-        "xon-Latn": "xon-Latn-ZZ",
-        "xon-ZZ": "xon-Latn-ZZ",
+        "xon": "xon-Latn-GH",
+        "xon-Brai": "xon-Brai-GH",
+        "xon-GH": "xon-Latn-GH",
+        "xon-Latn": "xon-Latn-GH",
         "xoo": "xoo-Latn-BR",
         "xoo-BR": "xoo-Latn-BR",
         "xoo-Latn": "xoo-Latn-BR",
@@ -22217,9 +22297,9 @@
         "xra": "xra-Latn-BR",
         "xra-BR": "xra-Latn-BR",
         "xra-Latn": "xra-Latn-BR",
-        "xrb": "xrb-Latn-ZZ",
-        "xrb-Latn": "xrb-Latn-ZZ",
-        "xrb-ZZ": "xrb-Latn-ZZ",
+        "xrb": "xrb-Latn-BF",
+        "xrb-BF": "xrb-Latn-BF",
+        "xrb-Latn": "xrb-Latn-BF",
         "xrd": "xrd-Latn-AU",
         "xrd-AU": "xrd-Latn-AU",
         "xrd-Latn": "xrd-Latn-AU",
@@ -22259,12 +22339,12 @@
         "xsh": "xsh-Latn-NG",
         "xsh-Latn": "xsh-Latn-NG",
         "xsh-NG": "xsh-Latn-NG",
-        "xsi": "xsi-Latn-ZZ",
-        "xsi-Latn": "xsi-Latn-ZZ",
-        "xsi-ZZ": "xsi-Latn-ZZ",
-        "xsm": "xsm-Latn-ZZ",
-        "xsm-Latn": "xsm-Latn-ZZ",
-        "xsm-ZZ": "xsm-Latn-ZZ",
+        "xsi": "xsi-Latn-PG",
+        "xsi-Latn": "xsi-Latn-PG",
+        "xsi-PG": "xsi-Latn-PG",
+        "xsm": "xsm-Latn-GH",
+        "xsm-GH": "xsm-Latn-GH",
+        "xsm-Latn": "xsm-Latn-GH",
         "xsn": "xsn-Latn-NG",
         "xsn-Latn": "xsn-Latn-NG",
         "xsn-NG": "xsn-Latn-NG",
@@ -22391,9 +22471,9 @@
         "xwd": "xwd-Latn-AU",
         "xwd-AU": "xwd-Latn-AU",
         "xwd-Latn": "xwd-Latn-AU",
-        "xwe": "xwe-Latn-ZZ",
-        "xwe-Latn": "xwe-Latn-ZZ",
-        "xwe-ZZ": "xwe-Latn-ZZ",
+        "xwe": "xwe-Latn-BJ",
+        "xwe-BJ": "xwe-Latn-BJ",
+        "xwe-Latn": "xwe-Latn-BJ",
         "xwj": "xwj-Latn-AU",
         "xwj-AU": "xwj-Latn-AU",
         "xwj-Latn": "xwj-Latn-AU",
@@ -22491,9 +22571,9 @@
         "yal-Arab": "yal-Arab-GN",
         "yal-GN": "yal-Latn-GN",
         "yal-Latn": "yal-Latn-GN",
-        "yam": "yam-Latn-ZZ",
-        "yam-Latn": "yam-Latn-ZZ",
-        "yam-ZZ": "yam-Latn-ZZ",
+        "yam": "yam-Latn-CM",
+        "yam-CM": "yam-Latn-CM",
+        "yam-Latn": "yam-Latn-CM",
         "yan": "yan-Latn-NI",
         "yan-Latn": "yan-Latn-NI",
         "yan-NI": "yan-Latn-NI",
@@ -22509,12 +22589,12 @@
         "yar": "yar-Latn-VE",
         "yar-Latn": "yar-Latn-VE",
         "yar-VE": "yar-Latn-VE",
-        "yas": "yas-Latn-ZZ",
-        "yas-Latn": "yas-Latn-ZZ",
-        "yas-ZZ": "yas-Latn-ZZ",
-        "yat": "yat-Latn-ZZ",
-        "yat-Latn": "yat-Latn-ZZ",
-        "yat-ZZ": "yat-Latn-ZZ",
+        "yas": "yas-Latn-CM",
+        "yas-CM": "yas-Latn-CM",
+        "yas-Latn": "yas-Latn-CM",
+        "yat": "yat-Latn-CM",
+        "yat-CM": "yat-Latn-CM",
+        "yat-Latn": "yat-Latn-CM",
         "yau": "yau-Latn-VE",
         "yau-Latn": "yau-Latn-VE",
         "yau-VE": "yau-Latn-VE",
@@ -22527,15 +22607,15 @@
         "yax": "yax-Latn-AO",
         "yax-AO": "yax-Latn-AO",
         "yax-Latn": "yax-Latn-AO",
-        "yay": "yay-Latn-ZZ",
-        "yay-Latn": "yay-Latn-ZZ",
-        "yay-ZZ": "yay-Latn-ZZ",
-        "yaz": "yaz-Latn-ZZ",
-        "yaz-Latn": "yaz-Latn-ZZ",
-        "yaz-ZZ": "yaz-Latn-ZZ",
-        "yba": "yba-Latn-ZZ",
-        "yba-Latn": "yba-Latn-ZZ",
-        "yba-ZZ": "yba-Latn-ZZ",
+        "yay": "yay-Latn-NG",
+        "yay-Latn": "yay-Latn-NG",
+        "yay-NG": "yay-Latn-NG",
+        "yaz": "yaz-Latn-NG",
+        "yaz-Latn": "yaz-Latn-NG",
+        "yaz-NG": "yaz-Latn-NG",
+        "yba": "yba-Latn-NG",
+        "yba-Latn": "yba-Latn-NG",
+        "yba-NG": "yba-Latn-NG",
         "ybb": "ybb-Latn-CM",
         "ybb-CM": "ybb-Latn-CM",
         "ybb-Latn": "ybb-Latn-CM",
@@ -22567,9 +22647,9 @@
         "ybx": "ybx-Latn-PG",
         "ybx-Latn": "ybx-Latn-PG",
         "ybx-PG": "ybx-Latn-PG",
-        "yby": "yby-Latn-ZZ",
-        "yby-Latn": "yby-Latn-ZZ",
-        "yby-ZZ": "yby-Latn-ZZ",
+        "yby": "yby-Latn-PG",
+        "yby-Latn": "yby-Latn-PG",
+        "yby-PG": "yby-Latn-PG",
         "ycl": "ycl-Latn-CN",
         "ycl-CN": "ycl-Latn-CN",
         "ycl-Latn": "ycl-Latn-CN",
@@ -22607,9 +22687,9 @@
         "yel": "yel-Latn-CD",
         "yel-CD": "yel-Latn-CD",
         "yel-Latn": "yel-Latn-CD",
-        "yer": "yer-Latn-ZZ",
-        "yer-Latn": "yer-Latn-ZZ",
-        "yer-ZZ": "yer-Latn-ZZ",
+        "yer": "yer-Latn-NG",
+        "yer-Latn": "yer-Latn-NG",
+        "yer-NG": "yer-Latn-NG",
         "yes": "yes-Latn-NG",
         "yes-Latn": "yes-Latn-NG",
         "yes-NG": "yes-Latn-NG",
@@ -22640,21 +22720,21 @@
         "ygp": "ygp-Plrd-CN",
         "ygp-CN": "ygp-Plrd-CN",
         "ygp-Plrd": "ygp-Plrd-CN",
-        "ygr": "ygr-Latn-ZZ",
-        "ygr-Latn": "ygr-Latn-ZZ",
-        "ygr-ZZ": "ygr-Latn-ZZ",
+        "ygr": "ygr-Latn-PG",
+        "ygr-Latn": "ygr-Latn-PG",
+        "ygr-PG": "ygr-Latn-PG",
         "ygu": "ygu-Latn-AU",
         "ygu-AU": "ygu-Latn-AU",
         "ygu-Latn": "ygu-Latn-AU",
-        "ygw": "ygw-Latn-ZZ",
-        "ygw-Latn": "ygw-Latn-ZZ",
-        "ygw-ZZ": "ygw-Latn-ZZ",
+        "ygw": "ygw-Latn-PG",
+        "ygw-Latn": "ygw-Latn-PG",
+        "ygw-PG": "ygw-Latn-PG",
         "yhd": "yhd-Hebr-IL",
         "yhd-Hebr": "yhd-Hebr-IL",
         "yhd-IL": "yhd-Hebr-IL",
-        "yi": "yi-Hebr-001",
-        "yi-001": "yi-Hebr-001",
-        "yi-Hebr": "yi-Hebr-001",
+        "yi": "yi-Hebr-UA",
+        "yi-Hebr": "yi-Hebr-UA",
+        "yi-UA": "yi-Hebr-UA",
         "yia": "yia-Latn-AU",
         "yia-AU": "yia-Latn-AU",
         "yia-Latn": "yia-Latn-AU",
@@ -22701,9 +22781,9 @@
         "ykm": "ykm-Latn-PG",
         "ykm-Latn": "ykm-Latn-PG",
         "ykm-PG": "ykm-Latn-PG",
-        "yko": "yko-Latn-ZZ",
-        "yko-Latn": "yko-Latn-ZZ",
-        "yko-ZZ": "yko-Latn-ZZ",
+        "yko": "yko-Latn-CM",
+        "yko-CM": "yko-Latn-CM",
+        "yko-Latn": "yko-Latn-CM",
         "ykr": "ykr-Latn-PG",
         "ykr-Latn": "ykr-Latn-PG",
         "ykr-PG": "ykr-Latn-PG",
@@ -22716,18 +22796,18 @@
         "ylb": "ylb-Latn-PG",
         "ylb-Latn": "ylb-Latn-PG",
         "ylb-PG": "ylb-Latn-PG",
-        "yle": "yle-Latn-ZZ",
-        "yle-Latn": "yle-Latn-ZZ",
-        "yle-ZZ": "yle-Latn-ZZ",
-        "ylg": "ylg-Latn-ZZ",
-        "ylg-Latn": "ylg-Latn-ZZ",
-        "ylg-ZZ": "ylg-Latn-ZZ",
+        "yle": "yle-Latn-PG",
+        "yle-Latn": "yle-Latn-PG",
+        "yle-PG": "yle-Latn-PG",
+        "ylg": "ylg-Latn-PG",
+        "ylg-Latn": "ylg-Latn-PG",
+        "ylg-PG": "ylg-Latn-PG",
         "yli": "yli-Latn-ID",
         "yli-ID": "yli-Latn-ID",
         "yli-Latn": "yli-Latn-ID",
-        "yll": "yll-Latn-ZZ",
-        "yll-Latn": "yll-Latn-ZZ",
-        "yll-ZZ": "yll-Latn-ZZ",
+        "yll": "yll-Latn-PG",
+        "yll-Latn": "yll-Latn-PG",
+        "yll-PG": "yll-Latn-PG",
         "ylr": "ylr-Latn-AU",
         "ylr-AU": "ylr-Latn-AU",
         "ylr-Latn": "ylr-Latn-AU",
@@ -22750,9 +22830,9 @@
         "ymk-Arab": "ymk-Arab-MZ",
         "ymk-Latn": "ymk-Latn-MZ",
         "ymk-MZ": "ymk-Latn-MZ",
-        "yml": "yml-Latn-ZZ",
-        "yml-Latn": "yml-Latn-ZZ",
-        "yml-ZZ": "yml-Latn-ZZ",
+        "yml": "yml-Latn-PG",
+        "yml-Latn": "yml-Latn-PG",
+        "yml-PG": "yml-Latn-PG",
         "ymm": "ymm-Latn-SO",
         "ymm-Latn": "ymm-Latn-SO",
         "ymm-SO": "ymm-Latn-SO",
@@ -22811,9 +22891,9 @@
         "yom": "yom-Latn-CD",
         "yom-CD": "yom-Latn-CD",
         "yom-Latn": "yom-Latn-CD",
-        "yon": "yon-Latn-ZZ",
-        "yon-Latn": "yon-Latn-ZZ",
-        "yon-ZZ": "yon-Latn-ZZ",
+        "yon": "yon-Latn-PG",
+        "yon-Latn": "yon-Latn-PG",
+        "yon-PG": "yon-Latn-PG",
         "yot": "yot-Latn-NG",
         "yot-Latn": "yot-Latn-NG",
         "yot-NG": "yot-Latn-NG",
@@ -22823,12 +22903,12 @@
         "yra": "yra-Latn-PG",
         "yra-Latn": "yra-Latn-PG",
         "yra-PG": "yra-Latn-PG",
-        "yrb": "yrb-Latn-ZZ",
-        "yrb-Latn": "yrb-Latn-ZZ",
-        "yrb-ZZ": "yrb-Latn-ZZ",
-        "yre": "yre-Latn-ZZ",
-        "yre-Latn": "yre-Latn-ZZ",
-        "yre-ZZ": "yre-Latn-ZZ",
+        "yrb": "yrb-Latn-PG",
+        "yrb-Latn": "yrb-Latn-PG",
+        "yrb-PG": "yrb-Latn-PG",
+        "yre": "yre-Latn-CI",
+        "yre-CI": "yre-Latn-CI",
+        "yre-Latn": "yre-Latn-CI",
         "yrk": "yrk-Cyrl-RU",
         "yrk-Cyrl": "yrk-Cyrl-RU",
         "yrk-RU": "yrk-Cyrl-RU",
@@ -22862,9 +22942,9 @@
         "ysr": "ysr-Cyrl-RU",
         "ysr-Cyrl": "ysr-Cyrl-RU",
         "ysr-RU": "ysr-Cyrl-RU",
-        "yss": "yss-Latn-ZZ",
-        "yss-Latn": "yss-Latn-ZZ",
-        "yss-ZZ": "yss-Latn-ZZ",
+        "yss": "yss-Latn-PG",
+        "yss-Latn": "yss-Latn-PG",
+        "yss-PG": "yss-Latn-PG",
         "ysy": "ysy-Plrd-CN",
         "ysy-CN": "ysy-Plrd-CN",
         "ysy-Plrd": "ysy-Plrd-CN",
@@ -22900,9 +22980,9 @@
         "yui": "yui-Latn-CO",
         "yui-CO": "yui-Latn-CO",
         "yui-Latn": "yui-Latn-CO",
-        "yuj": "yuj-Latn-ZZ",
-        "yuj-Latn": "yuj-Latn-ZZ",
-        "yuj-ZZ": "yuj-Latn-ZZ",
+        "yuj": "yuj-Latn-PG",
+        "yuj-Latn": "yuj-Latn-PG",
+        "yuj-PG": "yuj-Latn-PG",
         "yul": "yul-Latn-CF",
         "yul-CF": "yul-Latn-CF",
         "yul-Latn": "yul-Latn-CF",
@@ -22921,12 +23001,12 @@
         "yur": "yur-Latn-US",
         "yur-Latn": "yur-Latn-US",
         "yur-US": "yur-Latn-US",
-        "yut": "yut-Latn-ZZ",
-        "yut-Latn": "yut-Latn-ZZ",
-        "yut-ZZ": "yut-Latn-ZZ",
-        "yuw": "yuw-Latn-ZZ",
-        "yuw-Latn": "yuw-Latn-ZZ",
-        "yuw-ZZ": "yuw-Latn-ZZ",
+        "yut": "yut-Latn-PG",
+        "yut-Latn": "yut-Latn-PG",
+        "yut-PG": "yut-Latn-PG",
+        "yuw": "yuw-Latn-PG",
+        "yuw-Latn": "yuw-Latn-PG",
+        "yuw-PG": "yuw-Latn-PG",
         "yux": "yux-Cyrl-RU",
         "yux-Cyrl": "yux-Cyrl-RU",
         "yux-RU": "yux-Cyrl-RU",
@@ -23156,9 +23236,9 @@
         "zhx": "zhx-Nshu-CN",
         "zhx-CN": "zhx-Nshu-CN",
         "zhx-Nshu": "zhx-Nshu-CN",
-        "zia": "zia-Latn-ZZ",
-        "zia-Latn": "zia-Latn-ZZ",
-        "zia-ZZ": "zia-Latn-ZZ",
+        "zia": "zia-Latn-PG",
+        "zia-Latn": "zia-Latn-PG",
+        "zia-PG": "zia-Latn-PG",
         "zik": "zik-Latn-PG",
         "zik-Latn": "zik-Latn-PG",
         "zik-PG": "zik-Latn-PG",
@@ -23298,9 +23378,10 @@
         "zna": "zna-Latn-TD",
         "zna-Latn": "zna-Latn-TD",
         "zna-TD": "zna-Latn-TD",
-        "zne": "zne-Latn-ZZ",
-        "zne-Latn": "zne-Latn-ZZ",
-        "zne-ZZ": "zne-Latn-ZZ",
+        "zne": "zne-Latn-CD",
+        "zne-Arab": "zne-Arab-SS",
+        "zne-CD": "zne-Latn-CD",
+        "zne-Latn": "zne-Latn-CD",
         "zng": "zng-Latn-VN",
         "zng-Latn": "zng-Latn-VN",
         "zng-VN": "zng-Latn-VN",
diff --git a/js/data/locale/lrc/unitfmt.json b/js/data/locale/lrc/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/lrc/unitfmt.json
+++ b/js/data/locale/lrc/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/lt/sysres.json b/js/data/locale/lt/sysres.json
index b0dd9c53d1..9977e7ed5d 100644
--- a/js/data/locale/lt/sysres.json
+++ b/js/data/locale/lt/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#po {num} sek.|few#po {num} sek.|many#po {num} sek.|#po {num} sek.",
     "#in {num}w": "one#po {num} sav.|few#po {num} sav.|many#po {num} sav.|#po {num} sav.",
     "#in {num}y": "one#po {num} m.|few#po {num} m.|many#po {num} m.|#po {num} m.",
-    "#{num} ms": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d.|few#{num} d.|many#{num} d.|#{num} d.",
     "#{num}d ago": "one#prieš {num} d.|few#prieš {num} d.|many#prieš {num} d.|#prieš {num} d.",
     "#{num}h": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
@@ -202,10 +202,10 @@
     "a1": "popiet",
     "durationLongDays": "one#{num} d.|few#{num} d.|many#{num} d.|#{num} d.",
     "durationMediumHours": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} sav.|few#{num} sav.|many#{num} sav.|#{num} sav.",
     "durationMediumYears": "one#{num} m.|few#{num} m.|many#{num} m.|#{num} m.",
-    "durationShortMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} min.|few#{num} min.|many#{num} min.|#{num} min.",
     "durationShortMonths": "one#{num} mėn.|few#{num} mėn.|many#{num} mėn.|#{num} mėn.",
     "finalSeparatorFull": " ir ",
diff --git a/js/data/locale/lt/unitfmt.json b/js/data/locale/lt/unitfmt.json
index 043672378f..a0b876b950 100644
--- a/js/data/locale/lt/unitfmt.json
+++ b/js/data/locale/lt/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|few#{n} atmosferos|many#{n} atmosferos|#{n} atmosferų",
             "bar": "one#{n} baras|few#{n} barai|many#{n} baro|#{n} barų",
             "barrel": "one#{n} barelis|few#{n} bareliai|many#{n} barelio|#{n} barelių",
+            "beaufort": "#Boforto {n}",
             "bit": "one#{n} bitas|few#{n} bitai|many#{n} bito|#{n} bitų",
             "bit-per-second": "#{n} bitų/s",
             "british-thermal-unit": "#{n} Btu",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} ba",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/lu/ctrynames.json b/js/data/locale/lu/ctrynames.json
index edf27e336f..c5aeb32a41 100644
--- a/js/data/locale/lu/ctrynames.json
+++ b/js/data/locale/lu/ctrynames.json
@@ -34,6 +34,7 @@
     "Biligari": "BG",
     "Bouvet Island": "BV",
     "Brineyi": "BN",
+    "British Indian Ocean Territory": "IO",
     "Bukinafaso": "BF",
     "Burundi": "BI",
     "Butani": "BT",
@@ -135,7 +136,6 @@
     "Lutanda lua Tuluki ne Kaiko": "TC",
     "Lutanda lua Vierzi wa Ameriki": "VI",
     "Lutanda lua Vierzi wa Angeletele": "VG",
-    "Lutanda lwa Angeletele ku mbu wa Indiya": "IO",
     "Macao SAR China": "MO",
     "Madagasikari": "MG",
     "Madive": "MV",
diff --git a/js/data/locale/lu/ctryreverse.json b/js/data/locale/lu/ctryreverse.json
index 162115fb50..da69661833 100644
--- a/js/data/locale/lu/ctryreverse.json
+++ b/js/data/locale/lu/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirayele",
     "IM": "Isle of Man",
     "IN": "Inde",
-    "IO": "Lutanda lwa Angeletele ku mbu wa Indiya",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Ira",
     "IS": "Isilande",
diff --git a/js/data/locale/lu/unitfmt.json b/js/data/locale/lu/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/lu/unitfmt.json
+++ b/js/data/locale/lu/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/luo/unitfmt.json b/js/data/locale/luo/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/luo/unitfmt.json
+++ b/js/data/locale/luo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/luy/ctrynames.json b/js/data/locale/luy/ctrynames.json
index 41508d8c92..b8def5627b 100644
--- a/js/data/locale/luy/ctrynames.json
+++ b/js/data/locale/luy/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/luy/ctryreverse.json b/js/data/locale/luy/ctryreverse.json
index 4d22a14863..04608f7807 100644
--- a/js/data/locale/luy/ctryreverse.json
+++ b/js/data/locale/luy/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/luy/unitfmt.json b/js/data/locale/luy/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/luy/unitfmt.json
+++ b/js/data/locale/luy/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/lv/sysres.json b/js/data/locale/lv/sysres.json
index e3c7e58f02..ac48c8e1ac 100644
--- a/js/data/locale/lv/sysres.json
+++ b/js/data/locale/lv/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "zero#pēc {num} sek.|one#pēc {num} sek.|#pēc {num} sek.",
     "#in {num}w": "zero#pēc {num} ned.|one#pēc {num} ned.|#pēc {num} ned.",
     "#in {num}y": "zero#pēc {num} g.|one#pēc {num} g.|#pēc {num} g.",
-    "#{num} ms": "zero#{num} ms|one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "zero#{num} d.|one#{num} d.|#{num} d.",
     "#{num}d ago": "zero#pirms {num} d.|one#pirms {num} d.|#pirms {num} d.",
     "#{num}h": "zero#{num} h|one#{num} h|#{num} h",
@@ -31,8 +31,8 @@
     "1#1 min ago|#{num} min ago": "zero#pirms {num} minūtēm|one#pirms {num} minūtes|#pirms {num} minūtēm",
     "1#1 minute ago|#{num} minutes ago": "zero#pirms {num} minūtēm|one#pirms {num} minūtes|#pirms {num} minūtēm",
     "1#1 minute|#{num} minutes": "zero#{num} minūšu|one#{num} minūte|#{num} minūtes",
-    "1#1 min|#{num} min": "zero#{num} min|one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "zero#{num} min|one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "zero#pirms {num} mēnešiem|one#pirms {num} mēneša|#pirms {num} mēnešiem",
     "1#1 month ago|#{num} months ago": "zero#pirms {num} mēnešiem|one#pirms {num} mēneša|#pirms {num} mēnešiem",
     "1#1 month|#{num} months": "zero#{num} mēnešu|one#{num} mēnesis|#{num} mēneši",
@@ -181,11 +181,11 @@
     "cccc6": "Sestdiena",
     "durationLongDays": "zero#{num} d.|one#{num} d.|#{num} d.",
     "durationMediumHours": "zero#{num} h|one#{num} h|#{num} h",
-    "durationMediumMillis": "zero#{num} ms|one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "zero#{num} n.|one#{num} n.|#{num} n.",
     "durationMediumYears": "zero#{num} g.|one#{num} g.|#{num} g.",
-    "durationShortMillis": "zero#{num} ms|one#{num} ms|#{num} ms",
-    "durationShortMinutes": "zero#{num} min|one#{num} min|#{num} min",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
     "durationShortMonths": "zero#{num} m.|one#{num} m.|#{num} m.",
     "finalSeparatorFull": " un ",
     "finalSeparatorLong": " un ",
diff --git a/js/data/locale/lv/unitfmt.json b/js/data/locale/lv/unitfmt.json
index bdf9008720..05ff6f1371 100644
--- a/js/data/locale/lv/unitfmt.json
+++ b/js/data/locale/lv/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfēra|#{n} atmosfēras",
             "bar": "zero#{n} bāru|one#{n} bārs|#{n} bāri",
             "barrel": "zero#{n} bbl|one#{n} barels|#{n} bareli",
+            "beaufort": "zero#{n} baļļu pēc Boforta skalas|one#{n} balle pēc Boforta skalas|#{n} balles pēc Boforta skalas",
             "bit": "zero#{n} bitu|one#{n} bits|#{n} biti",
             "bit-per-second": "#{n} biti sekundē",
             "british-thermal-unit": "zero#{n} britu termisko mērvienību|one#{n} britu termiskā mērvienība|#{n} britu termiskās mērvienības",
@@ -117,7 +118,7 @@
             "megabyte-per-second": "#{n} megabaits sekundē",
             "megahertz": "zero#{n} megahercu|one#{n} megahercs|#{n} megaherci",
             "megaliter": "zero#{n} megalitru|one#{n} megalitrs|#{n} megalitri",
-            "megapascal": "zero#{n} MPa|one#{n} megapaskāls|#{n} megapaskāli",
+            "megapascal": "zero#{n} megapaskālu|one#{n} megapaskāls|#{n} megapaskāli",
             "megapixel": "zero#{n} MP|one#{n} megapikselis|#{n} megapikseļi",
             "megawatt": "zero#{n} megavatu|one#{n} megavats|#{n} megavati",
             "meter": "zero#{n} metru|one#{n} metrs|#{n} metri",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/sek.",
             "british-thermal-unit": "#{n} Btu",
@@ -250,7 +252,6 @@
             "dessert-spoon-imperial": "#{n} britu des. kar.",
             "dot": "zero#{n} px|#{n} p.",
             "dot-per-centimeter": "#{n} dpc",
-            "dot-per-inch": "#{n} ppi",
             "dram": "zero#{n} šķi. drahmu|one#{n} šķ. drahma|#{n} šķ. drahmas",
             "drop": "#{n} pil.",
             "dunam": "zero#{n} dunamu|one#{n} dunams|#{n} dunami",
@@ -262,7 +263,7 @@
             "fathom": "zero#{n} fatomu|one#{n} fatoms|#{n} fatomi",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "zero#{n} britu šķidr. unču|one#{n} britu šķidr. unce|#{n} britu šķidr. unces",
-            "foodcalorie": "#{n} cal",
+            "foodcalorie": "zero#{n} kcal|#{n} cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/sek.",
             "furlong": "zero#{n} furlongu|one#{n} furlongs|#{n} furlongi",
@@ -367,7 +368,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} šķips.",
+            "pinch": "#{n} šķipsn.",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
diff --git a/js/data/locale/mai/ctrynames.json b/js/data/locale/mai/ctrynames.json
index 6d57cb3748..a3c4eaad8d 100644
--- a/js/data/locale/mai/ctrynames.json
+++ b/js/data/locale/mai/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Sark": "CQ",
     "अंगोला": "AO",
     "अजरबैजान": "AZ",
@@ -196,7 +197,6 @@
     "बोस्निया आ हर्जेगोबिना": "BA",
     "ब्राज़ील": "BR",
     "ब्रिटिश वर्जिन द्वीपसमूह": "VG",
-    "ब्रिटिश हिंद महासागरीय क्षेत्र": "IO",
     "ब्रूनेई": "BN",
     "भारत": "IN",
     "भूटान": "BT",
diff --git a/js/data/locale/mai/ctryreverse.json b/js/data/locale/mai/ctryreverse.json
index 0976f1a551..b4dd7d2dcd 100644
--- a/js/data/locale/mai/ctryreverse.json
+++ b/js/data/locale/mai/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "इजरायल",
     "IM": "आइल ऑफ मैन",
     "IN": "भारत",
-    "IO": "ब्रिटिश हिंद महासागरीय क्षेत्र",
+    "IO": "British Indian Ocean Territory",
     "IQ": "इराक",
     "IR": "ईरान",
     "IS": "आइसलैंड",
diff --git a/js/data/locale/mai/unitfmt.json b/js/data/locale/mai/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mai/unitfmt.json
+++ b/js/data/locale/mai/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mas/TZ/ctrynames.json b/js/data/locale/mas/TZ/ctrynames.json
index 0284be1da8..6ffeecf36b 100644
--- a/js/data/locale/mas/TZ/ctrynames.json
+++ b/js/data/locale/mas/TZ/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/mas/TZ/ctryreverse.json b/js/data/locale/mas/TZ/ctryreverse.json
index 4ac8a4f33c..b0192029a9 100644
--- a/js/data/locale/mas/TZ/ctryreverse.json
+++ b/js/data/locale/mas/TZ/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/mas/ctrynames.json b/js/data/locale/mas/ctrynames.json
index 0284be1da8..6ffeecf36b 100644
--- a/js/data/locale/mas/ctrynames.json
+++ b/js/data/locale/mas/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/mas/ctryreverse.json b/js/data/locale/mas/ctryreverse.json
index 4ac8a4f33c..b0192029a9 100644
--- a/js/data/locale/mas/ctryreverse.json
+++ b/js/data/locale/mas/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/mas/unitfmt.json b/js/data/locale/mas/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mas/unitfmt.json
+++ b/js/data/locale/mas/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mdf/unitfmt.json b/js/data/locale/mdf/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mdf/unitfmt.json
+++ b/js/data/locale/mdf/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mer/ctrynames.json b/js/data/locale/mer/ctrynames.json
index e9229dbdf6..268c1e4e47 100644
--- a/js/data/locale/mer/ctrynames.json
+++ b/js/data/locale/mer/ctrynames.json
@@ -47,6 +47,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazilu": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bulgaria": "BG",
@@ -194,7 +195,6 @@
     "Northern America": "021",
     "Northern Europe": "154",
     "Norwi": "NO",
-    "Nthĩ cia Ngeretha gatagatĩ ka ĩria ria Hindi": "IO",
     "Nthĩ ya Afrika gatĩgatĩ": "CF",
     "Nthĩ ya Cheki": "CZ",
     "Nthĩ ya Dominika": "DO",
diff --git a/js/data/locale/mer/ctryreverse.json b/js/data/locale/mer/ctryreverse.json
index 9aaf5623fa..9a403e0140 100644
--- a/js/data/locale/mer/ctryreverse.json
+++ b/js/data/locale/mer/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isiraeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Nthĩ cia Ngeretha gatagatĩ ka ĩria ria Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irani",
     "IS": "Aisilandi",
diff --git a/js/data/locale/mer/unitfmt.json b/js/data/locale/mer/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mer/unitfmt.json
+++ b/js/data/locale/mer/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mfe/ctrynames.json b/js/data/locale/mfe/ctrynames.json
index a84c00c864..3e90556e42 100644
--- a/js/data/locale/mfe/ctrynames.json
+++ b/js/data/locale/mfe/ctrynames.json
@@ -34,6 +34,7 @@
     "Boutan": "BT",
     "Bouvet Island": "BV",
     "Brezil": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Burkina Faso": "BF",
     "Burundi": "BI",
@@ -250,7 +251,6 @@
     "Taiwan": "TW",
     "Tanzani": "TZ",
     "Tchad": "TD",
-    "Teritwar Britanik Losean Indien": "IO",
     "Teritwar Palestinn": "PS",
     "Thayland": "TH",
     "Timor oriantal": "TL",
diff --git a/js/data/locale/mfe/ctryreverse.json b/js/data/locale/mfe/ctryreverse.json
index 5a4f682e90..788ccac967 100644
--- a/js/data/locale/mfe/ctryreverse.json
+++ b/js/data/locale/mfe/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Izrael",
     "IM": "Isle of Man",
     "IN": "Lenn",
-    "IO": "Teritwar Britanik Losean Indien",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Island",
diff --git a/js/data/locale/mfe/unitfmt.json b/js/data/locale/mfe/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mfe/unitfmt.json
+++ b/js/data/locale/mfe/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mg/ctrynames.json b/js/data/locale/mg/ctrynames.json
index 833e43a439..959157b672 100644
--- a/js/data/locale/mg/ctrynames.json
+++ b/js/data/locale/mg/ctrynames.json
@@ -41,6 +41,7 @@
     "Botsoana": "BW",
     "Bouvet Island": "BV",
     "Brezila": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Canary Islands": "IC",
     "Caribbean": "029",
@@ -72,7 +73,6 @@
     "Europe": "150",
     "European Union": "EU",
     "Eurozone": "EZ",
-    "Faridranomasina indiana britanika": "IO",
     "Faroe Islands": "FO",
     "Fidji": "FJ",
     "Filipina": "PH",
diff --git a/js/data/locale/mg/ctryreverse.json b/js/data/locale/mg/ctryreverse.json
index fb358e2e99..447f7ad758 100644
--- a/js/data/locale/mg/ctryreverse.json
+++ b/js/data/locale/mg/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israely",
     "IM": "Isle of Man",
     "IN": "Indy",
-    "IO": "Faridranomasina indiana britanika",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Islandy",
diff --git a/js/data/locale/mg/unitfmt.json b/js/data/locale/mg/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mg/unitfmt.json
+++ b/js/data/locale/mg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mgh/unitfmt.json b/js/data/locale/mgh/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mgh/unitfmt.json
+++ b/js/data/locale/mgh/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mgo/sysres.json b/js/data/locale/mgo/sysres.json
index a03af581d6..9ebb6d9d64 100644
--- a/js/data/locale/mgo/sysres.json
+++ b/js/data/locale/mgo/sysres.json
@@ -1,46 +1,46 @@
 {
-    "#in {num}d": "one#+{num} d|#+{num} d",
-    "#in {num}h": "one#+{num} h|#+{num} h",
-    "#in {num}mi": "one#+{num} min|#+{num} min",
-    "#in {num}mo": "one#+{num} m|#+{num} m",
-    "#in {num}s": "one#+{num} s|#+{num} s",
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
     "#in {num}w": "#+{num} w",
     "#in {num}y": "#+{num} y",
     "#{num} ms": "#{num} ms",
     "#{num}d": "#{num} d",
-    "#{num}d ago": "one#-{num} d|#-{num} d",
+    "#{num}d ago": "#-{num} d",
     "#{num}h": "#{num} h",
-    "#{num}h ago": "one#-{num} h|#-{num} h",
-    "#{num}mi ago": "one#-{num} min|#-{num} min",
-    "#{num}mo ago": "one#-{num} m|#-{num} m",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
     "#{num}s": "#{num} s",
-    "#{num}s ago": "one#-{num} s|#-{num} s",
+    "#{num}s ago": "#-{num} s",
     "#{num}w": "#{num} w",
     "#{num}w ago": "#-{num} w",
     "#{num}y": "#{num} y",
     "#{num}y ago": "#-{num} y",
-    "1#1 day ago|#{num} days ago": "one#-{num} d|#-{num} d",
-    "1#1 day|#{num} days": "one#{num} d|#{num} d",
-    "1#1 dy ago|#{num} dys ago": "one#-{num} d|#-{num} d",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
     "1#1 dy|#{num} dys": "#{num} d",
-    "1#1 hour ago|#{num} hours ago": "one#-{num} h|#-{num} h",
-    "1#1 hour|#{num} hours": "one#{num} h|#{num} h",
-    "1#1 hr ago|#{num} hrs ago": "one#-{num} h|#-{num} h",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
     "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "#{num} ms",
-    "1#1 min ago|#{num} min ago": "one#-{num} min|#-{num} min",
-    "1#1 minute ago|#{num} minutes ago": "one#-{num} min|#-{num} min",
-    "1#1 minute|#{num} minutes": "one#{num} min|#{num} min",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
     "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "#{num} min",
-    "1#1 mon ago|#{num} mons ago": "one#-{num} m|#-{num} m",
-    "1#1 month ago|#{num} months ago": "one#-{num} m|#-{num} m",
-    "1#1 month|#{num} months": "one#{num} m|#{num} m",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
     "1#1 mon|#{num} mons": "#{num} m",
     "1#1 mo|#{num} mos": "#{num} m",
-    "1#1 sec ago|#{num} sec ago": "one#-{num} s|#-{num} s",
-    "1#1 second ago|#{num} seconds ago": "one#-{num} s|#-{num} s",
-    "1#1 second|#{num} seconds": "one#{num} s|#{num} s",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
     "1#1 sec|#{num} sec": "#{num} s",
     "1#1 se|#{num} sec": "#{num} s",
     "1#1 week ago|#{num} weeks ago": "#-{num} w",
@@ -51,16 +51,16 @@
     "1#1 year|#{num} years": "#{num} y",
     "1#1 yr ago|#{num} yrs ago": "#-{num} y",
     "1#1 yr|#{num} yrs": "#{num} y",
-    "1#in 1 day|#in {num} days": "one#+{num} d|#+{num} d",
-    "1#in 1 dy|#in {num} dys": "one#+{num} d|#+{num} d",
-    "1#in 1 hour|#in {num} hours": "one#+{num} h|#+{num} h",
-    "1#in 1 hr|#in {num} hrs": "one#+{num} h|#+{num} h",
-    "1#in 1 minute|#in {num} minutes": "one#+{num} min|#+{num} min",
-    "1#in 1 min|#in {num} min": "one#+{num} min|#+{num} min",
-    "1#in 1 month|#in {num} months": "one#+{num} m|#+{num} m",
-    "1#in 1 mon|#in {num} mons": "one#+{num} m|#+{num} m",
-    "1#in 1 second|#in {num} seconds": "one#+{num} s|#+{num} s",
-    "1#in 1 sec|#in {num} sec": "one#+{num} s|#+{num} s",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
     "1#in 1 week|#in {num} weeks": "#+{num} w",
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 year|#in {num} years": "#+{num} y",
diff --git a/js/data/locale/mgo/unitfmt.json b/js/data/locale/mgo/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mgo/unitfmt.json
+++ b/js/data/locale/mgo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mi/ctrynames.json b/js/data/locale/mi/ctrynames.json
index 35bad8b798..8436d0cca5 100644
--- a/js/data/locale/mi/ctrynames.json
+++ b/js/data/locale/mi/ctrynames.json
@@ -1,30 +1,28 @@
 {
-    "Aerana": "IE",
-    "Afghanistan": "AF",
     "Āhia": "142",
     "Āhia ki te Rāwhiti": "030",
     "Āhia ki te Tonga": "034",
-    "Āhia ki te Tonga-mā-uru": "035",
+    "Āhia ki te Tonga-mā-rāwhiti": "035",
     "Āhia ki te Uru": "145",
+    "Ahitereiria": "AU",
+    "Airani": "IE",
     "Āketina": "AR",
-    "Ākuira": "AI",
-    "Albania": "AL",
-    "American Samoa": "AS",
+    "Āmenia": "AM",
     "Amerika": "019",
     "Amerika ki te Raki": "003",
     "Amerika ki te Tonga": "005",
     "Amerika Rātini": "419",
     "Anakora": "AO",
-    "Anatikua me Pāpura": "AG",
-    "Andorra": "AD",
-    "Antarctica": "AQ",
+    "Anatōra": "AD",
+    "Anguira": "AI",
     "Aotearoa": "NZ",
+    "Arapeinia": "AL",
     "Aratiria": "DZ",
-    "Armenia": "AM",
     "Arūpa": "AW",
-    "Ascension Island": "AC",
-    "Ateria": "AT",
-    "Australia": "AU",
+    "Atareiria": "053",
+    "Ataria": "AT",
+    "Atepaihānia": "AZ",
+    "Awhekenetāna": "AF",
     "Āwherika": "002",
     "Āwherika ki te Raki": "015",
     "Āwherika ki te Rāwhiti": "014",
@@ -32,266 +30,268 @@
     "Āwherika ki te Tonga o Te Hahāra": "202",
     "Āwherika ki te Uru": "011",
     "Āwherika Whakatetonga": "018",
-    "Azerbaijan": "AZ",
-    "Bahrain": "BH",
-    "Bangladesh": "BD",
-    "Belarus": "BY",
-    "Bhutan": "BT",
-    "Bosnia & Herzegovina": "BA",
-    "Brunei": "BN",
-    "Bulgaria": "BG",
-    "Cambodia": "KH",
-    "Christmas Island": "CX",
-    "Clipperton Island": "CP",
-    "Cocos (Keeling) Islands": "CC",
-    "Cook Islands": "CK",
-    "Croatia": "HR",
-    "Cyprus": "CY",
-    "Czechia": "CZ",
-    "Diego Garcia": "DG",
+    "Ehiwatini": "SZ",
     "Ekuatoa": "EC",
-    "Ere Hāwhatō": "SV",
     "Eritēria": "ER",
     "Etiopia": "ET",
     "Etōnia": "EE",
-    "Ewatini": "SZ",
-    "Fiji": "FJ",
-    "French Polynesia": "PF",
-    "Georgia": "GE",
-    "Gibraltar": "GI",
-    "Greece": "GR",
-    "Guam": "GU",
     "Hahāra ki te Tonga": "EH",
     "Haina": "CN",
+    "Haipara": "CY",
     "Haiti": "HT",
-    "Hao Tomei me Pirinipei": "ST",
+    "Hāmoa": "WS",
+    "Hāmoa-Amerika": "AS",
+    "Hana Marino": "SM",
+    "Hanekari": "HU",
     "Hapani": "JP",
-    "Hato Harīna": "SH",
+    "Hato Hērena": "SH",
     "Hato Kiti me Newhi": "KN",
     "Hato Mātene": "MF",
     "Hato Pāteremi": "BL",
-    "Hato Piere & Mikarona": "PM",
+    "Hato Piere & Mikerona": "PM",
     "Hato Ruhia": "LC",
-    "Hato Wetene me Keretīni": "VC",
-    "Heard & McDonald Islands": "HM",
-    "Heihere": "SC",
+    "Hato Tomei me Pirinipei": "ST",
+    "Hato Wēneti me Keretīni": "VC",
+    "Hauri Arāpia": "SA",
+    "Heikere": "SC",
     "Hemeika": "JM",
     "Henekara": "SN",
-    "Heopāra me Ia Maiana": "SJ",
+    "Heopara me Iana Maiana": "SJ",
+    "Hingapoa": "SG",
     "Hiri": "CL",
+    "Hiri Rānaka": "LK",
+    "Hiria": "SY",
+    "Hirupia": "RS",
     "Hiti Mātene": "SX",
-    "Hong Kong SAR China": "HK",
+    "Hongipua Haina": "HK",
     "Hononga o Amerika": "US",
-    "Honūra": "HN",
+    "Honotura": "HN",
     "Hōrana": "NL",
-    "Hōria ki te Tonga me Motu Hanuwiti ki te Tonga": "GS",
-    "Huītene": "SE",
+    "Hōrano": "JO",
+    "Hōria": "GE",
+    "Hōria ki te Tonga me ngā Motu Hanawiti ki te Tonga": "GS",
+    "Horowākia": "SK",
+    "Horowinia": "SI",
+    "Huitene": "SE",
     "Huiterangi": "CH",
     "Hūmārie": "SO",
-    "Hungary": "HU",
-    "Hurināme": "SR",
+    "Huriname": "SR",
     "Hūta me Merera": "EA",
     "Hūtāne": "SD",
     "Hūtāne ki te Tonga": "SS",
+    "Iharaira": "IL",
     "Īhipa": "EG",
-    "Indonesia": "ID",
+    "Īmene": "YE",
     "Inia": "IN",
-    "Iran": "IR",
-    "Iraq": "IQ",
-    "Israel": "IL",
+    "Initonīhia": "ID",
+    "Irāka": "IQ",
+    "Irāna": "IR",
     "Itāria": "IT",
-    "Jordan": "JO",
     "Kaiana": "GY",
-    "Kaiana Wīwī": "GF",
+    "Kāmaka": "GI",
+    "Kamapōtia": "KH",
     "Kamarūna": "CM",
+    "Kamopia": "GM",
     "Kāna": "GH",
     "Kānata": "CA",
     "Kāpona": "GA",
-    "Karapiana": "029",
-    "Karepeana Hōrana": "BQ",
+    "Karapīana": "029",
+    "Karapīana Hōrana": "BQ",
+    "Katā": "QA",
     "Kāta": "TD",
-    "Kazakhstan": "KZ",
-    "Kēni": "GG",
-    "Kēnia": "KE",
+    "Katatānga": "KZ",
+    "Kenia": "KE",
     "Kerenāta": "GD",
+    "Kiāna Wīwī": "GF",
+    "Kikitānga": "KG",
     "Kini": "GN",
     "Kini Ekuatoria": "GQ",
     "Kini-Pihao": "GW",
-    "Kiribati": "KI",
-    "Kirīrangi": "GL",
+    "Kirihi": "GR",
+    "Kiripati": "KI",
     "Kiupa": "CU",
+    "Kōhoro": "XK",
     "Komoro": "KM",
-    "Kōngo - Kingihāha": "CD",
-    "Kōngo - Parāwhe": "CG",
+    "Kōngo - Kinihāha": "CD",
+    "Kōngo - Pārawhe": "CG",
+    "Kōnihi": "GG",
+    "Kōrea ki te Raki": "KP",
+    "Kōrea ki te Tonga": "KR",
+    "Koroātia": "HR",
     "Koromōpia": "CO",
-    "Kosovo": "XK",
-    "Kota Rīka": "CR",
+    "Koru-Kākoa": "TC",
+    "Kotahitanga o ngā Whenua o Ārapi": "AE",
+    "Koto Rīka": "CR",
+    "Kuama": "GU",
     "Kuatamāra": "GT",
-    "Kuatarū": "GP",
+    "Kuatarupa": "GP",
+    "Kuki Airani": "CK",
     "Kurahao": "CW",
-    "Kuwait": "KW",
-    "Kyrgyzstan": "KG",
-    "Laos": "LA",
-    "Lebanon": "LB",
-    "Macao SAR China": "MO",
-    "Maio": "YT",
+    "Kūweiti": "KW",
+    "Māiota": "YT",
+    "Makau Haina": "MO",
     "Makerōnia ki te Raki": "MK",
-    "Malaysia": "MY",
-    "Maldives": "MV",
-    "Malta": "MT",
-    "Manako": "MC",
-    "Marakāhia": "MG",
+    "Mārata": "MT",
+    "Māratiri": "MV",
     "Marāwi": "MW",
+    "Mareia": "MY",
     "Māri": "ML",
-    "Marshall Islands": "MH",
-    "Māteniki": "MQ",
+    "Marihi": "MU",
+    "Matakāhika": "MG",
+    "Mātiniki": "MQ",
+    "Maungakororiko": "ME",
     "Mauritānia": "MR",
     "Mēhiko": "MX",
+    "Mekanēhia": "FM",
     "Meranīhia": "054",
-    "Micronesia": "FM",
+    "Mita kikoika": "XA",
     "Mohapiki": "MZ",
-    "Moldova": "MD",
-    "Mongolia": "MN",
+    "Monāko": "MC",
+    "Mongōria": "MN",
     "Monoterā": "MS",
-    "Montenegro": "ME",
-    "Mōrihi": "MU",
     "Moroko": "MA",
-    "Motu Kānara": "IC",
+    "Morotawa": "MD",
+    "Motu Kanēre": "IC",
+    "Motu Nehe me Pāputa": "AG",
     "Motu Ōrana": "AX",
     "Motu Pūwei": "BV",
-    "Motu Tangata": "IM",
     "Motu Whākarangi": "FK",
-    "Motu Wharo": "FO",
-    "Myanmar (Burma)": "MM",
-    "Namīpia": "NA",
+    "Motu Wharau": "FO",
+    "Namipia": "NA",
     "Nauru": "NR",
-    "Nepal": "NP",
-    "New Caledonia": "NC",
+    "Nepōra": "NP",
+    "Ngā Motu Horomona": "SB",
     "Ngā Motu Keimana": "KY",
-    "Ngā Motu o Tātāhou Amerika": "VI",
-    "Ngā Motu o Tātāhou Piritene": "VG",
-    "Ngā moutere mōwaho i a Ōhiānia": "QO",
+    "Ngā Motu Māhara": "MH",
+    "Ngā Motu Mariana ki te Raki": "MP",
+    "Ngā Moutere Amerika o Waho": "UM",
+    "Ngā Moutere Heriti me Makitānara": "HM",
+    "Ngā Moutere Kokoko (Kirini)": "CC",
+    "Ngā Moutere Puhi Amerika": "VI",
+    "Ngā Moutere Puhi Piritene": "VG",
+    "Ngā Moutere-a-Kiwa": "009",
+    "Ngā Moutere-a-Kiwa o Waho atu": "QO",
+    "Ngā Rohe o Parihitini": "PS",
     "Ngā Rohe o Wīwī ki te Tonga": "TF",
     "Ngāika": "NE",
     "Ngāitiria": "NG",
-    "Nikarakua": "NI",
+    "Nikarāhua": "NI",
     "Niue": "NU",
-    "Norfolk Island": "NF",
-    "North Korea": "KP",
-    "Northern Mariana Islands": "MP",
     "Nōwei": "NO",
-    "Ōhiānia": "009",
-    "Oman": "OM",
-    "Pahāma": "BS",
-    "Pakistan": "PK",
-    "Palau": "PW",
-    "Palestinian Territories": "PS",
+    "Ōmana": "OM",
+    "Pahama": "BS",
+    "Pākaratēhi": "BD",
+    "Pākina Wharo": "BF",
+    "Pakitāne": "PK",
+    "Pāmura": "BM",
     "Panama": "PA",
-    "Pāpetō": "BB",
-    "Papua New Guinea": "PG",
+    "Papatohe": "BB",
+    "Papua Nūkini": "PG",
     "Parakai": "PY",
-    "Paratiamu": "BE",
+    "Pārau": "PW",
+    "Pāreina": "BH",
     "Parīhi": "BR",
-    "Pēkina Waho": "BF",
-    "Pemiuta": "BM",
+    "Peina": "ES",
+    "Pēma": "MM",
+    "Penehūera": "VE",
     "Penīna": "BJ",
+    "Pērara": "BY",
+    "Peretiama": "BE",
     "Perīhi": "BZ",
     "Peru": "PE",
-    "Philippines": "PH",
-    "Piri Kimikimi": "XB",
-    "Pitcairn Islands": "PN",
-    "Poland": "PL",
+    "Peta Riko": "PR",
+    "Piri Kikoika": "XB",
+    "Piripīni": "PH",
+    "Pitikeina": "PN",
+    "Pōngia-Herekōwini": "BA",
+    "Pōrana": "PL",
     "Poriwana": "BW",
     "Poriwia": "BO",
-    "Portugal": "PT",
-    "Pōta Riko": "PR",
+    "Poronai": "BN",
+    "Poronēhia Wīwī": "PF",
+    "Potukara": "PT",
+    "Purukāria": "BG",
     "Puruniti": "BI",
-    "Qatar": "QA",
-    "Raipiri": "LR",
-    "Rakimipēki": "LU",
-    "Ratawia": "LV",
+    "Pūtana": "BT",
+    "Raipiria": "LR",
+    "Rakapuō": "LU",
+    "Rāoho": "LA",
     "Rāwana": "RW",
-    "Rēnio": "RE",
-    "Rīkeneteina": "LI",
-    "Rīpia": "LY",
+    "Rāwhia": "LV",
+    "Repanona": "LB",
+    "Reūnio": "RE",
+    "Rīkenetaina": "LI",
+    "Ripia": "LY",
     "Rituānia": "LT",
     "Rohe Tē Mōhiotia": "ZZ",
-    "Romania": "RO",
+    "Romeinia": "RO",
     "Rūhia": "RU",
-    "Samoa": "WS",
-    "San Marino": "SM",
     "Sark": "CQ",
-    "Saudi Arabia": "SA",
-    "Serbia": "RS",
-    "Singapore": "SG",
-    "Slovakia": "SK",
-    "Slovenia": "SI",
-    "Solomon Islands": "SB",
-    "South Korea": "KR",
-    "Spain": "ES",
-    "Sri Lanka": "LK",
-    "Syria": "SY",
-    "Taiwan": "TW",
-    "Tajikistan": "TJ",
-    "Tāke me ngā Motu o Keiko": "TC",
+    "Tairanga": "TH",
+    "Taiwana": "TW",
+    "Tākei": "TR",
+    "Takiritānga": "TJ",
     "Tāmipia": "ZM",
     "Tānahia": "TZ",
     "te ao": "001",
     "Te Araone": "SL",
     "Te Hononga o Piritene": "GB",
-    "Te Kamopia": "GM",
-    "Te Kotahitanga o Ngā Iwi o te Ao": "UN",
+    "Te Kōpakatanga ki te Tonga": "AQ",
     "Te Kūrae Matomato": "CV",
-    "Te Moana Ahitereiria": "053",
     "Te Moana-nui-a-Kiwa": "061",
+    "Te Moutere Aupikinga": "AC",
+    "Te Moutere Kirihimete": "CX",
+    "Te Moutere Kiripetone": "CP",
+    "Te Moutere Mana": "IM",
+    "Te Moutere Nōpoke": "NF",
+    "Te Poho-o-Pita": "VA",
     "Te Pokapū o Āwherika": "017",
     "Te Puku o Āhia": "143",
     "Te Puku o Amerika": "013",
-    "Te Puku o Āwherika": "CF",
     "Te Raki o Amerika": "021",
-    "Te Rohe o Mikoronīhia": "057",
+    "Te Rohe o Mekanēhia": "057",
     "Te Rohe o te Moana Īniana Piritihi": "IO",
     "Te Rohe o Ūropi": "EZ",
+    "Te Rūnanga Whakakotahi i ngā Iwi o te Ao": "UN",
     "Te Tai Rei": "CI",
     "Te Uniana o Ūropi": "EU",
-    "Te Whenua Tominika": "DO",
+    "Te Whenua Tūhake o Āwherika Waenga": "CF",
+    "Te Whenua Tūhake o Tominika": "DO",
     "Tenemāka": "DK",
     "Teroto": "LS",
-    "Thailand": "TH",
-    "Tiamani": "DE",
-    "Tiehe": "JE",
-    "Timor-Leste": "TL",
+    "Tiamana": "DE",
+    "Tiekia": "CZ",
+    "Tieko Kāhia": "DG",
+    "Tīmoa ki te Rāwhiti": "TL",
     "Timuwawe": "ZW",
-    "Tinitātā me Topēko": "TT",
     "Tiorangi": "IS",
     "Tipūti": "DJ",
-    "Tokelau": "TK",
+    "Tirinaki Tōpako": "TT",
+    "Tiritana da Kunia": "TA",
+    "Tokerau": "TK",
     "Toko": "TG",
     "Tominika": "DM",
     "Tonga": "TO",
-    "Tristan da Cunha": "TA",
+    "Tōrehe": "JE",
+    "Tukumanatānga": "TM",
     "Tūnihia": "TN",
-    "Tūreo Kimikimi": "XA",
-    "Türkiye": "TR",
-    "Turkmenistan": "TM",
-    "Tuvalu": "TV",
-    "U.S. Outlying Islands": "UM",
-    "Ukāna": "UG",
-    "Ukraine": "UA",
-    "United Arab Emirates": "AE",
+    "Tūwaru": "TV",
+    "Uhipeketāne": "UZ",
+    "Ukānga": "UG",
+    "Ukareinga": "UA",
     "Ūropi": "150",
     "Ūropi ki te Raki": "154",
     "Ūropi ki te Rāwhiti": "151",
     "Ūropi ki te Tonga": "039",
     "Ūropi ki te Uru": "155",
     "Urukoi": "UY",
-    "Uzbekistan": "UZ",
-    "Vanuatu": "VU",
-    "Vatican City": "VA",
-    "Vietnam": "VN",
-    "Wallis & Futuna": "WF",
-    "Wenehūera": "VE",
-    "Whinirana": "FI",
-    "Wīwī": "FR",
-    "Yemen": "YE"
+    "Warihi me Whutuna": "WF",
+    "Whakaora": "SV",
+    "Whenua Kanaki": "NC",
+    "Whenuakāriki": "GL",
+    "Whenuatū": "VU",
+    "Whinarana": "FI",
+    "Whītī": "FJ",
+    "Whitināmu": "VN",
+    "Wīwī": "FR"
 }
\ No newline at end of file
diff --git a/js/data/locale/mi/ctryreverse.json b/js/data/locale/mi/ctryreverse.json
index 7dc52a6e21..5be330e39f 100644
--- a/js/data/locale/mi/ctryreverse.json
+++ b/js/data/locale/mi/ctryreverse.json
@@ -3,7 +3,7 @@
     "002": "Āwherika",
     "003": "Amerika ki te Raki",
     "005": "Amerika ki te Tonga",
-    "009": "Ōhiānia",
+    "009": "Ngā Moutere-a-Kiwa",
     "011": "Āwherika ki te Uru",
     "013": "Te Puku o Amerika",
     "014": "Āwherika ki te Rāwhiti",
@@ -12,14 +12,14 @@
     "018": "Āwherika Whakatetonga",
     "019": "Amerika",
     "021": "Te Raki o Amerika",
-    "029": "Karapiana",
+    "029": "Karapīana",
     "030": "Āhia ki te Rāwhiti",
     "034": "Āhia ki te Tonga",
-    "035": "Āhia ki te Tonga-mā-uru",
+    "035": "Āhia ki te Tonga-mā-rāwhiti",
     "039": "Ūropi ki te Tonga",
-    "053": "Te Moana Ahitereiria",
+    "053": "Atareiria",
     "054": "Meranīhia",
-    "057": "Te Rohe o Mikoronīhia",
+    "057": "Te Rohe o Mekanēhia",
     "061": "Te Moana-nui-a-Kiwa",
     "142": "Āhia",
     "143": "Te Puku o Āhia",
@@ -30,71 +30,71 @@
     "155": "Ūropi ki te Uru",
     "202": "Āwherika ki te Tonga o Te Hahāra",
     "419": "Amerika Rātini",
-    "AC": "Ascension Island",
-    "AD": "Andorra",
-    "AE": "United Arab Emirates",
-    "AF": "Afghanistan",
-    "AG": "Anatikua me Pāpura",
-    "AI": "Ākuira",
-    "AL": "Albania",
-    "AM": "Armenia",
+    "AC": "Te Moutere Aupikinga",
+    "AD": "Anatōra",
+    "AE": "Kotahitanga o ngā Whenua o Ārapi",
+    "AF": "Awhekenetāna",
+    "AG": "Motu Nehe me Pāputa",
+    "AI": "Anguira",
+    "AL": "Arapeinia",
+    "AM": "Āmenia",
     "AO": "Anakora",
-    "AQ": "Antarctica",
+    "AQ": "Te Kōpakatanga ki te Tonga",
     "AR": "Āketina",
-    "AS": "American Samoa",
-    "AT": "Ateria",
-    "AU": "Australia",
+    "AS": "Hāmoa-Amerika",
+    "AT": "Ataria",
+    "AU": "Ahitereiria",
     "AW": "Arūpa",
     "AX": "Motu Ōrana",
-    "AZ": "Azerbaijan",
-    "BA": "Bosnia & Herzegovina",
-    "BB": "Pāpetō",
-    "BD": "Bangladesh",
-    "BE": "Paratiamu",
-    "BF": "Pēkina Waho",
-    "BG": "Bulgaria",
-    "BH": "Bahrain",
+    "AZ": "Atepaihānia",
+    "BA": "Pōngia-Herekōwini",
+    "BB": "Papatohe",
+    "BD": "Pākaratēhi",
+    "BE": "Peretiama",
+    "BF": "Pākina Wharo",
+    "BG": "Purukāria",
+    "BH": "Pāreina",
     "BI": "Puruniti",
     "BJ": "Penīna",
     "BL": "Hato Pāteremi",
-    "BM": "Pemiuta",
-    "BN": "Brunei",
+    "BM": "Pāmura",
+    "BN": "Poronai",
     "BO": "Poriwia",
-    "BQ": "Karepeana Hōrana",
+    "BQ": "Karapīana Hōrana",
     "BR": "Parīhi",
-    "BS": "Pahāma",
-    "BT": "Bhutan",
+    "BS": "Pahama",
+    "BT": "Pūtana",
     "BV": "Motu Pūwei",
     "BW": "Poriwana",
-    "BY": "Belarus",
+    "BY": "Pērara",
     "BZ": "Perīhi",
     "CA": "Kānata",
-    "CC": "Cocos (Keeling) Islands",
-    "CD": "Kōngo - Kingihāha",
-    "CF": "Te Puku o Āwherika",
-    "CG": "Kōngo - Parāwhe",
+    "CC": "Ngā Moutere Kokoko (Kirini)",
+    "CD": "Kōngo - Kinihāha",
+    "CF": "Te Whenua Tūhake o Āwherika Waenga",
+    "CG": "Kōngo - Pārawhe",
     "CH": "Huiterangi",
     "CI": "Te Tai Rei",
-    "CK": "Cook Islands",
+    "CK": "Kuki Airani",
     "CL": "Hiri",
     "CM": "Kamarūna",
     "CN": "Haina",
     "CO": "Koromōpia",
-    "CP": "Clipperton Island",
+    "CP": "Te Moutere Kiripetone",
     "CQ": "Sark",
-    "CR": "Kota Rīka",
+    "CR": "Koto Rīka",
     "CU": "Kiupa",
     "CV": "Te Kūrae Matomato",
     "CW": "Kurahao",
-    "CX": "Christmas Island",
-    "CY": "Cyprus",
-    "CZ": "Czechia",
-    "DE": "Tiamani",
-    "DG": "Diego Garcia",
+    "CX": "Te Moutere Kirihimete",
+    "CY": "Haipara",
+    "CZ": "Tiekia",
+    "DE": "Tiamana",
+    "DG": "Tieko Kāhia",
     "DJ": "Tipūti",
     "DK": "Tenemāka",
     "DM": "Tominika",
-    "DO": "Te Whenua Tominika",
+    "DO": "Te Whenua Tūhake o Tominika",
     "DZ": "Aratiria",
     "EA": "Hūta me Merera",
     "EC": "Ekuatoa",
@@ -102,194 +102,194 @@
     "EG": "Īhipa",
     "EH": "Hahāra ki te Tonga",
     "ER": "Eritēria",
-    "ES": "Spain",
+    "ES": "Peina",
     "ET": "Etiopia",
     "EU": "Te Uniana o Ūropi",
     "EZ": "Te Rohe o Ūropi",
-    "FI": "Whinirana",
-    "FJ": "Fiji",
+    "FI": "Whinarana",
+    "FJ": "Whītī",
     "FK": "Motu Whākarangi",
-    "FM": "Micronesia",
-    "FO": "Motu Wharo",
+    "FM": "Mekanēhia",
+    "FO": "Motu Wharau",
     "FR": "Wīwī",
     "GA": "Kāpona",
     "GB": "Te Hononga o Piritene",
     "GD": "Kerenāta",
-    "GE": "Georgia",
-    "GF": "Kaiana Wīwī",
-    "GG": "Kēni",
+    "GE": "Hōria",
+    "GF": "Kiāna Wīwī",
+    "GG": "Kōnihi",
     "GH": "Kāna",
-    "GI": "Gibraltar",
-    "GL": "Kirīrangi",
-    "GM": "Te Kamopia",
+    "GI": "Kāmaka",
+    "GL": "Whenuakāriki",
+    "GM": "Kamopia",
     "GN": "Kini",
-    "GP": "Kuatarū",
+    "GP": "Kuatarupa",
     "GQ": "Kini Ekuatoria",
-    "GR": "Greece",
-    "GS": "Hōria ki te Tonga me Motu Hanuwiti ki te Tonga",
+    "GR": "Kirihi",
+    "GS": "Hōria ki te Tonga me ngā Motu Hanawiti ki te Tonga",
     "GT": "Kuatamāra",
-    "GU": "Guam",
+    "GU": "Kuama",
     "GW": "Kini-Pihao",
     "GY": "Kaiana",
-    "HK": "Hong Kong SAR China",
-    "HM": "Heard & McDonald Islands",
-    "HN": "Honūra",
-    "HR": "Croatia",
+    "HK": "Hongipua Haina",
+    "HM": "Ngā Moutere Heriti me Makitānara",
+    "HN": "Honotura",
+    "HR": "Koroātia",
     "HT": "Haiti",
-    "HU": "Hungary",
-    "IC": "Motu Kānara",
-    "ID": "Indonesia",
-    "IE": "Aerana",
-    "IL": "Israel",
-    "IM": "Motu Tangata",
+    "HU": "Hanekari",
+    "IC": "Motu Kanēre",
+    "ID": "Initonīhia",
+    "IE": "Airani",
+    "IL": "Iharaira",
+    "IM": "Te Moutere Mana",
     "IN": "Inia",
     "IO": "Te Rohe o te Moana Īniana Piritihi",
-    "IQ": "Iraq",
-    "IR": "Iran",
+    "IQ": "Irāka",
+    "IR": "Irāna",
     "IS": "Tiorangi",
     "IT": "Itāria",
-    "JE": "Tiehe",
+    "JE": "Tōrehe",
     "JM": "Hemeika",
-    "JO": "Jordan",
+    "JO": "Hōrano",
     "JP": "Hapani",
-    "KE": "Kēnia",
-    "KG": "Kyrgyzstan",
-    "KH": "Cambodia",
-    "KI": "Kiribati",
+    "KE": "Kenia",
+    "KG": "Kikitānga",
+    "KH": "Kamapōtia",
+    "KI": "Kiripati",
     "KM": "Komoro",
     "KN": "Hato Kiti me Newhi",
-    "KP": "North Korea",
-    "KR": "South Korea",
-    "KW": "Kuwait",
+    "KP": "Kōrea ki te Raki",
+    "KR": "Kōrea ki te Tonga",
+    "KW": "Kūweiti",
     "KY": "Ngā Motu Keimana",
-    "KZ": "Kazakhstan",
-    "LA": "Laos",
-    "LB": "Lebanon",
+    "KZ": "Katatānga",
+    "LA": "Rāoho",
+    "LB": "Repanona",
     "LC": "Hato Ruhia",
-    "LI": "Rīkeneteina",
-    "LK": "Sri Lanka",
-    "LR": "Raipiri",
+    "LI": "Rīkenetaina",
+    "LK": "Hiri Rānaka",
+    "LR": "Raipiria",
     "LS": "Teroto",
     "LT": "Rituānia",
-    "LU": "Rakimipēki",
-    "LV": "Ratawia",
-    "LY": "Rīpia",
+    "LU": "Rakapuō",
+    "LV": "Rāwhia",
+    "LY": "Ripia",
     "MA": "Moroko",
-    "MC": "Manako",
-    "MD": "Moldova",
-    "ME": "Montenegro",
+    "MC": "Monāko",
+    "MD": "Morotawa",
+    "ME": "Maungakororiko",
     "MF": "Hato Mātene",
-    "MG": "Marakāhia",
-    "MH": "Marshall Islands",
+    "MG": "Matakāhika",
+    "MH": "Ngā Motu Māhara",
     "MK": "Makerōnia ki te Raki",
     "ML": "Māri",
-    "MM": "Myanmar (Burma)",
-    "MN": "Mongolia",
-    "MO": "Macao SAR China",
-    "MP": "Northern Mariana Islands",
-    "MQ": "Māteniki",
+    "MM": "Pēma",
+    "MN": "Mongōria",
+    "MO": "Makau Haina",
+    "MP": "Ngā Motu Mariana ki te Raki",
+    "MQ": "Mātiniki",
     "MR": "Mauritānia",
     "MS": "Monoterā",
-    "MT": "Malta",
-    "MU": "Mōrihi",
-    "MV": "Maldives",
+    "MT": "Mārata",
+    "MU": "Marihi",
+    "MV": "Māratiri",
     "MW": "Marāwi",
     "MX": "Mēhiko",
-    "MY": "Malaysia",
+    "MY": "Mareia",
     "MZ": "Mohapiki",
-    "NA": "Namīpia",
-    "NC": "New Caledonia",
+    "NA": "Namipia",
+    "NC": "Whenua Kanaki",
     "NE": "Ngāika",
-    "NF": "Norfolk Island",
+    "NF": "Te Moutere Nōpoke",
     "NG": "Ngāitiria",
-    "NI": "Nikarakua",
+    "NI": "Nikarāhua",
     "NL": "Hōrana",
     "NO": "Nōwei",
-    "NP": "Nepal",
+    "NP": "Nepōra",
     "NR": "Nauru",
     "NU": "Niue",
     "NZ": "Aotearoa",
-    "OM": "Oman",
+    "OM": "Ōmana",
     "PA": "Panama",
     "PE": "Peru",
-    "PF": "French Polynesia",
-    "PG": "Papua New Guinea",
-    "PH": "Philippines",
-    "PK": "Pakistan",
-    "PL": "Poland",
-    "PM": "Hato Piere & Mikarona",
-    "PN": "Pitcairn Islands",
-    "PR": "Pōta Riko",
-    "PS": "Palestinian Territories",
-    "PT": "Portugal",
-    "PW": "Palau",
+    "PF": "Poronēhia Wīwī",
+    "PG": "Papua Nūkini",
+    "PH": "Piripīni",
+    "PK": "Pakitāne",
+    "PL": "Pōrana",
+    "PM": "Hato Piere & Mikerona",
+    "PN": "Pitikeina",
+    "PR": "Peta Riko",
+    "PS": "Ngā Rohe o Parihitini",
+    "PT": "Potukara",
+    "PW": "Pārau",
     "PY": "Parakai",
-    "QA": "Qatar",
-    "QO": "Ngā moutere mōwaho i a Ōhiānia",
-    "RE": "Rēnio",
-    "RO": "Romania",
-    "RS": "Serbia",
+    "QA": "Katā",
+    "QO": "Ngā Moutere-a-Kiwa o Waho atu",
+    "RE": "Reūnio",
+    "RO": "Romeinia",
+    "RS": "Hirupia",
     "RU": "Rūhia",
     "RW": "Rāwana",
-    "SA": "Saudi Arabia",
-    "SB": "Solomon Islands",
-    "SC": "Heihere",
+    "SA": "Hauri Arāpia",
+    "SB": "Ngā Motu Horomona",
+    "SC": "Heikere",
     "SD": "Hūtāne",
-    "SE": "Huītene",
-    "SG": "Singapore",
-    "SH": "Hato Harīna",
-    "SI": "Slovenia",
-    "SJ": "Heopāra me Ia Maiana",
-    "SK": "Slovakia",
+    "SE": "Huitene",
+    "SG": "Hingapoa",
+    "SH": "Hato Hērena",
+    "SI": "Horowinia",
+    "SJ": "Heopara me Iana Maiana",
+    "SK": "Horowākia",
     "SL": "Te Araone",
-    "SM": "San Marino",
+    "SM": "Hana Marino",
     "SN": "Henekara",
     "SO": "Hūmārie",
-    "SR": "Hurināme",
+    "SR": "Huriname",
     "SS": "Hūtāne ki te Tonga",
-    "ST": "Hao Tomei me Pirinipei",
-    "SV": "Ere Hāwhatō",
+    "ST": "Hato Tomei me Pirinipei",
+    "SV": "Whakaora",
     "SX": "Hiti Mātene",
-    "SY": "Syria",
-    "SZ": "Ewatini",
-    "TA": "Tristan da Cunha",
-    "TC": "Tāke me ngā Motu o Keiko",
+    "SY": "Hiria",
+    "SZ": "Ehiwatini",
+    "TA": "Tiritana da Kunia",
+    "TC": "Koru-Kākoa",
     "TD": "Kāta",
     "TF": "Ngā Rohe o Wīwī ki te Tonga",
     "TG": "Toko",
-    "TH": "Thailand",
-    "TJ": "Tajikistan",
-    "TK": "Tokelau",
-    "TL": "Timor-Leste",
-    "TM": "Turkmenistan",
+    "TH": "Tairanga",
+    "TJ": "Takiritānga",
+    "TK": "Tokerau",
+    "TL": "Tīmoa ki te Rāwhiti",
+    "TM": "Tukumanatānga",
     "TN": "Tūnihia",
     "TO": "Tonga",
-    "TR": "Türkiye",
-    "TT": "Tinitātā me Topēko",
-    "TV": "Tuvalu",
-    "TW": "Taiwan",
+    "TR": "Tākei",
+    "TT": "Tirinaki Tōpako",
+    "TV": "Tūwaru",
+    "TW": "Taiwana",
     "TZ": "Tānahia",
-    "UA": "Ukraine",
-    "UG": "Ukāna",
-    "UM": "U.S. Outlying Islands",
-    "UN": "Te Kotahitanga o Ngā Iwi o te Ao",
+    "UA": "Ukareinga",
+    "UG": "Ukānga",
+    "UM": "Ngā Moutere Amerika o Waho",
+    "UN": "Te Rūnanga Whakakotahi i ngā Iwi o te Ao",
     "US": "Hononga o Amerika",
     "UY": "Urukoi",
-    "UZ": "Uzbekistan",
-    "VA": "Vatican City",
-    "VC": "Hato Wetene me Keretīni",
-    "VE": "Wenehūera",
-    "VG": "Ngā Motu o Tātāhou Piritene",
-    "VI": "Ngā Motu o Tātāhou Amerika",
-    "VN": "Vietnam",
-    "VU": "Vanuatu",
-    "WF": "Wallis & Futuna",
-    "WS": "Samoa",
-    "XA": "Tūreo Kimikimi",
-    "XB": "Piri Kimikimi",
-    "XK": "Kosovo",
-    "YE": "Yemen",
-    "YT": "Maio",
+    "UZ": "Uhipeketāne",
+    "VA": "Te Poho-o-Pita",
+    "VC": "Hato Wēneti me Keretīni",
+    "VE": "Penehūera",
+    "VG": "Ngā Moutere Puhi Piritene",
+    "VI": "Ngā Moutere Puhi Amerika",
+    "VN": "Whitināmu",
+    "VU": "Whenuatū",
+    "WF": "Warihi me Whutuna",
+    "WS": "Hāmoa",
+    "XA": "Mita kikoika",
+    "XB": "Piri Kikoika",
+    "XK": "Kōhoro",
+    "YE": "Īmene",
+    "YT": "Māiota",
     "ZA": "Āwherika ki te Tonga",
     "ZM": "Tāmipia",
     "ZW": "Timuwawe",
diff --git a/js/data/locale/mi/dateformats.json b/js/data/locale/mi/dateformats.json
index 586a2d707d..86af46fa64 100644
--- a/js/data/locale/mi/dateformats.json
+++ b/js/data/locale/mi/dateformats.json
@@ -41,6 +41,12 @@
                 "m": "cc",
                 "s": "c"
             },
+            "l": {
+                "f": "LLLL",
+                "l": "LLLL",
+                "m": "LLL",
+                "s": "LL"
+            },
             "m": {
                 "l": "MMMM",
                 "m": "MMM",
diff --git a/js/data/locale/mi/list.json b/js/data/locale/mi/list.json
new file mode 100644
index 0000000000..f3f5f71ef4
--- /dev/null
+++ b/js/data/locale/mi/list.json
@@ -0,0 +1,34 @@
+{
+    "or": {
+        "full": {
+            "2": "{0} {1} rānei",
+            "end": "{0}, {1} rānei"
+        },
+        "long": {
+            "2": "{0} {1} rānei",
+            "end": "{0}, {1} rānei"
+        },
+        "medium": {
+            "2": "{0} {1} rānei",
+            "end": "{0}, {1} rānei"
+        },
+        "short": {
+            "2": "{0} {1} rānei",
+            "end": "{0}, {1} rānei"
+        }
+    },
+    "standard": {
+        "medium": {
+            "2": "{0} & {1}",
+            "end": "{0}, & {1}"
+        }
+    },
+    "unit": {
+        "short": {
+            "2": "{0} {1}",
+            "end": "{0} {1}",
+            "middle": "{0} {1}",
+            "start": "{0} {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/mi/sysres.json b/js/data/locale/mi/sysres.json
index 329dffc5f1..e985b4662d 100644
--- a/js/data/locale/mi/sysres.json
+++ b/js/data/locale/mi/sysres.json
@@ -1,72 +1,71 @@
 {
-    "#in {num}d": "#+{num} r",
+    "#in {num}d": "#+{num} rā",
     "#in {num}h": "#+{num} h.",
     "#in {num}mi": "#+{num} men.",
     "#in {num}mo": "#+{num} m.",
     "#in {num}s": "#+{num} h.",
     "#in {num}w": "#+{num} w",
     "#in {num}y": "#ā te {num} tau",
-    "#{num} ms": "#{num} ms",
-    "#{num}d": "#{num} d",
-    "#{num}d ago": "#-{num} r.",
+    "#{num} ms": "#{num} hm",
+    "#{num}d": "#{num} rā",
+    "#{num}d ago": "#-{num} rā",
     "#{num}h": "#{num} h",
     "#{num}h ago": "#-{num} h.",
     "#{num}mi ago": "#-{num} men.",
     "#{num}mo ago": "#-{num} m.",
-    "#{num}s": "#{num} s",
+    "#{num}s": "#{num} h",
     "#{num}s ago": "#-{num} h.",
     "#{num}w": "#{num} w",
     "#{num}w ago": "#-{num} w",
-    "#{num}y": "#{num} y",
+    "#{num}y": "#{num} t",
     "#{num}y ago": "#i te {num} tau",
-    "1#1 day ago|#{num} days ago": "#-{num} r.",
-    "1#1 day|#{num} days": "#{num} d",
-    "1#1 dy ago|#{num} dys ago": "#-{num} r.",
-    "1#1 dy|#{num} dys": "#{num} d",
-    "1#1 hour ago|#{num} hours ago": "#-{num} h",
-    "1#1 hour|#{num} hours": "#{num} h",
-    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 day ago|#{num} days ago": "#-{num} rā i mua",
+    "1#1 day|#{num} days": "#{num} rā",
+    "1#1 dy ago|#{num} dys ago": "#-{num} rā i mua",
+    "1#1 dy|#{num} dys": "#{num} rā",
+    "1#1 hour ago|#{num} hours ago": "#-{num} haora i mua",
+    "1#1 hour|#{num} hours": "#{num} haora",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} haora i mua",
     "1#1 hr|#{num} hrs": "#{num} h",
-    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
-    "1#1 min ago|#{num} min ago": "#-{num} men",
-    "1#1 minute ago|#{num} minutes ago": "#-{num} men",
-    "1#1 minute|#{num} minutes": "#{num} min",
-    "1#1 min|#{num} min": "#{num} min",
-    "1#1 mi|#{num} min": "#{num} min",
-    "1#1 mon ago|#{num} mons ago": "#-{num} m",
-    "1#1 month ago|#{num} months ago": "#-{num} m",
-    "1#1 month|#{num} months": "#{num} m",
+    "1#1 millisecond|#{num} milliseconds": "#{num} hēkonamano",
+    "1#1 min ago|#{num} min ago": "#-{num} meneti i mua",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} meneti i mua",
+    "1#1 minute|#{num} minutes": "#{num} meneti",
+    "1#1 min|#{num} min": "#{num} men",
+    "1#1 mi|#{num} min": "#{num} men",
+    "1#1 mon ago|#{num} mons ago": "#-{num} marama i mua",
+    "1#1 month ago|#{num} months ago": "#-{num} marama i mua",
+    "1#1 month|#{num} months": "#{num} marama",
     "1#1 mon|#{num} mons": "#{num} m",
     "1#1 mo|#{num} mos": "#{num} m",
-    "1#1 sec ago|#{num} sec ago": "#-{num} h",
-    "1#1 second ago|#{num} seconds ago": "#-{num} h",
-    "1#1 second|#{num} seconds": "#{num} s",
-    "1#1 sec|#{num} sec": "#{num} s",
-    "1#1 se|#{num} sec": "#{num} s",
-    "1#1 week ago|#{num} weeks ago": "#-{num} w",
-    "1#1 week|#{num} weeks": "#{num} w",
-    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 sec ago|#{num} sec ago": "#-{num} hēkona i mua",
+    "1#1 second ago|#{num} seconds ago": "#-{num} hēkona i mua",
+    "1#1 second|#{num} seconds": "#{num} hēkona",
+    "1#1 sec|#{num} sec": "#{num} hēk",
+    "1#1 se|#{num} sec": "#{num} h",
+    "1#1 week ago|#{num} weeks ago": "#-{num} wiki i mua",
+    "1#1 week|#{num} weeks": "#{num} wiki",
+    "1#1 wk ago|#{num} wks ago": "#-{num} wiki i mua",
     "1#1 wk|#{num} wks": "#{num} w",
-    "1#1 year ago|#{num} years ago": "#i te {num} tau",
-    "1#1 year|#{num} years": "#{num} y",
-    "1#1 yr ago|#{num} yrs ago": "#i te {num} tau",
-    "1#1 yr|#{num} yrs": "#{num} y",
-    "1#in 1 day|#in {num} days": "#+{num} r.",
-    "1#in 1 dy|#in {num} dys": "#+{num} r.",
-    "1#in 1 hour|#in {num} hours": "#+{num} h",
-    "1#in 1 hr|#in {num} hrs": "#+{num} h",
-    "1#in 1 minute|#in {num} minutes": "#+{num} men",
-    "1#in 1 min|#in {num} min": "#+{num} men",
-    "1#in 1 month|#in {num} months": "#+{num} m",
-    "1#in 1 mon|#in {num} mons": "#+{num} m",
-    "1#in 1 second|#in {num} seconds": "#+{num} h",
-    "1#in 1 sec|#in {num} sec": "#+{num} h",
-    "1#in 1 week|#in {num} weeks": "#+{num} w",
-    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#1 year ago|#{num} years ago": "#i te {num} tau i mua",
+    "1#1 year|#{num} years": "#{num} tau",
+    "1#1 yr ago|#{num} yrs ago": "#i te {num} tau i mua",
+    "1#1 yr|#{num} yrs": "#{num} tau",
+    "1#in 1 day|#in {num} days": "#+{num} rā",
+    "1#in 1 dy|#in {num} dys": "#+{num} rā",
+    "1#in 1 hour|#in {num} hours": "#+{num} haora",
+    "1#in 1 hr|#in {num} hrs": "#+{num} haora",
+    "1#in 1 minute|#in {num} minutes": "#+{num} meneti",
+    "1#in 1 min|#in {num} min": "#+{num} meneti",
+    "1#in 1 month|#in {num} months": "#+{num} marama",
+    "1#in 1 mon|#in {num} mons": "#+{num} marama",
+    "1#in 1 second|#in {num} seconds": "#+{num} hēkona",
+    "1#in 1 sec|#in {num} sec": "#+{num} hēkona",
+    "1#in 1 week|#in {num} weeks": "#+{num} wiki",
+    "1#in 1 wk|#in {num} wks": "#+{num} wiki",
     "1#in 1 year|#in {num} years": "#ā te {num} tau",
     "1#in 1 yr|#in {num} yrs": "#ā te {num} tau",
     "E0": "Rt",
-    "E3": "E",
     "E5": "P",
     "E6": "Rh",
     "EE0": "Rāt",
@@ -77,10 +76,10 @@
     "EE5": "Par",
     "EE6": "Rāh",
     "EEE0": "Rāt",
-    "EEE1": "Mane",
+    "EEE1": "Man",
     "EEE2": "Tūr",
-    "EEE3": "Wene",
-    "EEE4": "Tāit",
+    "EEE3": "Wen",
+    "EEE4": "Tāi",
     "EEE5": "Par",
     "EEE6": "Rāh",
     "EEEE0": "Rātapu",
@@ -90,15 +89,63 @@
     "EEEE4": "Tāite",
     "EEEE5": "Paraire",
     "EEEE6": "Rāhoroi",
+    "L1": "H",
+    "L10": "O",
+    "L11": "N",
+    "L12": "T",
+    "L2": "P",
+    "L3": "M",
+    "L4": "Ā",
+    "L5": "M",
+    "L6": "H",
+    "L7": "H",
+    "L8": "Ā",
+    "L9": "H",
+    "LL1": "Hā",
+    "LL10": "Ok",
+    "LL11": "No",
+    "LL12": "Tī",
+    "LL2": "Pē",
+    "LL3": "Mā",
+    "LL4": "Āp",
+    "LL5": "Me",
+    "LL6": "Hu",
+    "LL7": "Hū",
+    "LL8": "Āk",
+    "LL9": "He",
+    "LLL1": "Hān",
+    "LLL10": "Oke",
+    "LLL11": "Noe",
+    "LLL12": "Tīh",
+    "LLL2": "Pēp",
+    "LLL3": "Māe",
+    "LLL4": "Āpe",
+    "LLL5": "Mei",
+    "LLL6": "Hun",
+    "LLL7": "Hūr",
+    "LLL8": "Āku",
+    "LLL9": "Hep",
+    "LLLL1": "Hānuere",
+    "LLLL10": "Oketopa",
+    "LLLL11": "Noema",
+    "LLLL12": "Tīhema",
+    "LLLL2": "Pēpuere",
+    "LLLL3": "Māehe",
+    "LLLL4": "Āperira",
+    "LLLL5": "Mei",
+    "LLLL6": "Hune",
+    "LLLL7": "Hūrae",
+    "LLLL8": "Ākuhata",
+    "LLLL9": "Hepetema",
     "MMM1": "Hān",
     "MMM10": "Oke",
-    "MMM11": "Noem",
-    "MMM12": "Tīhe",
+    "MMM11": "Noe",
+    "MMM12": "Tīh",
     "MMM2": "Pēp",
     "MMM3": "Māe",
     "MMM4": "Āpe",
     "MMM5": "Mei",
-    "MMM6": "Hune",
+    "MMM6": "Hun",
     "MMM7": "Hūr",
     "MMM8": "Āku",
     "MMM9": "Hep",
@@ -161,18 +208,17 @@
     "cccc4": "Tāite",
     "cccc5": "Paraire",
     "cccc6": "Rāhoroi",
-    "durationLongDays": "#{num} d",
+    "durationLongDays": "#{num} rā",
     "durationMediumHours": "#{num} h",
-    "durationMediumMillis": "#{num} ms",
+    "durationMediumMillis": "#{num} hm",
     "durationMediumWeeks": "#{num} w",
-    "durationMediumYears": "#{num} y",
-    "durationShortMillis": "#{num} ms",
-    "durationShortMinutes": "#{num} min",
+    "durationMediumYears": "#{num} t",
+    "durationShortMillis": "#{num} hm",
+    "durationShortMinutes": "#{num} men",
     "durationShortMonths": "#{num} m",
     "finalSeparatorFull": ", ",
     "finalSeparatorLong": ", ",
     "finalSeparatorMedium": ", ",
-    "finalSeparatorShort": ", ",
-    "separatorMedium": ", ",
-    "separatorShort": ", "
+    "finalSeparatorShort": " ",
+    "separatorMedium": ", "
 }
\ No newline at end of file
diff --git a/js/data/locale/mi/unitfmt.json b/js/data/locale/mi/unitfmt.json
index db7f7f31e8..cee9f9b19d 100644
--- a/js/data/locale/mi/unitfmt.json
+++ b/js/data/locale/mi/unitfmt.json
@@ -1,81 +1,82 @@
 {
     "unitfmt": {
         "long": {
-            "acre": "#{n} ac",
+            "acre": "#{n} eka",
             "acre-foot": "#{n} ac ft",
             "ampere": "#{n} A",
             "arc-minute": "#{n}′",
             "arc-second": "#{n}″",
-            "astronomical-unit": "#{n} au",
+            "astronomical-unit": "#{n} waeine mātai arorangi",
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
-            "barrel": "#{n} bbl",
+            "barrel": "#{n} kāho",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
-            "bit-per-second": "#{n} bit/s",
+            "bit-per-second": "#{n} bit i te hēkona",
             "british-thermal-unit": "#{n} Btu",
             "bushel": "#{n} bu",
             "byte": "#{n} byte",
-            "byte-per-hour": "#{n} byte/h",
-            "byte-per-second": "#{n} byte/s",
+            "byte-per-hour": "#{n} byte i te haora",
+            "byte-per-second": "#{n} byte i te hēkona",
             "calorie": "#{n} cal",
             "candela": "#{n} cd",
             "carat": "#{n} CD",
             "celsius": "#{n}°C",
-            "centiliter": "#{n} cL",
-            "centimeter": "#{n} cm",
-            "century": "#{n} c",
+            "centiliter": "#{n} ritarau",
+            "centimeter": "#{n} mitarau",
+            "century": "#{n} r",
             "coordinateUnit": "",
-            "cubic-centimeter": "#{n} cm³",
-            "cubic-foot": "#{n} ft³",
-            "cubic-inch": "#{n} in³",
-            "cubic-kilometer": "#{n} km³",
-            "cubic-meter": "#{n} m³",
-            "cubic-mile": "#{n} mi³",
-            "cubic-yard": "#{n} yd³",
-            "cup": "#{n} c",
+            "cubic-centimeter": "#{n} mitarau pūtoru",
+            "cubic-foot": "#{n} pūtu pūtoru",
+            "cubic-inch": "#{n} īnihi pūtoru",
+            "cubic-kilometer": "#{n} manomita pūtoru",
+            "cubic-meter": "#{n} mita pūtoru",
+            "cubic-mile": "#{n} māero pūtoru",
+            "cubic-yard": "#{n} iari pūtoru",
+            "cup": "#{n} kapu",
             "cup-metric": "#{n} mc",
             "dalton": "#{n} Da",
-            "day": "#{n} d",
-            "decade": "#{n} dec",
+            "day": "#{n} rā",
+            "decade": "#{n} ngahurutau",
             "deciliter": "#{n} dL",
-            "decimeter": "#{n} dm",
+            "decimeter": "#{n} mitatekau",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon": "#{n} koko pūrini",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dram": "#{n} dram fl",
-            "drop": "#{n} drop",
+            "drop": "#{n} pata",
             "dunam": "#{n} dunam",
             "earth-mass": "#{n} M⊕",
-            "earth-radius": "#{n} R⊕",
+            "earth-radius": "#{n} pūtoro o te ao",
             "electronvolt": "#{n} eV",
             "em": "#{n} em",
             "fahrenheit": "#{n}°F",
-            "fathom": "#{n} fth",
-            "fluid-ounce": "#{n} fl oz US",
-            "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foot": "#{n} ft",
-            "foot-per-second": "#{n} ft/s",
+            "fathom": "#{n} mārō",
+            "fluid-ounce": "#{n} aunihi kūtere",
+            "fluid-ounce-imperial": "#{n} aunihi kūtere emepaea",
+            "foot": "#{n} pūtu",
+            "foot-per-second": "#{n} pūtu i te hēkona",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
-            "gallon": "#{n} gal US",
-            "gallon-imperial": "#{n} gal Imp.",
+            "gallon": "#{n} kārani",
+            "gallon-imperial": "#{n} kārani emepaea",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
-            "gigabit-per-second": "#{n} Gb/s",
+            "gigabit-per-second": "#{n} Gb i te hēkona",
             "gigabyte": "#{n} GB",
-            "gigabyte-per-hour": "#{n} GB/h",
-            "gigabyte-per-second": "#{n} GB/s",
+            "gigabyte-per-hour": "#{n} GB i te haora",
+            "gigabyte-per-second": "#{n} GB i te hēkona",
             "gigahertz": "#{n} GHz",
             "gigawatt": "#{n} GW",
             "grain": "#{n} grain",
             "gram": "#{n} g",
-            "hectare": "#{n} ha",
+            "hectare": "#{n} heketea",
             "hectoliter": "#{n} hL",
             "hectopascal": "#{n} hPa",
             "hertz": "#{n} Hz",
             "horsepower": "#{n} hp",
-            "hour": "#{n} h",
-            "inch": "#{n} in",
+            "hour": "#{n} haora",
+            "inch": "#{n} īnihi",
             "inch-ofhg": "#{n} inHg",
             "item": "#{n} item",
             "jigger": "#{n} jigger",
@@ -83,67 +84,67 @@
             "karat": "#{n} kt",
             "kelvin": "#{n} K",
             "kilobit": "#{n} kb",
-            "kilobit-per-second": "#{n} kb/s",
+            "kilobit-per-second": "#{n} kb i te hēkona",
             "kilobyte": "#{n} kB",
-            "kilobyte-per-hour": "#{n} kB/h",
-            "kilobyte-per-second": "#{n} kB/s",
+            "kilobyte-per-hour": "#{n} kB i te haora",
+            "kilobyte-per-second": "#{n} kB i te hēkona",
             "kilocalorie": "#{n} kcal",
             "kilogram": "#{n} kg",
             "kilohertz": "#{n} kHz",
             "kilojoule": "#{n} kJ",
-            "kilometer": "#{n} km",
+            "kilometer": "#{n} manomita",
             "kilometer-per-hour": "#{n} km/h",
-            "kilometer-per-liter": "#{n} km/l",
-            "kilometer-per-second": "#{n} km/s",
+            "kilometer-per-liter": "#{n} manomita ki te rita",
+            "kilometer-per-second": "#{n} manomita i te hēkona",
             "kilopascal": "#{n} kPa",
             "kilowatt": "#{n} kW",
             "kilowatt-hour": "#{n} kWh",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
             "knot": "#{n} kn",
-            "light-year": "#{n} ly",
-            "liter": "#{n} l",
+            "light-year": "#{n} tau aho",
+            "liter": "#{n} rita",
             "liter-per-100-kilometer": "#{n} L/100km",
             "liter-per-kilometer": "#{n} L/km",
             "lumen": "#{n} lm",
             "lux": "#{n} lx",
             "megabit": "#{n} Mb",
-            "megabit-per-second": "#{n} Mb/s",
+            "megabit-per-second": "#{n} Mb i te hēkona",
             "megabyte": "#{n} MB",
-            "megabyte-per-hour": "#{n} MB/h",
-            "megabyte-per-second": "#{n} MB/s",
+            "megabyte-per-hour": "#{n} MB i te haora",
+            "megabyte-per-second": "#{n} MB i te hēkona",
             "megahertz": "#{n} MHz",
-            "megaliter": "#{n} ML",
+            "megaliter": "#{n} rita miriona",
             "megapascal": "#{n} MPa",
             "megapixel": "#{n} MP",
             "megawatt": "#{n} MW",
-            "meter": "#{n} m",
+            "meter": "#{n} mita",
             "meter-per-second": "#{n} m/s",
             "meter-per-square-second": "#{n} m/s²",
             "microgram": "#{n} μg",
-            "micrometer": "#{n} μm",
-            "microsecond": "#{n} μs",
-            "mile": "#{n} mi",
+            "micrometer": "#{n} mitamiriona",
+            "microsecond": "#{n} hēkonamiriona",
+            "mile": "#{n} māero",
             "mile-per-gallon": "#{n} mpg US",
             "mile-per-gallon-imperial": "#{n} mpg Imp.",
             "mile-per-hour": "#{n} mi/h",
-            "mile-per-second": "#{n} mi/s",
+            "mile-per-second": "#{n} māero i te hēkona",
             "mile-scandinavian": "#{n} smi",
             "milliampere": "#{n} mA",
             "millibar": "#{n} mbar",
             "milligram": "#{n} mg",
             "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
-            "milliliter": "#{n} mL",
-            "millimeter": "#{n} mm",
+            "milliliter": "#{n} ritamano",
+            "millimeter": "#{n} mitamano",
             "millimeter-ofhg": "#{n} mm Hg",
             "millimole-per-liter": "#{n} mmol/L",
-            "millisecond": "#{n} ms",
+            "millisecond": "#{n} hēkonamano",
             "milliwatt": "#{n} mW",
-            "minute": "#{n} min",
+            "minute": "#{n} meneti",
             "mole": "#{n} mol",
-            "month": "#{n} m",
-            "nanometer": "#{n} nm",
-            "nanosecond": "#{n} ns",
-            "nautical-mile": "#{n} nmi",
+            "month": "#{n} marama",
+            "nanometer": "#{n} mitanano",
+            "nanosecond": "#{n} nanohēkona",
+            "nautical-mile": "#{n} māero moana",
             "newton": "#{n} N",
             "newton-meter": "#{n} N⋅m",
             "ohm": "#{n} Ω",
@@ -156,54 +157,54 @@
             "permillion": "#{n} ppm",
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
-            "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
-            "pint": "#{n} pt",
+            "picometer": "#{n} mitapiko",
+            "pinch": "#{n} kini",
+            "pint": "#{n} paina",
             "pint-metric": "#{n} mpt",
-            "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel": "#{n} tongiiti",
+            "pixel-per-centimeter": "#{n} tongiiti ki te mitarau",
+            "pixel-per-inch": "#{n} tongiiti ki te īnihi",
             "point": "#{n} pt",
             "pound": "#{n} lb",
             "pound-force": "#{n} lbf",
             "pound-force-foot": "#{n} lbf⋅ft",
             "pound-force-per-square-inch": "#{n} psi",
-            "quart": "#{n} qt",
-            "quart-imperial": "#{n} qt Imp.",
-            "quarter": "#{n} q",
+            "quart": "#{n} kuata",
+            "quart-imperial": "#{n} kuata emepaea",
+            "quarter": "#{n} hauwhā",
             "radian": "#{n} rad",
             "revolution": "#{n} rev",
-            "second": "#{n} s",
+            "second": "#{n} hēkona",
             "short-ton": "#{n} tn",
             "solar-luminosity": "#{n} L☉",
             "solar-mass": "#{n} M☉",
             "solar-radius": "#{n} R☉",
-            "square-centimeter": "#{n} cm²",
-            "square-foot": "#{n} ft²",
-            "square-inch": "#{n} in²",
-            "square-kilometer": "#{n} km²",
-            "square-meter": "#{n} m²",
-            "square-mile": "#{n} mi²",
-            "square-yard": "#{n} yd²",
+            "square-centimeter": "#{n} mitarau pūrua",
+            "square-foot": "#{n} pūtu pūrua",
+            "square-inch": "#{n} īnihi pūrua",
+            "square-kilometer": "#{n} ki te manomita pūrua",
+            "square-meter": "#{n} mita pūrua",
+            "square-mile": "#{n} māero pūrua",
+            "square-yard": "#{n} iari pūrua",
             "stone": "#{n} st",
-            "tablespoon": "#{n} tbsp",
-            "teaspoon": "#{n} tsp",
+            "tablespoon": "#{n} kokonui",
+            "teaspoon": "#{n} kokoiti",
             "terabit": "#{n} Tb",
-            "terabit-per-second": "#{n} Tb/s",
+            "terabit-per-second": "#{n} Tb i te hēkona",
             "terabyte": "#{n} TB",
-            "terabyte-per-hour": "#{n} TB/h",
-            "terabyte-per-second": "#{n} TB/s",
+            "terabyte-per-hour": "#{n} TB i te haora",
+            "terabyte-per-second": "#{n} TB i te hēkona",
             "therm-us": "#{n} US therm",
             "ton": "#{n} tn",
             "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
-            "week": "#{n} w",
-            "yard": "#{n} yd",
-            "year": "#{n} y"
+            "week": "#{n} wiki",
+            "yard": "#{n} iari",
+            "year": "#{n} tau"
         },
         "short": {
-            "acre": "#{n} ac",
+            "acre": "#{n} ek",
             "acre-foot": "#{n} ac ft",
             "ampere": "#{n} A",
             "arc-minute": "#{n}′",
@@ -211,7 +212,8 @@
             "astronomical-unit": "#{n} au",
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
-            "barrel": "#{n} bbl",
+            "barrel": "#{n} kāho",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -225,42 +227,42 @@
             "celsius": "#{n}°C",
             "centiliter": "#{n} cL",
             "centimeter": "#{n} cm",
-            "century": "#{n} c",
+            "century": "#{n} r",
             "coordinateUnit": "",
             "cubic-centimeter": "#{n} cm³",
-            "cubic-foot": "#{n} ft³",
+            "cubic-foot": "#{n} pūtu³",
             "cubic-inch": "#{n} in³",
             "cubic-kilometer": "#{n} km³",
             "cubic-meter": "#{n} m³",
             "cubic-mile": "#{n} mi³",
-            "cubic-yard": "#{n} yd³",
-            "cup": "#{n} c",
+            "cubic-yard": "#{n} iari³",
+            "cup": "#{n} k",
             "cup-metric": "#{n} mc",
             "dalton": "#{n} Da",
-            "day": "#{n} d",
-            "decade": "#{n} dec",
+            "day": "#{n} rā",
+            "decade": "#{n} nga",
             "deciliter": "#{n} dL",
             "decimeter": "#{n} dm",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon": "#{n} koko pūrini",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dram": "#{n} dram fl",
-            "drop": "#{n} drop",
+            "drop": "#{n} pata",
             "dunam": "#{n} dunam",
             "earth-mass": "#{n} M⊕",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "#{n} eV",
             "em": "#{n} em",
             "fahrenheit": "#{n}°F",
-            "fathom": "#{n} fth",
+            "fathom": "#{n} mārō",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foot": "#{n} ft",
-            "foot-per-second": "#{n} ft/s",
+            "foot": "#{n} pūtu",
+            "foot-per-second": "#{n} pūtu/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
-            "gallon": "#{n} gal US",
-            "gallon-imperial": "#{n} gal Imp.",
+            "gallon": "#{n} kārani",
+            "gallon-imperial": "#{n} kārani emepaea",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
             "gigabit-per-second": "#{n} Gb/s",
@@ -295,15 +297,15 @@
             "kilojoule": "#{n} kJ",
             "kilometer": "#{n} km",
             "kilometer-per-hour": "#{n} km/h",
-            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-liter": "#{n} km/rita",
             "kilometer-per-second": "#{n} km/s",
             "kilopascal": "#{n} kPa",
             "kilowatt": "#{n} kW",
             "kilowatt-hour": "#{n} kWh",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
             "knot": "#{n} kn",
-            "light-year": "#{n} ly",
-            "liter": "#{n} l",
+            "light-year": "#{n} tau aho",
+            "liter": "#{n} rita",
             "liter-per-100-kilometer": "#{n} L/100km",
             "liter-per-kilometer": "#{n} L/km",
             "lumen": "#{n} lm",
@@ -323,12 +325,12 @@
             "meter-per-square-second": "#{n} m/s²",
             "microgram": "#{n} μg",
             "micrometer": "#{n} μm",
-            "microsecond": "#{n} μs",
-            "mile": "#{n} mi",
+            "microsecond": "#{n} μhēk",
+            "mile": "#{n} māero",
             "mile-per-gallon": "#{n} mpg US",
             "mile-per-gallon-imperial": "#{n} mpg Imp.",
             "mile-per-hour": "#{n} mi/h",
-            "mile-per-second": "#{n} mi/s",
+            "mile-per-second": "#{n} māero/s",
             "mile-scandinavian": "#{n} smi",
             "milliampere": "#{n} mA",
             "millibar": "#{n} mbar",
@@ -338,13 +340,13 @@
             "millimeter": "#{n} mm",
             "millimeter-ofhg": "#{n} mm Hg",
             "millimole-per-liter": "#{n} mmol/L",
-            "millisecond": "#{n} ms",
+            "millisecond": "#{n} hm",
             "milliwatt": "#{n} mW",
-            "minute": "#{n} min",
+            "minute": "#{n} men",
             "mole": "#{n} mol",
             "month": "#{n} m",
             "nanometer": "#{n} nm",
-            "nanosecond": "#{n} ns",
+            "nanosecond": "#{n} nhēk",
             "nautical-mile": "#{n} nmi",
             "newton": "#{n} N",
             "newton-meter": "#{n} N⋅m",
@@ -359,7 +361,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
+            "pinch": "#{n} kini",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
@@ -371,25 +373,25 @@
             "pound-force-foot": "#{n} lbf⋅ft",
             "pound-force-per-square-inch": "#{n} psi",
             "quart": "#{n} qt",
-            "quart-imperial": "#{n} qt Imp.",
-            "quarter": "#{n} q",
+            "quart-imperial": "#{n} kuata emepaea",
+            "quarter": "#{n} hwh",
             "radian": "#{n} rad",
             "revolution": "#{n} rev",
-            "second": "#{n} s",
+            "second": "#{n} hēk",
             "short-ton": "#{n} tn",
             "solar-luminosity": "#{n} L☉",
             "solar-mass": "#{n} M☉",
             "solar-radius": "#{n} R☉",
             "square-centimeter": "#{n} cm²",
-            "square-foot": "#{n} ft²",
+            "square-foot": "#{n} pūtu²",
             "square-inch": "#{n} in²",
             "square-kilometer": "#{n} km²",
             "square-meter": "#{n} m²",
             "square-mile": "#{n} mi²",
-            "square-yard": "#{n} yd²",
+            "square-yard": "#{n} iari²",
             "stone": "#{n} st",
-            "tablespoon": "#{n} tbsp",
-            "teaspoon": "#{n} tsp",
+            "tablespoon": "#{n} kokonui",
+            "teaspoon": "#{n} kokoiti",
             "terabit": "#{n} Tb",
             "terabit-per-second": "#{n} Tb/s",
             "terabyte": "#{n} TB",
@@ -401,8 +403,8 @@
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} w",
-            "yard": "#{n} yd",
-            "year": "#{n} y"
+            "yard": "#{n} iari",
+            "year": "#{n} tau"
         }
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/mic/dateformats.json b/js/data/locale/mic/dateformats.json
new file mode 100644
index 0000000000..97a8977cbb
--- /dev/null
+++ b/js/data/locale/mic/dateformats.json
@@ -0,0 +1,133 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/mic/langname.jf b/js/data/locale/mic/langname.jf
index fa0b394d6a..8ed3a9b3ea 100644
--- a/js/data/locale/mic/langname.jf
+++ b/js/data/locale/mic/langname.jf
@@ -1,4 +1,4 @@
 {
     "generated": true,
-    "language.name": "Mi'kmaq"
+    "language.name": "Mi'kmaw"
 }
\ No newline at end of file
diff --git a/js/data/locale/mic/sysres.json b/js/data/locale/mic/sysres.json
new file mode 100644
index 0000000000..03ebba6582
--- /dev/null
+++ b/js/data/locale/mic/sysres.json
@@ -0,0 +1,142 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "EE0": "Sun",
+    "EE1": "Mon",
+    "EE2": "Tue",
+    "EE3": "Wed",
+    "EE4": "Thu",
+    "EE5": "Fri",
+    "EE6": "Sat",
+    "EEEE0": "Sun",
+    "EEEE1": "Mon",
+    "EEEE2": "Tue",
+    "EEEE3": "Wed",
+    "EEEE4": "Thu",
+    "EEEE5": "Fri",
+    "EEEE6": "Sat",
+    "MMM1": "M01",
+    "MMM10": "M10",
+    "MMM11": "M11",
+    "MMM12": "M12",
+    "MMM2": "M02",
+    "MMM3": "M03",
+    "MMM4": "M04",
+    "MMM5": "M05",
+    "MMM6": "M06",
+    "MMM7": "M07",
+    "MMM8": "M08",
+    "MMM9": "M09",
+    "MMMM1": "M01",
+    "MMMM10": "M10",
+    "MMMM11": "M11",
+    "MMMM12": "M12",
+    "MMMM2": "M02",
+    "MMMM3": "M03",
+    "MMMM4": "M04",
+    "MMMM5": "M05",
+    "MMMM6": "M06",
+    "MMMM7": "M07",
+    "MMMM8": "M08",
+    "MMMM9": "M09",
+    "N1": "M",
+    "N10": "M",
+    "N11": "M",
+    "N12": "M",
+    "N2": "M",
+    "N4": "M",
+    "N6": "M",
+    "N7": "M",
+    "N8": "M",
+    "N9": "M",
+    "NN1": "M0",
+    "NN10": "M1",
+    "NN11": "M1",
+    "NN12": "M1",
+    "NN2": "M0",
+    "NN3": "M0",
+    "NN4": "M0",
+    "NN5": "M0",
+    "NN6": "M0",
+    "NN7": "M0",
+    "NN8": "M0",
+    "NN9": "M0",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": ", ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/mic/unitfmt.json b/js/data/locale/mic/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/mic/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/mk/sysres.json b/js/data/locale/mk/sysres.json
index 2c88cc3f04..941c66d15e 100644
--- a/js/data/locale/mk/sysres.json
+++ b/js/data/locale/mk/sysres.json
@@ -106,7 +106,7 @@
     "G1": "н.е.",
     "MMM1": "јан.",
     "MMM10": "окт.",
-    "MMM11": "ноем.",
+    "MMM11": "ное.",
     "MMM12": "дек.",
     "MMM2": "фев.",
     "MMM3": "мар.",
@@ -115,7 +115,7 @@
     "MMM6": "јун.",
     "MMM7": "јул.",
     "MMM8": "авг.",
-    "MMM9": "септ.",
+    "MMM9": "сеп.",
     "MMMM1": "јануари",
     "MMMM10": "октомври",
     "MMMM11": "ноември",
diff --git a/js/data/locale/mk/unitfmt.json b/js/data/locale/mk/unitfmt.json
index 42609e874f..1b6e314e32 100644
--- a/js/data/locale/mk/unitfmt.json
+++ b/js/data/locale/mk/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} атмосфера|#{n} атмосфери",
             "bar": "one#{n} бар|#{n} бари",
             "barrel": "one#{n} барел|#{n} барели",
+            "beaufort": "one#{n} бофор|#{n} бофори",
             "bit": "one#{n} бит|#{n} бита",
             "bit-per-second": "#{n} бита во секунда",
             "british-thermal-unit": "one#{n} британска термална единица|#{n} британски термални единици",
@@ -43,15 +44,15 @@
             "dessert-spoon": "one#{n} лажица за десерт|#{n} лажици за десерт",
             "dessert-spoon-imperial": "one#{n} имп. лажица за десерт|#{n} имп. лажици за десерт",
             "dot": "one#{n} точка|#{n} точки",
-            "dot-per-centimeter": "one#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "one#{n} точка на сантиметар|#{n} точки на сантиметар",
+            "dot-per-inch": "one#{n} точка на инч|#{n} точки на инч",
             "dram": "one#{n} драм|#{n} драмови",
             "drop": "one#{n} капка|#{n} капки",
             "dunam": "one#{n} дунам|#{n} дунами",
             "earth-mass": "one#{n} земјина маса|#{n} земјини маси",
             "earth-radius": "one#{n} земјен радиус|#{n} земјени радиуси",
             "electronvolt": "one#{n} електронволт|#{n} електронволти",
-            "em": "#{n} em",
+            "em": "one#{n} ем|#{n} еми",
             "fahrenheit": "one#{n} фаренхајтов степен|#{n} фаренхајтови степени",
             "fathom": "one#{n} фатом|#{n} фатоми",
             "fluid-ounce": "one#{n} унца течност|#{n} унци течност",
@@ -76,7 +77,7 @@
             "hectare": "one#{n} хектар|#{n} хектари",
             "hectoliter": "one#{n} хектолитар|#{n} хектолитри",
             "hectopascal": "one#{n} хектопаскал|#{n} хектопаскали",
-            "hertz": "one#{n} херц|#{n} херци",
+            "hertz": "one#{n} херц|#{n} херца",
             "horsepower": "one#{n} коњска сила|#{n} коњски сили",
             "hour": "one#{n} час|#{n} часа",
             "inch": "one#{n} инч|#{n} инчи",
@@ -101,7 +102,7 @@
             "kilometer-per-second": "#{n} километри во секунда",
             "kilopascal": "one#{n} килопаскал|#{n} килопаскали",
             "kilowatt": "one#{n} киловат|#{n} киловати",
-            "kilowatt-hour": "one#{n} киловат-час|#{n} киловат-часови",
+            "kilowatt-hour": "one#{n} киловат-час|#{n} киловат-часа",
             "kilowatt-hour-per-100-kilometer": "one#{n} киловат-час на 100 километри|#{n} киловат-часа на 100 километри",
             "knot": "one#{n} јазол|#{n} јазли",
             "light-year": "one#{n} светлосна година|#{n} светлосни години",
@@ -118,7 +119,7 @@
             "megahertz": "one#{n} мегахерц|#{n} мегахерци",
             "megaliter": "one#{n} мегалитар|#{n} мегалитри",
             "megapascal": "one#{n} мегапаскал|#{n} мегапаскали",
-            "megapixel": "#{n} MP",
+            "megapixel": "one#{n} мегапиксел|#{n} мегапиксели",
             "megawatt": "one#{n} мегават|#{n} мегавати",
             "meter": "one#{n} метар|#{n} метри",
             "meter-per-second": "one#{n} метар во секунда|#{n} метри во секунда",
@@ -135,15 +136,15 @@
             "milliampere": "one#{n} милиампер|#{n} милиампери",
             "millibar": "one#{n} милибар|#{n} милибари",
             "milligram": "one#{n} милиграм|#{n} милиграми",
-            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milligram-ofglucose-per-deciliter": "one#{n} милиграм на децилитар|#{n} милиграми на децилитар",
             "milliliter": "one#{n} милилитар|#{n} милилитри",
             "millimeter": "one#{n} милиметар|#{n} милиметри",
             "millimeter-ofhg": "one#{n} милиметар жива|#{n} милиметри жива",
-            "millimole-per-liter": "#{n} mmol/L",
+            "millimole-per-liter": "one#{n} милимол на литар|#{n} милимоли на литар",
             "millisecond": "one#{n} милисекунда|#{n} милисекунди",
             "milliwatt": "one#{n} миливат|#{n} миливати",
             "minute": "one#{n} минута|#{n} минути",
-            "mole": "one#{n} мол|#{n} молови",
+            "mole": "one#{n} мол|#{n} мола",
             "month": "one#{n} месец|#{n} месеци",
             "nanometer": "one#{n} нанометар|#{n} нанометри",
             "nanosecond": "one#{n} наносекунда|#{n} наносекунди",
@@ -157,16 +158,16 @@
             "pascal": "one#{n} паскал|#{n} паскали",
             "percent": "one#{n} процент|#{n} проценти",
             "permille": "#{n} промили",
-            "permillion": "#{n} ppm",
+            "permillion": "one#{n} дел на милион|#{n} дела на милион",
             "permyriad": "one#{n} десетилјадити дел|#{n} десетилјадити делови",
             "petabyte": "one#{n} петабајт|#{n} петабајти",
             "picometer": "one#{n} пикометар|#{n} пикометри",
             "pinch": "one#{n} прстофат|#{n} прстофати",
             "pint": "one#{n} пинта|#{n} пинти",
             "pint-metric": "one#{n} метричка пинта|#{n} метрички пинти",
-            "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel": "one#{n} пиксел|#{n} пиксели",
+            "pixel-per-centimeter": "one#{n} пиксел на сантиметар|#{n} пиксели на сантиметар",
+            "pixel-per-inch": "one#{n} пиксел на инч|#{n} пиксели на инч",
             "point": "#{n} pt",
             "pound": "one#{n} фунта|#{n} фунти",
             "pound-force": "one#{n} фунта сила|#{n} фунти сила",
@@ -199,7 +200,7 @@
             "terabyte-per-second": "#{n} терабајти во секунда",
             "therm-us": "one#{n} US терм|#{n} US терми",
             "ton": "one#{n} американски тон|#{n} американски тони",
-            "tonne": "one#{n} тон|#{n} тони",
+            "tonne": "one#{n} тон|#{n} тона",
             "volt": "one#{n} волт|#{n} волти",
             "watt": "one#{n} ват|#{n} вати",
             "week": "one#{n} седмица|#{n} седмици",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/с",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +250,9 @@
             "degree": "#{n} deg",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "one#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|#{n} dpi",
+            "dot": "one#{n} dot|#{n} dots",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
diff --git a/js/data/locale/ml/ctrynames.json b/js/data/locale/ml/ctrynames.json
index dd151da2d6..55a0a36d97 100644
--- a/js/data/locale/ml/ctrynames.json
+++ b/js/data/locale/ml/ctrynames.json
@@ -87,7 +87,7 @@
     "ഗിനിയ-ബിസൗ": "GW",
     "ഗേൺസി": "GG",
     "ഗ്രനേഡ": "GD",
-    "ഗ്രീൻലാൻറ്": "GL",
+    "ഗ്രീൻലൻഡ്": "GL",
     "ഗ്രീസ്": "GR",
     "ഗ്വാട്ടിമാല": "GT",
     "ഗ്വാഡലൂപ്പ്": "GP",
@@ -146,7 +146,7 @@
     "നൗറു": "NR",
     "ന്യൂ കാലിഡോണിയ": "NC",
     "ന്യൂയി": "NU",
-    "ന്യൂസിലാൻറ്": "NZ",
+    "ന്യൂസിലൻഡ്": "NZ",
     "പനാമ": "PA",
     "പരാഗ്വേ": "PY",
     "പലാവു": "PW",
@@ -189,14 +189,14 @@
     "ബോസ്നിയയും ഹെർസഗോവിനയും": "BA",
     "ബൗവെട്ട് ദ്വീപ്": "BV",
     "ബ്രസീൽ": "BR",
-    "ബ്രിട്ടീഷ് ഇന്ത്യൻ മഹാസമുദ്ര പ്രദേശം": "IO",
+    "ബ്രിട്ടീഷ് ഇന്ത്യൻ ഓഷ്യൻ ടെറിട്ടറി": "IO",
     "ബ്രിട്ടീഷ് വെർജിൻ ദ്വീപുകൾ": "VG",
     "ബ്രൂണൈ": "BN",
     "ഭൂട്ടാൻ": "BT",
     "മക്കാവു SAR ചൈന": "MO",
     "മഡഗാസ്കർ": "MG",
-    "മദ്ധ്യഅമേരിക്ക": "013",
-    "മദ്ധ്യആഫ്രിക്ക": "017",
+    "മദ്ധ്യ അമേരിക്ക": "013",
+    "മദ്ധ്യ ആഫ്രിക്ക": "017",
     "മദ്ധ്യേഷ്യ": "143",
     "മംഗോളിയ": "MN",
     "മയോട്ടി": "YT",
@@ -285,8 +285,8 @@
     "സ്വിറ്റ്സർലാൻഡ്": "CH",
     "സ്വീഡൻ": "SE",
     "ഹംഗറി": "HU",
-    "ഹിയേർഡും മക്‌ഡൊണാൾഡ് ദ്വീപുകളും": "HM",
     "ഹെയ്തി": "HT",
+    "ഹേർഡ്, മക്ഡോണൾഡ് ദ്വീപുകൾ": "HM",
     "ഹോങ്കോങ് (SAR) ചൈന": "HK",
     "ഹോണ്ടുറാസ്": "HN",
     "റഷ്യ": "RU",
diff --git a/js/data/locale/ml/ctryreverse.json b/js/data/locale/ml/ctryreverse.json
index ecc137dae5..c11920f270 100644
--- a/js/data/locale/ml/ctryreverse.json
+++ b/js/data/locale/ml/ctryreverse.json
@@ -5,10 +5,10 @@
     "005": "തെക്കേ അമേരിക്ക",
     "009": "ഓഷ്യാനിയ",
     "011": "പശ്ചിമ ആഫ്രിക്ക",
-    "013": "മദ്ധ്യഅമേരിക്ക",
+    "013": "മദ്ധ്യ അമേരിക്ക",
     "014": "കിഴക്കൻ ആഫ്രിക്ക",
     "015": "ഉത്തരാഫ്രിക്ക",
-    "017": "മദ്ധ്യആഫ്രിക്ക",
+    "017": "മദ്ധ്യ ആഫ്രിക്ക",
     "018": "തെക്കേ ആഫ്രിക്ക",
     "019": "അമേരിക്കകൾ",
     "021": "വടക്കൻ അമേരിക്ക",
@@ -120,7 +120,7 @@
     "GG": "ഗേൺസി",
     "GH": "ഘാന",
     "GI": "ജിബ്രാൾട്ടർ",
-    "GL": "ഗ്രീൻലാൻറ്",
+    "GL": "ഗ്രീൻലൻഡ്",
     "GM": "ഗാംബിയ",
     "GN": "ഗിനിയ",
     "GP": "ഗ്വാഡലൂപ്പ്",
@@ -132,7 +132,7 @@
     "GW": "ഗിനിയ-ബിസൗ",
     "GY": "ഗയാന",
     "HK": "ഹോങ്കോങ് (SAR) ചൈന",
-    "HM": "ഹിയേർഡും മക്‌ഡൊണാൾഡ് ദ്വീപുകളും",
+    "HM": "ഹേർഡ്, മക്ഡോണൾഡ് ദ്വീപുകൾ",
     "HN": "ഹോണ്ടുറാസ്",
     "HR": "ക്രൊയേഷ്യ",
     "HT": "ഹെയ്തി",
@@ -143,7 +143,7 @@
     "IL": "ഇസ്രായേൽ",
     "IM": "ഐൽ ഓഫ് മാൻ",
     "IN": "ഇന്ത്യ",
-    "IO": "ബ്രിട്ടീഷ് ഇന്ത്യൻ മഹാസമുദ്ര പ്രദേശം",
+    "IO": "ബ്രിട്ടീഷ് ഇന്ത്യൻ ഓഷ്യൻ ടെറിട്ടറി",
     "IQ": "ഇറാഖ്",
     "IR": "ഇറാൻ",
     "IS": "ഐസ്‌ലാന്റ്",
@@ -208,7 +208,7 @@
     "NP": "നേപ്പാൾ",
     "NR": "നൗറു",
     "NU": "ന്യൂയി",
-    "NZ": "ന്യൂസിലാൻറ്",
+    "NZ": "ന്യൂസിലൻഡ്",
     "OM": "ഒമാൻ",
     "PA": "പനാമ",
     "PE": "പെറു",
diff --git a/js/data/locale/ml/list.json b/js/data/locale/ml/list.json
index 71f165d6b2..f0f7a3977d 100644
--- a/js/data/locale/ml/list.json
+++ b/js/data/locale/ml/list.json
@@ -31,17 +31,10 @@
             "end": "{0}, {1} എന്നിവ"
         },
         "short": {
-            "2": "{0}, {1} എന്നിവ",
             "end": "{0}, {1} എന്നിവ"
         }
     },
     "unit": {
-        "full": {
-            "2": "{0} കൂടാതെ {1}"
-        },
-        "long": {
-            "2": "{0} കൂടാതെ {1}"
-        },
         "short": {
             "end": "{0} {1}",
             "middle": "{0} {1}",
diff --git a/js/data/locale/ml/unitfmt.json b/js/data/locale/ml/unitfmt.json
index b031547f82..e1c0bddd39 100644
--- a/js/data/locale/ml/unitfmt.json
+++ b/js/data/locale/ml/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} അറ്റ്‌മോസ്‌ഫിയർ",
             "bar": "one#{n} ബാർ|#{n} ബാറുകൾ",
             "barrel": "#{n} ബാരൽ",
+            "beaufort": "#B {n}",
             "bit": "#{n} ബിറ്റ്",
             "bit-per-second": "#{n} ബിറ്റ് / സെക്കൻഡ്",
             "british-thermal-unit": "one#{n} ബ്രിട്ടീഷ് തെർമൽ യൂണിറ്റ്|#{n} ബ്രിട്ടീഷ് തെർമൽ യൂണിറ്റുകൾ",
@@ -42,16 +43,16 @@
             "degree": "#{n} ഡിഗ്രി",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "one#{n} ഡോട്ട്|#{n} px",
-            "dot-per-centimeter": "one#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "#{n} dpi",
+            "dot": "one#{n} ഡോട്ട്|#{n} ഡോട്ട്സ്",
+            "dot-per-centimeter": "one#{n} ഡോട്ട് പ൪ സെന്റിമീറ്റ൪|#{n} ഡോട്ട്സ് പ൪ സെന്റിമീറ്റ൪",
+            "dot-per-inch": "#{n} ഡോട്ട്സ് പ൪ ഇഞ്ച്",
             "dram": "#{n} dram",
             "drop": "one#{n} തുള്ളി|#{n} തുള്ളികൾ",
             "dunam": "one#{n} ദുനം|#{n} ദുനങ്ങൾ",
             "earth-mass": "#{n} ഭൂപിണ്ഡം",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "#{n} ഇലക്ട്രോൺവോൾട്ട്",
-            "em": "#{n} em",
+            "em": "one#{n} em|#{n} ems",
             "fahrenheit": "#{n} ഡിഗ്രി ഫാരൻഹീറ്റ്",
             "fathom": "#{n} ഫാതം",
             "fluid-ounce": "#{n} ഫ്ലൂയിഡ് ഔൺസ്",
@@ -61,16 +62,16 @@
             "foot-per-second": "#{n} അടി / സെക്കൻഡ്",
             "furlong": "#{n} ഫർലോങ്",
             "g-force": "#{n} ജി-ഫോഴ്‌സ്",
-            "gallon": "#{n} ഗാലൻ",
-            "gallon-imperial": "#{n} ഇംപീ. ഗാലൻ",
+            "gallon": "#{n} ഗാലൺ",
+            "gallon-imperial": "#{n} ഇംപീ. ഗാലൺ",
             "generic": "#{n}°",
             "gigabit": "#{n} ജിഗാബിറ്റ്",
             "gigabit-per-second": "#{n} ജിഗാബിറ്റ് / സെക്കൻഡ്",
-            "gigabyte": "#{n} ജിഗാബൈറ്റ്",
-            "gigabyte-per-hour": "#{n} ജിഗാബൈറ്റ് / മണിക്കൂർ",
-            "gigabyte-per-second": "#{n} ജിഗാബൈറ്റ് / സെക്കൻഡ്",
-            "gigahertz": "#{n} ജിഗാഹെർട്സ്",
-            "gigawatt": "#{n} ജിഗാവാട്ട്",
+            "gigabyte": "#{n} ഗിഗാബൈറ്റ്",
+            "gigabyte-per-hour": "#{n} ഗിഗാബൈറ്റ് / മണിക്കൂർ",
+            "gigabyte-per-second": "#{n} ഗിഗാബൈറ്റ് / സെക്കൻഡ്",
+            "gigahertz": "#{n} ഗിഗാഹെർട്സ്",
+            "gigawatt": "#{n} ഗിഗാവാട്ട്",
             "grain": "#{n} gr",
             "gram": "#{n} ഗ്രാം",
             "hectare": "#{n} ഹെക്‌ടർ",
@@ -102,7 +103,7 @@
             "kilopascal": "#{n} കിലോപാസ്കൽ",
             "kilowatt": "#{n} കിലോവാട്ട്",
             "kilowatt-hour": "#{n} കിലോവാട്ട്/മണിക്കൂർ",
-            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "kilowatt-hour-per-100-kilometer": "#{n} കിലോവാട്ട് മണിക്കൂ൪ പെ൪ 100 കിലോമീറ്റ൪",
             "knot": "#{n} നോട്ട്",
             "light-year": "#{n} പ്രകാശവർഷം",
             "liter": "#{n} ലിറ്റർ",
@@ -118,7 +119,7 @@
             "megahertz": "#{n} മെഗാഹെർട്സ്",
             "megaliter": "#{n} മെഗാലിറ്റർ",
             "megapascal": "one#{n} മെഗാപാസ്കൽ|#{n} മെഗാപാസ്കലുകൾ",
-            "megapixel": "#{n} MP",
+            "megapixel": "one#{n} മെഗാപിക്സൽ|#{n} മെഗാപിക്സൽസ്",
             "megawatt": "#{n} മെഗാവാട്ട്",
             "meter": "#{n} മീറ്റർ",
             "meter-per-second": "#{n} മീറ്റർ/സെക്കൻഡ്",
@@ -128,7 +129,7 @@
             "microsecond": "#{n} മൈക്രോസെക്കൻഡ്",
             "mile": "#{n} മൈൽ",
             "mile-per-gallon": "#{n} മൈൽ/ഗാലൻ",
-            "mile-per-gallon-imperial": "#{n} മൈൽ / ഇംപീ. ഗാലൻ",
+            "mile-per-gallon-imperial": "#{n} മൈൽ / ഇംപീ. ഗാലൺ",
             "mile-per-hour": "#{n} മൈൽ/മണിക്കൂർ",
             "mile-per-second": "#{n} മൈൽ / സെക്കൻഡ്",
             "mile-scandinavian": "#{n} സ്കാൻഡിനേവിയൻ മൈൽ",
@@ -158,15 +159,15 @@
             "percent": "#{n}%",
             "permille": "#{n} പ്രതിമില്ലി",
             "permillion": "one#പാർട്ട് / മില്ല്യൺ|#{n} പാർട്‌സ് / മില്ല്യൺ",
-            "permyriad": "#{n} പിരമിഡ്",
+            "permyriad": "#{n} പെ൪മിറിയാഡ്",
             "petabyte": "#{n} പെറ്റാബൈറ്റ്",
             "picometer": "#{n} പൈക്കോമീറ്റർ",
             "pinch": "#{n} നുള്ള്",
             "pint": "#{n} പൈന്റ്",
             "pint-metric": "#{n} മെട്രിക് പൈന്റ്",
-            "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel": "one#{n} പിക്സൽ|#{n} px",
+            "pixel-per-centimeter": "one#{n} പിക്സൽ പ൪ സെന്റിമീറ്റ൪|#{n} പിക്സൽസ് പ൪ സെന്റിമീറ്റ൪",
+            "pixel-per-inch": "one#{n} പിക്സൽ പ൪ ഇഞ്ച്|#{n} പിക്സൽസ് പ൪ ഇഞ്ച്",
             "point": "#{n} പോയിന്റ്",
             "pound": "#{n} പൗണ്ട്",
             "pound-force": "one#{n} പൗണ്ട് ഓഫ് ഫോഴ്സ്|#{n} പൗണ്ട്സ് ഓഫ് ഫോഴ്സ്",
@@ -179,7 +180,7 @@
             "revolution": "#{n} റെവല്യൂഷൻ",
             "second": "#{n} സെക്കൻഡ്",
             "short-ton": "#{n} ടൺ",
-            "solar-luminosity": "one#{n} സോളാർ ലുമിനോസിറ്റി|#{n} സോളാർ ലുമിനോസൈട്സ്",
+            "solar-luminosity": "one#{n} സോളാർ ലുമിനോസിറ്റി|#{n} സോളാർ ലുമിനോസിറ്റീസ്",
             "solar-mass": "#{n} സൂര്യപിണ്ഡം",
             "solar-radius": "#{n} R☉",
             "square-centimeter": "#{n} ചതുരശ്ര സെന്റിമീറ്റർ",
@@ -214,8 +215,9 @@
             "arc-second": "#{n} ആർക്ക്.സെ.",
             "astronomical-unit": "#{n} ജ്യോ.യൂ.",
             "atmosphere": "#{n} atm",
-            "bar": "one#{n} ബാർ|#{n} ബാറുകൾ",
+            "bar": "#{n} ബാർ",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} ബിറ്റ്",
             "bit-per-second": "#{n} ബിറ്റ്/സെ.",
             "british-thermal-unit": "#{n} Btu",
@@ -248,8 +250,8 @@
             "degree": "#{n} ഡിഗ്രി",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "one#{n} ppcm|#{n} dpcm",
+            "dot": "one#{n} ഡോട്ട്|#{n} ഡോട്ട്സ്",
+            "dot-per-centimeter": "one#{n}dpcm|#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
             "drop": "#{n} തുള്ളി",
@@ -275,8 +277,8 @@
             "gigabyte": "#{n} ജിബി",
             "gigabyte-per-hour": "#{n} ജിബി/മ.",
             "gigabyte-per-second": "#{n} ജിബി/സെ.",
-            "gigahertz": "#{n} ജി.ഹെ.",
-            "gigawatt": "#{n} ജി.വാ.",
+            "gigahertz": "#{n} ഗി.ഹെ.",
+            "gigawatt": "#{n} ഗി.വാ.",
             "grain": "#{n} gr",
             "gram": "#{n} ഗ്രാം",
             "hectare": "#{n} ഹെക്.",
diff --git a/js/data/locale/mn/Mong/MN/unitfmt.json b/js/data/locale/mn/Mong/MN/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mn/Mong/MN/unitfmt.json
+++ b/js/data/locale/mn/Mong/MN/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mn/Mong/unitfmt.json b/js/data/locale/mn/Mong/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mn/Mong/unitfmt.json
+++ b/js/data/locale/mn/Mong/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mn/unitfmt.json b/js/data/locale/mn/unitfmt.json
index e00e3ce5c9..f391a4fe48 100644
--- a/js/data/locale/mn/unitfmt.json
+++ b/js/data/locale/mn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} уур амьсгал",
             "bar": "#{n} бар",
             "barrel": "#{n} баррель",
+            "beaufort": "#B {n}",
             "bit": "#{n} бит",
             "bit-per-second": "#{n} бит/сек",
             "british-thermal-unit": "#{n} британийн дулааны нэгж",
@@ -44,7 +45,6 @@
             "dessert-spoon-imperial": "#{n} том амттаны халбага",
             "dot": "#{n} цэг",
             "dot-per-centimeter": "#{n} цэг/см",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} драм",
             "drop": "#{n} дусал",
             "dunam": "#{n} дунам",
@@ -216,6 +216,7 @@
             "atmosphere": "#{n} атм",
             "bar": "#{n} бар",
             "barrel": "#{n} баррель",
+            "beaufort": "#B {n}",
             "bit": "#{n} бит",
             "bit-per-second": "#{n} бит/сек",
             "british-thermal-unit": "#{n} Btu",
@@ -250,7 +251,6 @@
             "dessert-spoon-imperial": "#{n} том амт.х",
             "dot": "#{n} цэг",
             "dot-per-centimeter": "#{n} цэг/см",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} драм.ш",
             "drop": "#{n} дусал",
             "dunam": "#{n} дунам",
diff --git a/js/data/locale/mni/sysres.json b/js/data/locale/mni/sysres.json
index 400cd4d8ee..f8f0950710 100644
--- a/js/data/locale/mni/sysres.json
+++ b/js/data/locale/mni/sysres.json
@@ -143,7 +143,7 @@
     "LLLL7": "জুলাই",
     "LLLL8": "ওগষ্ট",
     "LLLL9": "সেপ্টেম্বর",
-    "MMM1": "জানুৱারি",
+    "MMM1": "জন",
     "MMM10": "ওক্টোবর",
     "MMM11": "নভেম্বর",
     "MMM12": "ডিসেম্বর",
@@ -153,9 +153,9 @@
     "MMM5": "মে",
     "MMM6": "জুন",
     "MMM7": "জুলাই",
-    "MMM8": "আগস্ট",
+    "MMM8": "ওগ",
     "MMM9": "সেপ্টেম্বর",
-    "MMMM1": "জানুৱারি",
+    "MMMM1": "জনুৱারী",
     "MMMM10": "ওক্টোবর",
     "MMMM11": "নভেম্বর",
     "MMMM12": "ডিসেম্বর",
@@ -165,7 +165,7 @@
     "MMMM5": "মে",
     "MMMM6": "জুন",
     "MMMM7": "জুলাই",
-    "MMMM8": "আগস্ট",
+    "MMMM8": "‌ওগষ্ট",
     "MMMM9": "সেপ্টেম্বর",
     "N1": "জ",
     "N10": "ও",
@@ -177,9 +177,9 @@
     "N5": "ম",
     "N6": "জ",
     "N7": "জ",
-    "N8": "আ",
+    "N8": "ও",
     "N9": "স",
-    "NN1": "জা",
+    "NN1": "জন",
     "NN10": "ওক",
     "NN11": "নভ",
     "NN12": "ডি",
@@ -189,7 +189,7 @@
     "NN5": "মে",
     "NN6": "জু",
     "NN7": "জু",
-    "NN8": "আগ",
+    "NN8": "ওগ",
     "NN9": "সে",
     "a0": "এ এম",
     "a1": "পি এম",
diff --git a/js/data/locale/mni/unitfmt.json b/js/data/locale/mni/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mni/unitfmt.json
+++ b/js/data/locale/mni/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/moh/unitfmt.json b/js/data/locale/moh/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/moh/unitfmt.json
+++ b/js/data/locale/moh/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mr/unitfmt.json b/js/data/locale/mr/unitfmt.json
index 3123ca490b..6c8f380048 100644
--- a/js/data/locale/mr/unitfmt.json
+++ b/js/data/locale/mr/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} वातावरण",
             "bar": "#{n} बार",
             "barrel": "#{n} बॅरल",
+            "beaufort": "#{n} ब्युफोर्ट",
             "bit": "#{n} बिट",
             "bit-per-second": "#{n} बिट प्रति सेकंद",
             "british-thermal-unit": "#{n} ब्रिटिश थर्मल युनिट",
@@ -42,9 +43,8 @@
             "degree": "#{n} अंश",
             "dessert-spoon": "#{n} डेझर्ट स्पून",
             "dessert-spoon-imperial": "#{n} इंपि. डेझर्ट स्पून",
-            "dot": "#{n}टिंब",
-            "dot-per-centimeter": "#{n} प्रति सेंटीमीटर बिंदू",
-            "dot-per-inch": "#{n} प्रति इंच बिंदू",
+            "dot-per-centimeter": "#प्रति सेंटिमीटर {n} पिक्सेल्स",
+            "dot-per-inch": "one#प्रति इंच {n} पिक्सेल|#प्रति इंच {n} पिक्सेल्स",
             "dram": "#{n} ड्रॅम",
             "drop": "#{n} पात",
             "dunam": "#{n} दुनाम",
@@ -216,6 +216,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} बार",
             "barrel": "#{n} bbl",
+            "beaufort": "one#{n} ब्यु|#B {n}",
             "bit": "#{n} बिट",
             "bit-per-second": "#{n} बिटप्रसे",
             "british-thermal-unit": "#{n} बिटीयू",
@@ -248,9 +249,7 @@
             "degree": "#{n} अंश",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} पि",
-            "dot-per-centimeter": "#{n} प्र सें बिं",
-            "dot-per-inch": "#{n} प्र इं बिं",
+            "dot-per-inch": "one#प्र इं {n} पि|#{n} प्र इं बिं",
             "dram": "#{n} dram fl",
             "drop": "#{n} पात",
             "dunam": "#{n} दुनाम",
diff --git a/js/data/locale/ms/Arab/BN/unitfmt.json b/js/data/locale/ms/Arab/BN/unitfmt.json
index e75a5e3654..6c3655743a 100644
--- a/js/data/locale/ms/Arab/BN/unitfmt.json
+++ b/js/data/locale/ms/Arab/BN/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ms/Arab/unitfmt.json b/js/data/locale/ms/Arab/unitfmt.json
index e75a5e3654..6c3655743a 100644
--- a/js/data/locale/ms/Arab/unitfmt.json
+++ b/js/data/locale/ms/Arab/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ms/unitfmt.json b/js/data/locale/ms/unitfmt.json
index 61be189b20..56a02fe16c 100644
--- a/js/data/locale/ms/unitfmt.json
+++ b/js/data/locale/ms/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfera",
             "bar": "#{n} bar",
             "barrel": "#{n} tong",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit sesaat",
             "british-thermal-unit": "#{n} unit terma British",
@@ -42,7 +43,7 @@
             "degree": "#{n} darjah",
             "dessert-spoon": "#{n} sudu desert",
             "dessert-spoon-imperial": "#{n} sudu desert Imp.",
-            "dot": "#{n} px",
+            "dot": "#{n} bintik",
             "dot-per-centimeter": "#{n} bintik sesentimeter",
             "dot-per-inch": "#{n} bintik seinci",
             "dram": "#{n} dram",
@@ -199,7 +200,7 @@
             "terabyte-per-second": "#{n} terabait sesaat",
             "therm-us": "#{n} terma US",
             "ton": "#{n} tan",
-            "tonne": "#{n} metrik tan",
+            "tonne": "#{n} tan metrik",
             "volt": "#{n} volt",
             "watt": "#{n} watt",
             "week": "#{n} minggu",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} utB",
@@ -248,7 +250,7 @@
             "degree": "#{n} darjah",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
+            "dot": "#{n} bintik",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
diff --git a/js/data/locale/mt/ctrynames.json b/js/data/locale/mt/ctrynames.json
index 7ad72ca579..f1e1faafc9 100644
--- a/js/data/locale/mt/ctrynames.json
+++ b/js/data/locale/mt/ctrynames.json
@@ -23,6 +23,7 @@
     "Awstralja u New Zealand": "053",
     "Barbados": "BB",
     "Bermuda": "BM",
+    "British Indian Ocean Territory": "IO",
     "Ċipru": "CY",
     "Cape Verde": "CV",
     "Ceuta u Melilla": "EA",
@@ -284,7 +285,6 @@
     "Spanja": "ES",
     "Sub-Saharan Africa": "202",
     "Svalbard u Jan Mayen": "SJ",
-    "Territorju Brittaniku tal-Oċean Indjan": "IO",
     "Timor Leste": "TL",
     "Tonga": "TO",
     "Trinidad u Tobago": "TT",
diff --git a/js/data/locale/mt/ctryreverse.json b/js/data/locale/mt/ctryreverse.json
index 5ddd885a37..43da0e923a 100644
--- a/js/data/locale/mt/ctryreverse.json
+++ b/js/data/locale/mt/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Iżrael",
     "IM": "Isle of Man",
     "IN": "l-Indja",
-    "IO": "Territorju Brittaniku tal-Oċean Indjan",
+    "IO": "British Indian Ocean Territory",
     "IQ": "l-Iraq",
     "IR": "l-Iran",
     "IS": "l-Iżlanda",
diff --git a/js/data/locale/mt/sysres.json b/js/data/locale/mt/sysres.json
index 9af41436d9..677117d58a 100644
--- a/js/data/locale/mt/sysres.json
+++ b/js/data/locale/mt/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#sa sek. oħra|two#sa {num} sek. oħra|few#sa {num} sek. oħra|many#sa {num}-il sek. oħra|#sa {num} sek. oħra",
     "#in {num}w": "one#sa ġimgħa oħra|two#sa ġimagħtejn oħra|few#sa {num} ġimgħat oħra|many#sa {num}-il ġimgħa oħra|#sa {num} ġimgħa oħra",
     "#in {num}y": "one#fi żmien sena|two#fi żmien sentejn oħra|few#fi żmien {num} snin oħra|many#fi żmien {num}-il sena oħra|#fi żmien {num} sena oħra",
-    "#{num} ms": "one#{num} ms|two#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "#{num} j",
     "#{num}d ago": "one#ġurnata ilu|two#jumejn ilu|few#{num} ġranet ilu|many#{num}-il ġurnata ilu|#{num} ġurnata ilu",
     "#{num}h": "#{num} s",
diff --git a/js/data/locale/mt/unitfmt.json b/js/data/locale/mt/unitfmt.json
index df13427978..2af8fde09e 100644
--- a/js/data/locale/mt/unitfmt.json
+++ b/js/data/locale/mt/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mua/ctrynames.json b/js/data/locale/mua/ctrynames.json
index c6eeefed36..74556e98a3 100644
--- a/js/data/locale/mua/ctrynames.json
+++ b/js/data/locale/mua/ctrynames.json
@@ -8,7 +8,6 @@
     "Americas": "019",
     "Amerika": "US",
     "andorra": "AD",
-    "anglofoŋ ma Indiya": "IO",
     "angola": "AO",
     "anguiya": "AI",
     "Antarctica": "AQ",
@@ -36,6 +35,7 @@
     "botswana": "BW",
     "Bouvet Island": "BV",
     "brazilya": "BR",
+    "British Indian Ocean Territory": "IO",
     "bruniya": "BN",
     "bulgariya": "BG",
     "burkina Faso": "BF",
diff --git a/js/data/locale/mua/ctryreverse.json b/js/data/locale/mua/ctryreverse.json
index b406b38823..f81723358e 100644
--- a/js/data/locale/mua/ctryreverse.json
+++ b/js/data/locale/mua/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Sǝr Israel",
     "IM": "Isle of Man",
     "IN": "Sǝr Indǝ",
-    "IO": "anglofoŋ ma Indiya",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iraŋ",
     "IS": "Sǝr Island",
diff --git a/js/data/locale/mua/unitfmt.json b/js/data/locale/mua/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/mua/unitfmt.json
+++ b/js/data/locale/mua/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mus/unitfmt.json b/js/data/locale/mus/unitfmt.json
index 5c015a19f0..e6c52864a0 100644
--- a/js/data/locale/mus/unitfmt.json
+++ b/js/data/locale/mus/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/my/list.json b/js/data/locale/my/list.json
index 4a3b25d6be..53480bd492 100644
--- a/js/data/locale/my/list.json
+++ b/js/data/locale/my/list.json
@@ -53,13 +53,13 @@
     },
     "unit": {
         "full": {
-            "2": "{0}နှင့်{1}",
+            "2": "{0}နှင့် {1}",
             "end": "{0}နှင့် {1}",
             "middle": "{0}- {1}",
             "start": "{0}- {1}"
         },
         "long": {
-            "2": "{0}နှင့်{1}",
+            "2": "{0}နှင့် {1}",
             "end": "{0}နှင့် {1}",
             "middle": "{0}- {1}",
             "start": "{0}- {1}"
@@ -67,8 +67,8 @@
         "medium": {
             "2": "{0}နှင့် {1}",
             "end": "{0}နှင့် {1}",
-            "middle": "{0}- {1}",
-            "start": "{0}- {1}"
+            "middle": "{0} - {1}",
+            "start": "{0} - {1}"
         },
         "short": {
             "2": "{0}နှင့် {1}",
diff --git a/js/data/locale/my/sysres.json b/js/data/locale/my/sysres.json
index 553e834126..a82477045a 100644
--- a/js/data/locale/my/sysres.json
+++ b/js/data/locale/my/sysres.json
@@ -194,6 +194,6 @@
     "finalSeparatorMedium": "နှင့် ",
     "finalSeparatorShort": "နှင့် ",
     "separatorFull": "- ",
-    "separatorLong": "- ",
-    "separatorMedium": "- "
+    "separatorLong": " - ",
+    "separatorMedium": " - "
 }
\ No newline at end of file
diff --git a/js/data/locale/my/unitfmt.json b/js/data/locale/my/unitfmt.json
index d6bea44798..2193048719 100644
--- a/js/data/locale/my/unitfmt.json
+++ b/js/data/locale/my/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} ကမ္ဘာ့လေထု",
             "bar": "#{n} ဘား",
             "barrel": "#{n} ဘယ်ရလ်စ်",
+            "beaufort": "#ဗျူးဖို့တ် {n}",
             "bit": "#{n} ဘစ်",
             "bit-per-second": "#တစ်စက္ကန့်လျှင် {n} ဘစ်",
             "british-thermal-unit": "#{n} ဗြိတိသျှ သာမယ်လ်ယူနစ်",
@@ -42,7 +43,7 @@
             "degree": "#{n} ဒီဂရီ",
             "dessert-spoon": "#အချိုပွဲဇွန်း {n} ဇွန်း",
             "dessert-spoon-imperial": "#ဗြိတိသျှသုံး အချိုပွဲဇွန်း {n} ဇွန်း",
-            "dot": "#{n} အစက်",
+            "dot": "#အစက် {n} စက်",
             "dot-per-centimeter": "#တစ်စင်တီမီတာလျှင် {n} စက်",
             "dot-per-inch": "#တစ်လက်မလျှင် {n} စက်",
             "dram": "#{n} ဒရမ်",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} ဘား",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -248,7 +250,7 @@
             "degree": "#{n} deg",
             "dessert-spoon": "#အချိုပွဲဇွန်း {n} ဇွန်း",
             "dessert-spoon-imperial": "#ဗြိတိသျှသုံးအချိုပွဲဇွန်း {n} ဇွန်း",
-            "dot": "#{n} px",
+            "dot": "",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} ဒရမ်",
diff --git a/js/data/locale/myv/unitfmt.json b/js/data/locale/myv/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/myv/unitfmt.json
+++ b/js/data/locale/myv/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/mzn/ctrynames.json b/js/data/locale/mzn/ctrynames.json
index dc64f1a168..905359b242 100644
--- a/js/data/locale/mzn/ctrynames.json
+++ b/js/data/locale/mzn/ctrynames.json
@@ -1,4 +1,5 @@
 {
+    "British Indian Ocean Territory": "IO",
     "Eurozone": "EZ",
     "North Macedonia": "MK",
     "Pseudo-Accents": "XA",
@@ -61,7 +62,6 @@
     "برمودا": "BM",
     "برونئی": "BN",
     "بریتانیا": "GB",
-    "بریتانیای هند ِاوقیانوس ِمناطق": "IO",
     "بریتانیای ویرجین": "VG",
     "بلاروس": "BY",
     "بلژیک": "BE",
diff --git a/js/data/locale/mzn/ctryreverse.json b/js/data/locale/mzn/ctryreverse.json
index 273ed25f81..742fd7c5b4 100644
--- a/js/data/locale/mzn/ctryreverse.json
+++ b/js/data/locale/mzn/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ایسراییل",
     "IM": "من ِجزیره",
     "IN": "هند",
-    "IO": "بریتانیای هند ِاوقیانوس ِمناطق",
+    "IO": "British Indian Ocean Territory",
     "IQ": "عراق",
     "IR": "ایران",
     "IS": "ایسلند",
diff --git a/js/data/locale/mzn/unitfmt.json b/js/data/locale/mzn/unitfmt.json
index c1d020c6e8..29e43b7f61 100644
--- a/js/data/locale/mzn/unitfmt.json
+++ b/js/data/locale/mzn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} بیت",
             "bit-per-second": "#{n} بیت ثانیه",
             "british-thermal-unit": "#{n} Btu",
@@ -53,7 +54,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} فلوید اونس",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} کالری",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft ثانیه",
             "furlong": "#{n} fur",
@@ -213,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} بیت",
             "bit-per-second": "#{n} بیت ثانیه",
             "british-thermal-unit": "#{n} Btu",
@@ -256,7 +257,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft ثانیه",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/naq/unitfmt.json b/js/data/locale/naq/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/naq/unitfmt.json
+++ b/js/data/locale/naq/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/nb/SJ/ctrynames.json b/js/data/locale/nb/SJ/ctrynames.json
index 71bf90ff31..6049b19d1d 100644
--- a/js/data/locale/nb/SJ/ctrynames.json
+++ b/js/data/locale/nb/SJ/ctrynames.json
@@ -23,6 +23,7 @@
     "Bahrain": "BH",
     "Bangladesh": "BD",
     "Barbados": "BB",
+    "Belarus": "BY",
     "Belgia": "BE",
     "Belize": "BZ",
     "Benin": "BJ",
@@ -100,7 +101,6 @@
     "Hellas": "GR",
     "Honduras": "HN",
     "Hongkong SAR Kina": "HK",
-    "Hviterussland": "BY",
     "India": "IN",
     "Indonesia": "ID",
     "Irak": "IQ",
diff --git a/js/data/locale/nb/SJ/ctryreverse.json b/js/data/locale/nb/SJ/ctryreverse.json
index ae77740a2d..38847d3569 100644
--- a/js/data/locale/nb/SJ/ctryreverse.json
+++ b/js/data/locale/nb/SJ/ctryreverse.json
@@ -66,7 +66,7 @@
     "BT": "Bhutan",
     "BV": "Bouvetøya",
     "BW": "Botswana",
-    "BY": "Hviterussland",
+    "BY": "Belarus",
     "BZ": "Belize",
     "CA": "Canada",
     "CC": "Kokosøyene",
diff --git a/js/data/locale/nb/ctrynames.json b/js/data/locale/nb/ctrynames.json
index 71bf90ff31..6049b19d1d 100644
--- a/js/data/locale/nb/ctrynames.json
+++ b/js/data/locale/nb/ctrynames.json
@@ -23,6 +23,7 @@
     "Bahrain": "BH",
     "Bangladesh": "BD",
     "Barbados": "BB",
+    "Belarus": "BY",
     "Belgia": "BE",
     "Belize": "BZ",
     "Benin": "BJ",
@@ -100,7 +101,6 @@
     "Hellas": "GR",
     "Honduras": "HN",
     "Hongkong SAR Kina": "HK",
-    "Hviterussland": "BY",
     "India": "IN",
     "Indonesia": "ID",
     "Irak": "IQ",
diff --git a/js/data/locale/nb/ctryreverse.json b/js/data/locale/nb/ctryreverse.json
index ae77740a2d..38847d3569 100644
--- a/js/data/locale/nb/ctryreverse.json
+++ b/js/data/locale/nb/ctryreverse.json
@@ -66,7 +66,7 @@
     "BT": "Bhutan",
     "BV": "Bouvetøya",
     "BW": "Botswana",
-    "BY": "Hviterussland",
+    "BY": "Belarus",
     "BZ": "Belize",
     "CA": "Canada",
     "CC": "Kokosøyene",
diff --git a/js/data/locale/nb/numfmt.jf b/js/data/locale/nb/numfmt.jf
index 9b657461cc..7dce5b03bb 100644
--- a/js/data/locale/nb/numfmt.jf
+++ b/js/data/locale/nb/numfmt.jf
@@ -2,7 +2,8 @@
     "generated": true,
     "numfmt": {
         "currencyFormats": {
-            "commonNegative": "{s} -{n}"
+            "common": "{n} {s}",
+            "commonNegative": "-{n} {s}"
         },
         "decimalChar": ",",
         "groupChar": " ",
diff --git a/js/data/locale/nb/sysres.json b/js/data/locale/nb/sysres.json
index 582d872639..1f8e491320 100644
--- a/js/data/locale/nb/sysres.json
+++ b/js/data/locale/nb/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#om {num} sek|#om {num} sek",
     "#in {num}w": "one#om {num} u.|#om {num} u.",
     "#in {num}y": "one#om {num} år|#om {num} år",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}d|#{num}d",
     "#{num}d ago": "one#for {num} d. siden|#for {num} d. siden",
     "#{num}h": "one#{num}t|#{num}t",
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#for {num} minutt siden|#for {num} minutter siden",
     "1#1 minute ago|#{num} minutes ago": "one#for {num} minutt siden|#for {num} minutter siden",
     "1#1 minute|#{num} minutes": "one#{num} minutt|#{num} minutter",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "one#for {num} måned siden|#for {num} måneder siden",
     "1#1 month ago|#{num} months ago": "one#for {num} måned siden|#for {num} måneder siden",
@@ -196,7 +196,7 @@
     "NN9": "se",
     "a0": "a.m.",
     "a1": "p.m.",
-    "durationLongDays": "one#{num} d|#{num} d",
+    "durationLongDays": "#{num} d",
     "durationMediumHours": "one#{num}t|#{num}t",
     "durationMediumMillis": "one#{num}ms|#{num}ms",
     "durationMediumWeeks": "one#{num}u|#{num}u",
diff --git a/js/data/locale/nb/unitfmt.json b/js/data/locale/nb/unitfmt.json
index 5d10aadf3a..fb0b4c9a4e 100644
--- a/js/data/locale/nb/unitfmt.json
+++ b/js/data/locale/nb/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfære|#{n} atmosfærer",
             "bar": "#{n} bar",
             "barrel": "#{n} fat",
+            "beaufort": "#beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit per sekund",
             "british-thermal-unit": "#{n} Btu",
@@ -56,7 +57,7 @@
             "fathom": "one#{n} favn|#{n} favner",
             "fluid-ounce": "one#{n} væskeunse|#{n} væskeunser",
             "fluid-ounce-imperial": "one#{n} britisk væskeunse|#{n} britiske væskeunser",
-            "foodcalorie": "one#{n} kalori|#{n} kalorier",
+            "foodcalorie": "one#{n} kilokalori|#{n} kilokalorier",
             "foot": "#{n} fot",
             "foot-per-second": "#{n} fot per sekund",
             "furlong": "#{n} furlong",
@@ -157,7 +158,7 @@
             "pascal": "#{n} pascal",
             "percent": "#{n} prosent",
             "permille": "#{n} promille",
-            "permillion": "one#{n} del per million|#{n} deler per million",
+            "permillion": "one#{n} milliondel|#{n} deler per million",
             "permyriad": "#{n} promyriade",
             "petabyte": "#{n} petabyte",
             "picometer": "#{n} pikometer",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} fat",
+            "beaufort": "#Bf {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,7 +251,6 @@
             "dessert-spoon": "#{n} bs",
             "dessert-spoon-imperial": "#{n} imp. bs",
             "dot": "#{n} pkt",
-            "dot-per-centimeter": "#{n} ppcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
             "drop": "#{n} dråpe",
@@ -262,7 +263,6 @@
             "fathom": "#{n} fm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} imp. fl oz",
-            "foodcalorie": "#{n} cal",
             "foot": "#{n} fot",
             "foot-per-second": "#{n} fot/s",
             "furlong": "#{n} fur",
@@ -405,7 +405,7 @@
             "terabyte-per-second": "#{n} TB/s",
             "therm-us": "#{n} therm",
             "ton": "#{n} am. tonn",
-            "tonne": "#{n} tonn",
+            "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} u",
diff --git a/js/data/locale/nd/unitfmt.json b/js/data/locale/nd/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/nd/unitfmt.json
+++ b/js/data/locale/nd/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/nds/NL/ctrynames.json b/js/data/locale/nds/NL/ctrynames.json
index 3cf0212256..cb11e86e07 100644
--- a/js/data/locale/nds/NL/ctrynames.json
+++ b/js/data/locale/nds/NL/ctrynames.json
@@ -76,6 +76,7 @@
     "Djibouti": "DJ",
     "Dominica": "DM",
     "Dominican Republic": "DO",
+    "Düütschland": "DE",
     "Eastern Africa": "014",
     "Eastern Asia": "030",
     "Eastern Europe": "151",
@@ -101,7 +102,6 @@
     "Gabon": "GA",
     "Gambia": "GM",
     "Georgia": "GE",
-    "Germany": "DE",
     "Ghana": "GH",
     "Gibraltar": "GI",
     "Greece": "GR",
@@ -175,8 +175,8 @@
     "Myanmar (Burma)": "MM",
     "Namibia": "NA",
     "Nauru": "NR",
+    "Nedderlannen": "NL",
     "Nepal": "NP",
-    "Netherlands": "NL",
     "New Caledonia": "NC",
     "New Zealand": "NZ",
     "Nicaragua": "NI",
@@ -218,6 +218,7 @@
     "Samoa": "WS",
     "San Marino": "SM",
     "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
     "Saudi Arabia": "SA",
     "Senegal": "SN",
     "Serbia": "RS",
@@ -265,7 +266,7 @@
     "Trinidad & Tobago": "TT",
     "Tristan da Cunha": "TA",
     "Tunisia": "TN",
-    "Turkey": "TR",
+    "Türkiye": "TR",
     "Turkmenistan": "TM",
     "Turks & Caicos Islands": "TC",
     "Tuvalu": "TV",
diff --git a/js/data/locale/nds/NL/ctryreverse.json b/js/data/locale/nds/NL/ctryreverse.json
index 1a338682b8..6ca0586b89 100644
--- a/js/data/locale/nds/NL/ctryreverse.json
+++ b/js/data/locale/nds/NL/ctryreverse.json
@@ -81,6 +81,7 @@
     "CN": "China",
     "CO": "Colombia",
     "CP": "Clipperton Island",
+    "CQ": "Sark",
     "CR": "Costa Rica",
     "CU": "Cuba",
     "CV": "Cape Verde",
@@ -88,7 +89,7 @@
     "CX": "Christmas Island",
     "CY": "Cyprus",
     "CZ": "Czechia",
-    "DE": "Germany",
+    "DE": "Düütschland",
     "DG": "Diego Garcia",
     "DJ": "Djibouti",
     "DK": "Denmark",
@@ -202,7 +203,7 @@
     "NF": "Norfolk Island",
     "NG": "Nigeria",
     "NI": "Nicaragua",
-    "NL": "Netherlands",
+    "NL": "Nedderlannen",
     "NO": "Norway",
     "NP": "Nepal",
     "NR": "Nauru",
@@ -263,7 +264,7 @@
     "TM": "Turkmenistan",
     "TN": "Tunisia",
     "TO": "Tonga",
-    "TR": "Turkey",
+    "TR": "Türkiye",
     "TT": "Trinidad & Tobago",
     "TV": "Tuvalu",
     "TW": "Taiwan",
diff --git a/js/data/locale/nds/ctrynames.json b/js/data/locale/nds/ctrynames.json
index 3cf0212256..cb11e86e07 100644
--- a/js/data/locale/nds/ctrynames.json
+++ b/js/data/locale/nds/ctrynames.json
@@ -76,6 +76,7 @@
     "Djibouti": "DJ",
     "Dominica": "DM",
     "Dominican Republic": "DO",
+    "Düütschland": "DE",
     "Eastern Africa": "014",
     "Eastern Asia": "030",
     "Eastern Europe": "151",
@@ -101,7 +102,6 @@
     "Gabon": "GA",
     "Gambia": "GM",
     "Georgia": "GE",
-    "Germany": "DE",
     "Ghana": "GH",
     "Gibraltar": "GI",
     "Greece": "GR",
@@ -175,8 +175,8 @@
     "Myanmar (Burma)": "MM",
     "Namibia": "NA",
     "Nauru": "NR",
+    "Nedderlannen": "NL",
     "Nepal": "NP",
-    "Netherlands": "NL",
     "New Caledonia": "NC",
     "New Zealand": "NZ",
     "Nicaragua": "NI",
@@ -218,6 +218,7 @@
     "Samoa": "WS",
     "San Marino": "SM",
     "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
     "Saudi Arabia": "SA",
     "Senegal": "SN",
     "Serbia": "RS",
@@ -265,7 +266,7 @@
     "Trinidad & Tobago": "TT",
     "Tristan da Cunha": "TA",
     "Tunisia": "TN",
-    "Turkey": "TR",
+    "Türkiye": "TR",
     "Turkmenistan": "TM",
     "Turks & Caicos Islands": "TC",
     "Tuvalu": "TV",
diff --git a/js/data/locale/nds/ctryreverse.json b/js/data/locale/nds/ctryreverse.json
index 1a338682b8..6ca0586b89 100644
--- a/js/data/locale/nds/ctryreverse.json
+++ b/js/data/locale/nds/ctryreverse.json
@@ -81,6 +81,7 @@
     "CN": "China",
     "CO": "Colombia",
     "CP": "Clipperton Island",
+    "CQ": "Sark",
     "CR": "Costa Rica",
     "CU": "Cuba",
     "CV": "Cape Verde",
@@ -88,7 +89,7 @@
     "CX": "Christmas Island",
     "CY": "Cyprus",
     "CZ": "Czechia",
-    "DE": "Germany",
+    "DE": "Düütschland",
     "DG": "Diego Garcia",
     "DJ": "Djibouti",
     "DK": "Denmark",
@@ -202,7 +203,7 @@
     "NF": "Norfolk Island",
     "NG": "Nigeria",
     "NI": "Nicaragua",
-    "NL": "Netherlands",
+    "NL": "Nedderlannen",
     "NO": "Norway",
     "NP": "Nepal",
     "NR": "Nauru",
@@ -263,7 +264,7 @@
     "TM": "Turkmenistan",
     "TN": "Tunisia",
     "TO": "Tonga",
-    "TR": "Turkey",
+    "TR": "Türkiye",
     "TT": "Trinidad & Tobago",
     "TV": "Tuvalu",
     "TW": "Taiwan",
diff --git a/js/data/locale/nds/delimiters.jf b/js/data/locale/nds/delimiters.jf
new file mode 100644
index 0000000000..7191437d1c
--- /dev/null
+++ b/js/data/locale/nds/delimiters.jf
@@ -0,0 +1,9 @@
+{
+    "delimiter": {
+        "alternateQuotationEnd": "‘",
+        "alternateQuotationStart": "‚",
+        "quotationEnd": "“",
+        "quotationStart": "„"
+    },
+    "generated": true
+}
\ No newline at end of file
diff --git a/js/data/locale/nds/numfmt.jf b/js/data/locale/nds/numfmt.jf
new file mode 100644
index 0000000000..e0612f33a8
--- /dev/null
+++ b/js/data/locale/nds/numfmt.jf
@@ -0,0 +1,13 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "common": "{n} {s}",
+            "commonNegative": "-{n} {s}"
+        },
+        "decimalChar": ",",
+        "groupChar": ".",
+        "negativepctFmt": "-{n} %",
+        "pctFmt": "{n} %"
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/nds/sysres.json b/js/data/locale/nds/sysres.json
index eea7ce7139..67e03938d4 100644
--- a/js/data/locale/nds/sysres.json
+++ b/js/data/locale/nds/sysres.json
@@ -65,66 +65,49 @@
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 year|#in {num} years": "#+{num} y",
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "EE0": "Sun",
-    "EE1": "Mon",
-    "EE2": "Tue",
-    "EE3": "Wed",
-    "EE4": "Thu",
-    "EE5": "Fri",
-    "EE6": "Sat",
-    "EEEE0": "Sun",
-    "EEEE1": "Mon",
-    "EEEE2": "Tue",
-    "EEEE3": "Wed",
-    "EEEE4": "Thu",
-    "EEEE5": "Fri",
-    "EEEE6": "Sat",
-    "MMM1": "M01",
-    "MMM10": "M10",
-    "MMM11": "M11",
-    "MMM12": "M12",
-    "MMM2": "M02",
-    "MMM3": "M03",
-    "MMM4": "M04",
-    "MMM5": "M05",
-    "MMM6": "M06",
-    "MMM7": "M07",
-    "MMM8": "M08",
-    "MMM9": "M09",
-    "MMMM1": "M01",
-    "MMMM10": "M10",
-    "MMMM11": "M11",
-    "MMMM12": "M12",
-    "MMMM2": "M02",
-    "MMMM3": "M03",
-    "MMMM4": "M04",
-    "MMMM5": "M05",
-    "MMMM6": "M06",
-    "MMMM7": "M07",
-    "MMMM8": "M08",
-    "MMMM9": "M09",
-    "N1": "M",
-    "N10": "M",
-    "N11": "M",
-    "N12": "M",
-    "N2": "M",
-    "N4": "M",
-    "N6": "M",
-    "N7": "M",
-    "N8": "M",
-    "N9": "M",
-    "NN1": "M0",
-    "NN10": "M1",
-    "NN11": "M1",
-    "NN12": "M1",
-    "NN2": "M0",
-    "NN3": "M0",
-    "NN4": "M0",
-    "NN5": "M0",
-    "NN6": "M0",
-    "NN7": "M0",
-    "NN8": "M0",
-    "NN9": "M0",
+    "EE0": "Sünndag",
+    "EE1": "Maandag",
+    "EE2": "Dingsdag",
+    "EE3": "Middeweken",
+    "EE4": "Dunnersdag",
+    "EE5": "Freedag",
+    "EE6": "Sünnavend",
+    "EEE0": "Sünndag",
+    "EEE1": "Maandag",
+    "EEE2": "Dingsdag",
+    "EEE3": "Middeweken",
+    "EEE4": "Dunnersdag",
+    "EEE5": "Freedag",
+    "EEE6": "Sünnavend",
+    "EEEE0": "Sünndag",
+    "EEEE1": "Maandag",
+    "EEEE2": "Dingsdag",
+    "EEEE3": "Middeweken",
+    "EEEE4": "Dunnersdag",
+    "EEEE5": "Freedag",
+    "EEEE6": "Sünnavend",
+    "MMM1": "Januaar",
+    "MMM10": "Oktover",
+    "MMM11": "November",
+    "MMM12": "Dezember",
+    "MMM2": "Februaar",
+    "MMM3": "März",
+    "MMM4": "April",
+    "MMM5": "Mai",
+    "MMM6": "Juni",
+    "MMM7": "Juli",
+    "MMM8": "August",
+    "MMM9": "September",
+    "MMMM1": "Januaar",
+    "MMMM10": "Oktover",
+    "MMMM12": "Dezember",
+    "MMMM2": "Februaar",
+    "MMMM3": "März",
+    "MMMM5": "Mai",
+    "MMMM6": "Juni",
+    "MMMM7": "Juli",
+    "NN10": "Ok",
+    "NN3": "Mä",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
     "durationMediumMillis": "#{num} ms",
diff --git a/js/data/locale/nds/unitfmt.json b/js/data/locale/nds/unitfmt.json
index 7d0aeece5d..7b458ca7f4 100644
--- a/js/data/locale/nds/unitfmt.json
+++ b/js/data/locale/nds/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ne/unitfmt.json b/js/data/locale/ne/unitfmt.json
index 9ff418b9c6..7b3b47d28e 100644
--- a/js/data/locale/ne/unitfmt.json
+++ b/js/data/locale/ne/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} वायुमण्डल|#{n} वायुमण्डलहरू",
             "bar": "#{n} धर्का",
             "barrel": "#{n} ब्यारल",
+            "beaufort": "#ब्यूफोर्ट {n}",
             "bit": "#{n}बिट",
             "bit-per-second": "#{n}बिट प्रति सेकेन्ड",
             "british-thermal-unit": "one#{n} बेलायती ताप एकाइ|#{n} बेलायती तापीय एकाइ",
@@ -81,7 +82,7 @@
             "hour": "#{n} घण्टा",
             "inch": "#{n}इन्च",
             "inch-ofhg": "#{n} इन्च पारो",
-            "item": "one#{n} वस्तु|#{n} वटा वस्तुहरू",
+            "item": "#{n} वस्तु",
             "jigger": "#{n} जिगर",
             "joule": "one#{n} जुल|#{n}जुल",
             "karat": "#{n}कराट",
@@ -135,7 +136,7 @@
             "milliampere": "#{n} मिलिएम्पियर",
             "millibar": "#{n} मिलिबार",
             "milligram": "#{n}मिलिग्राम",
-            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milligram-ofglucose-per-deciliter": "one#{n} mg/dL|#{n} मिलिग्राम पति डेेसिलिटर",
             "milliliter": "#{n}मिलिलिटर",
             "millimeter": "#{n} मिलिमिटर",
             "millimeter-ofhg": "#{n} मिलिमिटर पारो",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} वायु",
             "bar": "#{n} धर्का",
             "barrel": "#{n} ब्यारल",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/सेकेन्ड",
             "british-thermal-unit": "#{n} बेलाइती तापीय एकाइ",
@@ -249,8 +251,8 @@
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dot": "#{n} बिन्‍दु",
-            "dot-per-centimeter": "one#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "one#{n} ड्राम तरल|#{n} ड्राम fl",
             "drop": "#{n} थोपा",
             "dunam": "#{n} डुनाम",
diff --git a/js/data/locale/nl/BE/dateformats.json b/js/data/locale/nl/BE/dateformats.json
index 65bddcce53..aafd5a774e 100644
--- a/js/data/locale/nl/BE/dateformats.json
+++ b/js/data/locale/nl/BE/dateformats.json
@@ -25,16 +25,16 @@
         },
         "range": {
             "c00": {
-                "s": "{sd}/{sm}/{sy} {st} – {et}"
+                "s": "{sd}/{sm}/{sy}, {st} – {et}"
             },
             "c01": {
-                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c02": {
-                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c03": {
-                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c10": {
                 "s": "{sd} – {ed}/{em}/{ey}"
diff --git a/js/data/locale/nl/dateformats.json b/js/data/locale/nl/dateformats.json
index 844d9891f8..0ddfab0686 100644
--- a/js/data/locale/nl/dateformats.json
+++ b/js/data/locale/nl/dateformats.json
@@ -76,33 +76,33 @@
         "order": {
             "f": "{date} 'om' {time}",
             "l": "{date} 'om' {time}",
-            "m": "{date} {time}",
-            "s": "{date} {time}"
+            "m": "{date}, {time}",
+            "s": "{date}, {time}"
         },
         "range": {
             "c00": {
                 "f": "{sd} {sm} {sy} om {st} – {et}",
                 "l": "{sd} {sm} {sy} om {st} – {et}",
-                "m": "{sd} {sm} {sy} {st} – {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {et}"
+                "m": "{sd} {sm} {sy}, {st} – {et}",
+                "s": "{sd}-{sm}-{sy}, {st} – {et}"
             },
             "c01": {
                 "f": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
                 "l": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
-                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}"
             },
             "c02": {
                 "f": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
                 "l": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
-                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}"
             },
             "c03": {
                 "f": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
                 "l": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
-                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}"
             },
             "c10": {
                 "f": "{sd} – {ed} {em} {ey}",
diff --git a/js/data/locale/nl/list.json b/js/data/locale/nl/list.json
index 3f0afe9ff6..682086e88d 100644
--- a/js/data/locale/nl/list.json
+++ b/js/data/locale/nl/list.json
@@ -27,12 +27,8 @@
             "end": "{0} en {1}"
         },
         "medium": {
-            "2": "{0} en {1}",
-            "end": "{0} en {1}"
-        },
-        "short": {
-            "2": "{0} en {1}",
-            "end": "{0} en {1}"
+            "2": "{0} & {1}",
+            "end": "{0} & {1}"
         }
     },
     "unit": {
diff --git a/js/data/locale/nl/sysres.json b/js/data/locale/nl/sysres.json
index b4e6253c06..81d5c06c0a 100644
--- a/js/data/locale/nl/sysres.json
+++ b/js/data/locale/nl/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#over {num} sec.|#over {num} sec.",
     "#in {num}w": "one#over {num} week|#over {num} weken",
     "#in {num}y": "one#over {num} jaar|#over {num} jaar",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d|#{num} d",
     "#{num}d ago": "one#{num} dag geleden|#{num} dgn geleden",
     "#{num}h": "one#{num} u|#{num} u",
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#{num} minuut geleden|#{num} minuten geleden",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minuut geleden|#{num} minuten geleden",
     "1#1 minute|#{num} minutes": "one#{num} minuut|#{num} minuten",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num} m|#{num} m",
     "1#1 mon ago|#{num} mons ago": "one#{num} maand geleden|#{num} maanden geleden",
     "1#1 month ago|#{num} months ago": "one#{num} maand geleden|#{num} maanden geleden",
@@ -152,10 +152,10 @@
     "a1": "p.m.",
     "durationLongDays": "one#{num} dag|#{num} dagen",
     "durationMediumHours": "one#{num} u|#{num} u",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} w|#{num} w",
     "durationMediumYears": "one#{num} jr|#{num} jr",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} m|#{num} m",
     "durationShortMonths": "one#{num} m|#{num} m",
     "finalSeparatorFull": " en ",
diff --git a/js/data/locale/nl/unitfmt.json b/js/data/locale/nl/unitfmt.json
index 1bf8e58c33..9552ff80bb 100644
--- a/js/data/locale/nl/unitfmt.json
+++ b/js/data/locale/nl/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfeer",
             "bar": "#{n} bar",
             "barrel": "one#{n} barrel|#{n} barrels",
+            "beaufort": "#{n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits per seconde",
             "british-thermal-unit": "#{n} British thermal unit",
@@ -43,7 +44,7 @@
             "degree": "one#{n} booggraad|#{n} booggraden",
             "dessert-spoon": "one#{n} dessertlepel|#{n} dessertlepels",
             "dessert-spoon-imperial": "one#{n} imp. dessertlepel|#{n} imp. dessertlepels",
-            "dot": "one#dot|#{n} dot",
+            "dot": "one#{n} dot|#{n} dots",
             "dot-per-centimeter": "one#{n} dot per centimeter|#{n} dots per centimeter",
             "dot-per-inch": "one#{n} dot per inch|#{n} dots per inch",
             "dram": "#{n} drachme",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/sec",
             "british-thermal-unit": "#{n} Btu",
@@ -249,7 +251,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} des l",
             "dessert-spoon-imperial": "one#{n} imp. des l|#{n} imp. des lpls",
-            "dot": "#{n} px",
+            "dot": "one#{n} dot|#{n} dots",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} fl dr",
@@ -263,7 +265,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/sec",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/nmg/ctrynames.json b/js/data/locale/nmg/ctrynames.json
index d61093273d..e7238fa633 100644
--- a/js/data/locale/nmg/ctrynames.json
+++ b/js/data/locale/nmg/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brésil": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunɛi": "BN",
     "Bulgaria": "BG",
     "Burkina Faso": "BF",
@@ -181,7 +182,6 @@
     "Nlambɔ́ bó tschɛk": "CZ",
     "Nlambɔ́ Dominíka": "DO",
     "Nlambɔ́ Ngɛlɛn": "GB",
-    "Nlambɔ́ ngɛlɛn ma yí maŋ ntsiɛh": "IO",
     "North America": "003",
     "North Macedonia": "MK",
     "Northern Africa": "015",
diff --git a/js/data/locale/nmg/ctryreverse.json b/js/data/locale/nmg/ctryreverse.json
index 593acff427..f0090f53d9 100644
--- a/js/data/locale/nmg/ctryreverse.json
+++ b/js/data/locale/nmg/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Äsrɛl",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Nlambɔ́ ngɛlɛn ma yí maŋ ntsiɛh",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Island",
diff --git a/js/data/locale/nmg/unitfmt.json b/js/data/locale/nmg/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/nmg/unitfmt.json
+++ b/js/data/locale/nmg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/nn/ctrynames.json b/js/data/locale/nn/ctrynames.json
index e05291bdc1..ac9c244175 100644
--- a/js/data/locale/nn/ctrynames.json
+++ b/js/data/locale/nn/ctrynames.json
@@ -28,6 +28,7 @@
     "Bahrain": "BH",
     "Bangladesh": "BD",
     "Barbados": "BB",
+    "Belarus": "BY",
     "Belgia": "BE",
     "Belize": "BZ",
     "Benin": "BJ",
@@ -135,7 +136,6 @@
     "Kosovo": "XK",
     "Kroatia": "HR",
     "Kuwait": "KW",
-    "Kviterussland": "BY",
     "Kypros": "CY",
     "Laos": "LA",
     "Latin-Amerika": "419",
@@ -217,6 +217,7 @@
     "Saint-Martin": "MF",
     "Saint-Pierre-et-Miquelon": "PM",
     "Salomonøyane": "SB",
+    "Sameinte nasjonar": "UN",
     "Samoa": "WS",
     "San Marino": "SM",
     "São Tomé og Príncipe": "ST",
@@ -233,7 +234,6 @@
     "Sint Maarten": "SX",
     "Slovakia": "SK",
     "Slovenia": "SI",
-    "SN": "UN",
     "Somalia": "SO",
     "Spania": "ES",
     "Sri Lanka": "LK",
diff --git a/js/data/locale/nn/ctryreverse.json b/js/data/locale/nn/ctryreverse.json
index 82ccb34237..bac5e804ff 100644
--- a/js/data/locale/nn/ctryreverse.json
+++ b/js/data/locale/nn/ctryreverse.json
@@ -66,7 +66,7 @@
     "BT": "Bhutan",
     "BV": "Bouvetøya",
     "BW": "Botswana",
-    "BY": "Kviterussland",
+    "BY": "Belarus",
     "BZ": "Belize",
     "CA": "Canada",
     "CC": "Kokosøyane",
@@ -272,7 +272,7 @@
     "UA": "Ukraina",
     "UG": "Uganda",
     "UM": "USAs ytre småøyar",
-    "UN": "SN",
+    "UN": "Sameinte nasjonar",
     "US": "USA",
     "UY": "Uruguay",
     "UZ": "Usbekistan",
diff --git a/js/data/locale/nn/numfmt.jf b/js/data/locale/nn/numfmt.jf
index 646e27af72..7dce5b03bb 100644
--- a/js/data/locale/nn/numfmt.jf
+++ b/js/data/locale/nn/numfmt.jf
@@ -3,7 +3,7 @@
     "numfmt": {
         "currencyFormats": {
             "common": "{n} {s}",
-            "commonNegative": "−{n} {s}"
+            "commonNegative": "-{n} {s}"
         },
         "decimalChar": ",",
         "groupChar": " ",
diff --git a/js/data/locale/nn/sysres.json b/js/data/locale/nn/sysres.json
index 43e1258b33..3d129a9d43 100644
--- a/js/data/locale/nn/sysres.json
+++ b/js/data/locale/nn/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#om {num} sek|#om {num} sek",
     "#in {num}w": "one#om {num} v.|#om {num} v.",
     "#in {num}y": "one#om {num} år|#om {num} år",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}d|#{num}d",
     "#{num}d ago": "one#for {num} d. sidan|#for {num} d. sidan",
     "#{num}h": "one#{num}t|#{num}t",
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#for {num} minutt sidan|#for {num} minutt sidan",
     "1#1 minute ago|#{num} minutes ago": "one#for {num} minutt sidan|#for {num} minutt sidan",
     "1#1 minute|#{num} minutes": "one#{num} minutt|#{num} minutt",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "one#for {num} månad sidan|#for {num} månadar sidan",
     "1#1 month ago|#{num} months ago": "one#for {num} månad sidan|#for {num} månadar sidan",
@@ -67,11 +67,11 @@
     "1#in 1 yr|#in {num} yrs": "one#om {num} år|#om {num} år",
     "B0": "midnatt",
     "B1": "på natta",
-    "B2": "a.m.",
+    "B2": "f.m.",
     "B3": "på morgonen",
     "B4": "på formiddagen",
     "B5": "på ettermiddagen",
-    "B6": "p.m.",
+    "B6": "e.m.",
     "B7": "på kvelden",
     "E3": "O",
     "E6": "L",
@@ -194,8 +194,8 @@
     "NN7": "ju",
     "NN8": "au",
     "NN9": "se",
-    "a0": "a.m.",
-    "a1": "p.m.",
+    "a0": "f.m.",
+    "a1": "e.m.",
     "c0": "S",
     "c1": "M",
     "c2": "T",
@@ -224,7 +224,7 @@
     "cccc4": "torsdag",
     "cccc5": "fredag",
     "cccc6": "laurdag",
-    "durationLongDays": "one#{num} d|#{num} d",
+    "durationLongDays": "#{num} d",
     "durationMediumHours": "one#{num}t|#{num}t",
     "durationMediumMillis": "one#{num}ms|#{num}ms",
     "durationMediumWeeks": "one#{num}v|#{num}v",
diff --git a/js/data/locale/nn/unitfmt.json b/js/data/locale/nn/unitfmt.json
index 968d969d02..35e0b7ec2e 100644
--- a/js/data/locale/nn/unitfmt.json
+++ b/js/data/locale/nn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfære|#{n} atmosfærar",
             "bar": "#{n} bar",
             "barrel": "#{n} fat",
+            "beaufort": "#beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit per sekund",
             "british-thermal-unit": "one#{n} British thermal unit|#{n} British thermal units",
@@ -145,7 +146,7 @@
             "minute": "#{n} minutt",
             "mole": "#{n} mol",
             "month": "one#{n} månad|#{n} månadar",
-            "nanometer": "one#{n} nanometer|#{n} nm",
+            "nanometer": "#{n} nanometer",
             "nanosecond": "#{n} nanosekund",
             "nautical-mile": "one#{n} nautisk mil|#{n} nautiske mil",
             "newton": "#{n} newton",
@@ -157,7 +158,7 @@
             "pascal": "#{n} pascal",
             "percent": "#{n} prosent",
             "permille": "#{n} promille",
-            "permillion": "one#{n} del per million|#{n} milliondelar",
+            "permillion": "one#{n} milliondel|#{n} milliondelar",
             "permyriad": "#{n} promyriade",
             "petabyte": "#{n} petabyte",
             "picometer": "#{n} pikometer",
@@ -189,7 +190,7 @@
             "square-meter": "#{n} kvadratmeter",
             "square-mile": "one#{n} engelsk kvadratmil|#{n} engelske kvadratmil",
             "square-yard": "#{n} kvadratyard",
-            "stone": "one#{n} engelsk stone|#{n} engelske stones",
+            "stone": "#{n} stone",
             "tablespoon": "one#{n} matskei|#{n} matskeier",
             "teaspoon": "one#{n} teskei|#{n} teskeier",
             "terabit": "#{n} terabit",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} fat",
+            "beaufort": "#Bf {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,7 +251,6 @@
             "dessert-spoon": "#{n} dsskei",
             "dessert-spoon-imperial": "one#{n} brit. dsskei|#{n} imp. bs",
             "dot": "#{n} pkt",
-            "dot-per-centimeter": "one#{n} dpcm|#{n} ppcm",
             "dot-per-inch": "#{n} ppt",
             "dram": "#{n} dram fl",
             "drop": "#{n} drope",
@@ -395,8 +396,8 @@
             "square-meter": "#{n} m²",
             "square-mile": "#{n} mi²",
             "square-yard": "#{n} yd²",
-            "stone": "#{n} eng. st.",
-            "tablespoon": "#{n} ss",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} ms",
             "teaspoon": "#{n} ts",
             "terabit": "#{n} Tb",
             "terabit-per-second": "#{n} Tb/s",
@@ -405,7 +406,7 @@
             "terabyte-per-second": "#{n} TB/s",
             "therm-us": "#{n} therm",
             "ton": "#{n} am. tonn",
-            "tonne": "#{n} tonn",
+            "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} v",
diff --git a/js/data/locale/nnh/unitfmt.json b/js/data/locale/nnh/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/nnh/unitfmt.json
+++ b/js/data/locale/nnh/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/no/ctrynames.json b/js/data/locale/no/ctrynames.json
index 71bf90ff31..6049b19d1d 100644
--- a/js/data/locale/no/ctrynames.json
+++ b/js/data/locale/no/ctrynames.json
@@ -23,6 +23,7 @@
     "Bahrain": "BH",
     "Bangladesh": "BD",
     "Barbados": "BB",
+    "Belarus": "BY",
     "Belgia": "BE",
     "Belize": "BZ",
     "Benin": "BJ",
@@ -100,7 +101,6 @@
     "Hellas": "GR",
     "Honduras": "HN",
     "Hongkong SAR Kina": "HK",
-    "Hviterussland": "BY",
     "India": "IN",
     "Indonesia": "ID",
     "Irak": "IQ",
diff --git a/js/data/locale/no/ctryreverse.json b/js/data/locale/no/ctryreverse.json
index ae77740a2d..38847d3569 100644
--- a/js/data/locale/no/ctryreverse.json
+++ b/js/data/locale/no/ctryreverse.json
@@ -66,7 +66,7 @@
     "BT": "Bhutan",
     "BV": "Bouvetøya",
     "BW": "Botswana",
-    "BY": "Hviterussland",
+    "BY": "Belarus",
     "BZ": "Belize",
     "CA": "Canada",
     "CC": "Kokosøyene",
diff --git a/js/data/locale/no/numfmt.jf b/js/data/locale/no/numfmt.jf
index 9b657461cc..7dce5b03bb 100644
--- a/js/data/locale/no/numfmt.jf
+++ b/js/data/locale/no/numfmt.jf
@@ -2,7 +2,8 @@
     "generated": true,
     "numfmt": {
         "currencyFormats": {
-            "commonNegative": "{s} -{n}"
+            "common": "{n} {s}",
+            "commonNegative": "-{n} {s}"
         },
         "decimalChar": ",",
         "groupChar": " ",
diff --git a/js/data/locale/no/sysres.json b/js/data/locale/no/sysres.json
index 582d872639..1f8e491320 100644
--- a/js/data/locale/no/sysres.json
+++ b/js/data/locale/no/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#om {num} sek|#om {num} sek",
     "#in {num}w": "one#om {num} u.|#om {num} u.",
     "#in {num}y": "one#om {num} år|#om {num} år",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}d|#{num}d",
     "#{num}d ago": "one#for {num} d. siden|#for {num} d. siden",
     "#{num}h": "one#{num}t|#{num}t",
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#for {num} minutt siden|#for {num} minutter siden",
     "1#1 minute ago|#{num} minutes ago": "one#for {num} minutt siden|#for {num} minutter siden",
     "1#1 minute|#{num} minutes": "one#{num} minutt|#{num} minutter",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "one#for {num} måned siden|#for {num} måneder siden",
     "1#1 month ago|#{num} months ago": "one#for {num} måned siden|#for {num} måneder siden",
@@ -196,7 +196,7 @@
     "NN9": "se",
     "a0": "a.m.",
     "a1": "p.m.",
-    "durationLongDays": "one#{num} d|#{num} d",
+    "durationLongDays": "#{num} d",
     "durationMediumHours": "one#{num}t|#{num}t",
     "durationMediumMillis": "one#{num}ms|#{num}ms",
     "durationMediumWeeks": "one#{num}u|#{num}u",
diff --git a/js/data/locale/no/unitfmt.json b/js/data/locale/no/unitfmt.json
index 5d10aadf3a..fb0b4c9a4e 100644
--- a/js/data/locale/no/unitfmt.json
+++ b/js/data/locale/no/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfære|#{n} atmosfærer",
             "bar": "#{n} bar",
             "barrel": "#{n} fat",
+            "beaufort": "#beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit per sekund",
             "british-thermal-unit": "#{n} Btu",
@@ -56,7 +57,7 @@
             "fathom": "one#{n} favn|#{n} favner",
             "fluid-ounce": "one#{n} væskeunse|#{n} væskeunser",
             "fluid-ounce-imperial": "one#{n} britisk væskeunse|#{n} britiske væskeunser",
-            "foodcalorie": "one#{n} kalori|#{n} kalorier",
+            "foodcalorie": "one#{n} kilokalori|#{n} kilokalorier",
             "foot": "#{n} fot",
             "foot-per-second": "#{n} fot per sekund",
             "furlong": "#{n} furlong",
@@ -157,7 +158,7 @@
             "pascal": "#{n} pascal",
             "percent": "#{n} prosent",
             "permille": "#{n} promille",
-            "permillion": "one#{n} del per million|#{n} deler per million",
+            "permillion": "one#{n} milliondel|#{n} deler per million",
             "permyriad": "#{n} promyriade",
             "petabyte": "#{n} petabyte",
             "picometer": "#{n} pikometer",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} fat",
+            "beaufort": "#Bf {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,7 +251,6 @@
             "dessert-spoon": "#{n} bs",
             "dessert-spoon-imperial": "#{n} imp. bs",
             "dot": "#{n} pkt",
-            "dot-per-centimeter": "#{n} ppcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
             "drop": "#{n} dråpe",
@@ -262,7 +263,6 @@
             "fathom": "#{n} fm",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} imp. fl oz",
-            "foodcalorie": "#{n} cal",
             "foot": "#{n} fot",
             "foot-per-second": "#{n} fot/s",
             "furlong": "#{n} fur",
@@ -405,7 +405,7 @@
             "terabyte-per-second": "#{n} TB/s",
             "therm-us": "#{n} therm",
             "ton": "#{n} am. tonn",
-            "tonne": "#{n} tonn",
+            "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} u",
diff --git a/js/data/locale/nqo/unitfmt.json b/js/data/locale/nqo/unitfmt.json
index 2481de1c08..4daed45779 100644
--- a/js/data/locale/nqo/unitfmt.json
+++ b/js/data/locale/nqo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/ߝ",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/ߝ",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/nr/unitfmt.json b/js/data/locale/nr/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/nr/unitfmt.json
+++ b/js/data/locale/nr/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/nso/unitfmt.json b/js/data/locale/nso/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/nso/unitfmt.json
+++ b/js/data/locale/nso/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/nus/ctrynames.json b/js/data/locale/nus/ctrynames.json
index 552d3d0ab8..b95d7be38d 100644
--- a/js/data/locale/nus/ctrynames.json
+++ b/js/data/locale/nus/ctrynames.json
@@ -33,13 +33,13 @@
     "Bothiwaana": "BW",
     "Bothnia kɛnɛ ɣärgobinia": "BA",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bulga̱a̱ria": "BG",
     "Bulibia": "BO",
     "Burkinɛ pa̱thu": "BF",
     "Burundi": "BI",
     "Burunɛy": "BN",
     "Burutic dhuɔ̱ɔ̱l be̱rgin": "VG",
-    "Burutic ɣe̱ndian oce̱n": "IO",
     "Buta̱n": "BT",
     "Ca̱d": "TD",
     "Canary Islands": "IC",
diff --git a/js/data/locale/nus/ctryreverse.json b/js/data/locale/nus/ctryreverse.json
index aa0333e417..10727f3e4e 100644
--- a/js/data/locale/nus/ctryreverse.json
+++ b/js/data/locale/nus/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Burutic ɣe̱ndian oce̱n",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraq",
     "IR": "Iran",
     "IS": "Iceland",
diff --git a/js/data/locale/nus/unitfmt.json b/js/data/locale/nus/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/nus/unitfmt.json
+++ b/js/data/locale/nus/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/nv/unitfmt.json b/js/data/locale/nv/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/nv/unitfmt.json
+++ b/js/data/locale/nv/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ny/unitfmt.json b/js/data/locale/ny/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ny/unitfmt.json
+++ b/js/data/locale/ny/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/nyn/ctrynames.json b/js/data/locale/nyn/ctrynames.json
index 286495555b..19609eab4a 100644
--- a/js/data/locale/nyn/ctrynames.json
+++ b/js/data/locale/nyn/ctrynames.json
@@ -34,6 +34,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Boziniya na Hezegovina": "BA",
+    "British Indian Ocean Territory": "IO",
     "Bubirigi": "BE",
     "Bufaransa": "FR",
     "Bufini": "FI",
@@ -70,7 +71,6 @@
     "Ebizinga by’amatemba ga Mariana": "MP",
     "Ebizinga bya Buturuki na Kaiko": "TC",
     "Ebizinga bya Faakilanda": "FK",
-    "Ebizinga bya Indian ebya Bungyereza": "IO",
     "Ebizinga bya Kayimani": "KY",
     "Ebizinga bya Kepuvade": "CV",
     "Ebizinga bya Kuuku": "CK",
diff --git a/js/data/locale/nyn/ctryreverse.json b/js/data/locale/nyn/ctryreverse.json
index ddb80323a9..d8482f202b 100644
--- a/js/data/locale/nyn/ctryreverse.json
+++ b/js/data/locale/nyn/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirairi",
     "IM": "Isle of Man",
     "IN": "Indiya",
-    "IO": "Ebizinga bya Indian ebya Bungyereza",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraaka",
     "IR": "Iraani",
     "IS": "Aisilandi",
diff --git a/js/data/locale/nyn/unitfmt.json b/js/data/locale/nyn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/nyn/unitfmt.json
+++ b/js/data/locale/nyn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/oc/ES/ctrynames.json b/js/data/locale/oc/ES/ctrynames.json
index f25bd2c7cc..ad31391099 100644
--- a/js/data/locale/oc/ES/ctrynames.json
+++ b/js/data/locale/oc/ES/ctrynames.json
@@ -84,6 +84,7 @@
     "El Salvador": "SV",
     "Equatorial Guinea": "GQ",
     "Eritrea": "ER",
+    "Espanha": "ES",
     "Estonia": "EE",
     "Eswatini": "SZ",
     "Ethiopia": "ET",
@@ -94,7 +95,7 @@
     "Faroe Islands": "FO",
     "Fiji": "FJ",
     "Finland": "FI",
-    "France": "FR",
+    "França": "FR",
     "French Guiana": "GF",
     "French Polynesia": "PF",
     "French Southern Territories": "TF",
@@ -239,7 +240,6 @@
     "Southern Africa": "018",
     "Southern Asia": "034",
     "Southern Europe": "039",
-    "Spain": "ES",
     "Sri Lanka": "LK",
     "St. Barthélemy": "BL",
     "St. Helena": "SH",
diff --git a/js/data/locale/oc/ES/ctryreverse.json b/js/data/locale/oc/ES/ctryreverse.json
index f82efb1015..3ea28646fe 100644
--- a/js/data/locale/oc/ES/ctryreverse.json
+++ b/js/data/locale/oc/ES/ctryreverse.json
@@ -102,7 +102,7 @@
     "EG": "Egypt",
     "EH": "Western Sahara",
     "ER": "Eritrea",
-    "ES": "Spain",
+    "ES": "Espanha",
     "ET": "Ethiopia",
     "EU": "European Union",
     "EZ": "Eurozone",
@@ -111,7 +111,7 @@
     "FK": "Falkland Islands",
     "FM": "Micronesia",
     "FO": "Faroe Islands",
-    "FR": "France",
+    "FR": "França",
     "GA": "Gabon",
     "GB": "United Kingdom",
     "GD": "Grenada",
diff --git a/js/data/locale/oc/ctrynames.json b/js/data/locale/oc/ctrynames.json
index f25bd2c7cc..ad31391099 100644
--- a/js/data/locale/oc/ctrynames.json
+++ b/js/data/locale/oc/ctrynames.json
@@ -84,6 +84,7 @@
     "El Salvador": "SV",
     "Equatorial Guinea": "GQ",
     "Eritrea": "ER",
+    "Espanha": "ES",
     "Estonia": "EE",
     "Eswatini": "SZ",
     "Ethiopia": "ET",
@@ -94,7 +95,7 @@
     "Faroe Islands": "FO",
     "Fiji": "FJ",
     "Finland": "FI",
-    "France": "FR",
+    "França": "FR",
     "French Guiana": "GF",
     "French Polynesia": "PF",
     "French Southern Territories": "TF",
@@ -239,7 +240,6 @@
     "Southern Africa": "018",
     "Southern Asia": "034",
     "Southern Europe": "039",
-    "Spain": "ES",
     "Sri Lanka": "LK",
     "St. Barthélemy": "BL",
     "St. Helena": "SH",
diff --git a/js/data/locale/oc/ctryreverse.json b/js/data/locale/oc/ctryreverse.json
index f82efb1015..3ea28646fe 100644
--- a/js/data/locale/oc/ctryreverse.json
+++ b/js/data/locale/oc/ctryreverse.json
@@ -102,7 +102,7 @@
     "EG": "Egypt",
     "EH": "Western Sahara",
     "ER": "Eritrea",
-    "ES": "Spain",
+    "ES": "Espanha",
     "ET": "Ethiopia",
     "EU": "European Union",
     "EZ": "Eurozone",
@@ -111,7 +111,7 @@
     "FK": "Falkland Islands",
     "FM": "Micronesia",
     "FO": "Faroe Islands",
-    "FR": "France",
+    "FR": "França",
     "GA": "Gabon",
     "GB": "United Kingdom",
     "GD": "Grenada",
diff --git a/js/data/locale/oc/delimiters.jf b/js/data/locale/oc/delimiters.jf
new file mode 100644
index 0000000000..5d8bcca910
--- /dev/null
+++ b/js/data/locale/oc/delimiters.jf
@@ -0,0 +1,9 @@
+{
+    "delimiter": {
+        "alternateQuotationEnd": "»",
+        "alternateQuotationStart": "«",
+        "quotationEnd": "»",
+        "quotationStart": "«"
+    },
+    "generated": true
+}
\ No newline at end of file
diff --git a/js/data/locale/oc/numfmt.jf b/js/data/locale/oc/numfmt.jf
new file mode 100644
index 0000000000..432aa94ec5
--- /dev/null
+++ b/js/data/locale/oc/numfmt.jf
@@ -0,0 +1,13 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "common": "{n}{s}",
+            "commonNegative": "-{n}{s}"
+        },
+        "decimalChar": ",",
+        "groupChar": " ",
+        "negativepctFmt": "-{n} %",
+        "pctFmt": "{n} %"
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/oc/sysres.json b/js/data/locale/oc/sysres.json
index 84f6d7a63b..af31c1ad24 100644
--- a/js/data/locale/oc/sysres.json
+++ b/js/data/locale/oc/sysres.json
@@ -65,66 +65,75 @@
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 year|#in {num} years": "#+{num} y",
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "EE0": "Sun",
-    "EE1": "Mon",
-    "EE2": "Tue",
-    "EE3": "Wed",
-    "EE4": "Thu",
-    "EE5": "Fri",
-    "EE6": "Sat",
-    "EEEE0": "Sun",
-    "EEEE1": "Mon",
-    "EEEE2": "Tue",
-    "EEEE3": "Wed",
-    "EEEE4": "Thu",
-    "EEEE5": "Fri",
-    "EEEE6": "Sat",
-    "MMM1": "M01",
-    "MMM10": "M10",
-    "MMM11": "M11",
-    "MMM12": "M12",
-    "MMM2": "M02",
-    "MMM3": "M03",
-    "MMM4": "M04",
-    "MMM5": "M05",
-    "MMM6": "M06",
-    "MMM7": "M07",
-    "MMM8": "M08",
-    "MMM9": "M09",
-    "MMMM1": "M01",
-    "MMMM10": "M10",
-    "MMMM11": "M11",
-    "MMMM12": "M12",
-    "MMMM2": "M02",
-    "MMMM3": "M03",
-    "MMMM4": "M04",
-    "MMMM5": "M05",
-    "MMMM6": "M06",
-    "MMMM7": "M07",
-    "MMMM8": "M08",
-    "MMMM9": "M09",
-    "N1": "M",
-    "N10": "M",
-    "N11": "M",
-    "N12": "M",
-    "N2": "M",
-    "N4": "M",
-    "N6": "M",
-    "N7": "M",
-    "N8": "M",
-    "N9": "M",
-    "NN1": "M0",
-    "NN10": "M1",
-    "NN11": "M1",
-    "NN12": "M1",
-    "NN2": "M0",
-    "NN3": "M0",
-    "NN4": "M0",
-    "NN5": "M0",
-    "NN6": "M0",
-    "NN7": "M0",
-    "NN8": "M0",
-    "NN9": "M0",
+    "EE0": "dimenge",
+    "EE1": "diluns",
+    "EE2": "dimars",
+    "EE3": "dimècres",
+    "EE4": "dijòus",
+    "EE5": "divendres",
+    "EE6": "dissabte",
+    "EEE0": "dimenge",
+    "EEE1": "diluns",
+    "EEE2": "dimars",
+    "EEE3": "dimècres",
+    "EEE4": "dijòus",
+    "EEE5": "divendres",
+    "EEE6": "dissabte",
+    "EEEE0": "dimenge",
+    "EEEE1": "diluns",
+    "EEEE2": "dimars",
+    "EEEE3": "dimècres",
+    "EEEE4": "dijòus",
+    "EEEE5": "divendres",
+    "EEEE6": "dissabte",
+    "MMM1": "de genièr",
+    "MMM10": "d’octòbre",
+    "MMM11": "de novembre",
+    "MMM12": "de decembre",
+    "MMM2": "de febrièr",
+    "MMM3": "de març",
+    "MMM4": "d’abril",
+    "MMM5": "de mai",
+    "MMM6": "de junh",
+    "MMM7": "de julhet",
+    "MMM8": "d’agost",
+    "MMM9": "de setembre",
+    "MMMM1": "de genièr",
+    "MMMM10": "d’octòbre",
+    "MMMM11": "de novembre",
+    "MMMM12": "de decembre",
+    "MMMM2": "de febrièr",
+    "MMMM3": "de març",
+    "MMMM4": "d’abril",
+    "MMMM5": "de mai",
+    "MMMM6": "de junh",
+    "MMMM7": "de julhet",
+    "MMMM8": "d’agost",
+    "MMMM9": "de setembre",
+    "N1": "d",
+    "N10": "d",
+    "N11": "d",
+    "N12": "d",
+    "N2": "d",
+    "N3": "d",
+    "N4": "d",
+    "N5": "d",
+    "N6": "d",
+    "N7": "d",
+    "N8": "d",
+    "N9": "d",
+    "NN1": "de",
+    "NN10": "d’",
+    "NN11": "de",
+    "NN12": "de",
+    "NN2": "de",
+    "NN3": "de",
+    "NN4": "d’",
+    "NN5": "de",
+    "NN6": "de",
+    "NN7": "de",
+    "NN8": "d’",
+    "NN9": "de",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
     "durationMediumMillis": "#{num} ms",
diff --git a/js/data/locale/oc/unitfmt.json b/js/data/locale/oc/unitfmt.json
index b0474943b9..3003b7b282 100644
--- a/js/data/locale/oc/unitfmt.json
+++ b/js/data/locale/oc/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/om/unitfmt.json b/js/data/locale/om/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/om/unitfmt.json
+++ b/js/data/locale/om/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/or/sysres.json b/js/data/locale/or/sysres.json
index 8198cd63b5..67729415e5 100644
--- a/js/data/locale/or/sysres.json
+++ b/js/data/locale/or/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#{num} ସେ. ରେ|#{num} ସେ. ରେ",
     "#in {num}w": "one#{num} ସପ୍ତା. ରେ|#{num} ସପ୍ତା. ରେ",
     "#in {num}y": "one#{num} ବ. ରେ|#{num} ବ. ରେ",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}ଦିନ|#{num}ଦିନ",
     "#{num}d ago": "one#{num} ଦିନ ପୂର୍ବେ|#{num} ଦିନ ପୂର୍ବେ",
     "#{num}h": "one#{num}ଘଣ୍ଟା|#{num}ଘଣ୍ଟା",
diff --git a/js/data/locale/or/unitfmt.json b/js/data/locale/or/unitfmt.json
index d160c51554..7e22df69b7 100644
--- a/js/data/locale/or/unitfmt.json
+++ b/js/data/locale/or/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} ଆଟମୋସ୍ପିଅର",
             "bar": "#{n} ବାର୍‌",
             "barrel": "#{n} ବାରେଲ",
+            "beaufort": "#B {n}",
             "bit": "#{n} ବିଟ୍",
             "bit-per-second": "#{n} ବିଟ୍ ପ୍ରତି ସେକେଣ୍ଡ",
             "british-thermal-unit": "#{n} ବ୍ରିଟିଶ ଥର୍ମାଲ ଏକକ",
@@ -18,7 +19,7 @@
             "byte-per-hour": "#ଘଣ୍ଟା ପ୍ରତି {n} ବାଇଟ୍",
             "byte-per-second": "#{n} ବାଇଟ୍ ପ୍ରତି ସେକେଣ୍ଡ",
             "calorie": "#{n} କ୍ୟାଲୋରୀ",
-            "candela": "#{n} cd",
+            "candela": "#{n} candela",
             "carat": "#{n} କ୍ୟାରେଟ୍",
             "celsius": "#{n} ଡିଗ୍ରୀ ସେଲସିୟସ୍",
             "centiliter": "#{n} ସେଣ୍ଟିଲିଟର୍",
@@ -36,30 +37,30 @@
             "cup-metric": "#{n} ମେଟ୍ରିକ୍ କପ୍",
             "dalton": "#{n} ଡାଲ୍ଟନ",
             "day": "#{n} ଦିନ",
-            "decade": "#{n} dec",
+            "decade": "#{n} ଦଶନ୍ଧି",
             "deciliter": "#{n} ଡେସିଲିଟର୍",
             "decimeter": "#{n} ଡେସିମିଟର୍",
             "degree": "#{n} ଡିଗ୍ରୀ",
             "dessert-spoon": "#{n} ଡିଜଟ୍ ସ୍ପୁନ୍",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dot": "one#{n} ବିନ୍ଦୁ|#{n} ବି",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "#{n} ବିନ୍ଦୁ ପ୍ରତି ସେଣ୍ଟିମିଟର",
+            "dot-per-inch": "#{n} ପ୍ରତି ଇଞ୍ଚରେ ବିନ୍ଦୁ",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} ଡୁନାମ",
             "earth-mass": "one#{n} ଅର୍ଥ ମାସ|#{n} ଅର୍ଥ ମାସେସ",
-            "earth-radius": "#{n} R⊕",
+            "earth-radius": "#{n} ପୃଥିବୀ ବ୍ୟାସାର୍ଦ୍ଧ",
             "electronvolt": "#{n} ଇଲେକ୍ଟ୍ରୋନ୍‌ ଭୋଲ୍ଟ",
             "em": "#{n} em",
             "fahrenheit": "#{n} ଡିଗ୍ରୀ ଫାରେନହାଇଟ୍",
-            "fathom": "#{n} fth",
+            "fathom": "one#{n} ଫାଟୋମ|#{n} ଫାଟୋମସ୍",
             "fluid-ounce": "#{n} ଫ୍ଲୁଇଡ୍ ଆଉନ୍ସ",
             "fluid-ounce-imperial": "#{n} ଇମ୍ପ. ତରଳ ଆଉନ୍ସ",
             "foodcalorie": "#{n} କ୍ୟାଲୋରୀ",
             "foot": "one#{n} ଫୁଟ୍|#{n} ଫିଟ୍",
             "foot-per-second": "#{n} ଫିଟ୍ ପ୍ରତି ସେକେଣ୍ଡ",
-            "furlong": "#{n} fur",
+            "furlong": "one#{n} ଫର୍ଲଙ୍ଗ୍|#{n} ଫର୍ଲଙ୍ଗସ୍",
             "g-force": "#{n} ଜି-ଫୋର୍ସ୍",
             "gallon": "#{n} ଗ୍ୟାଲନ୍",
             "gallon-imperial": "#{n} ଇମ୍ପେରିଆଲ୍ ଗ୍ୟାଲନ୍",
@@ -118,7 +119,7 @@
             "megahertz": "#{n} ମେଗାହର୍ଜ୍",
             "megaliter": "#{n} ମେଗାଲିଟର୍",
             "megapascal": "#{n} ମେଗାପାସକଲ",
-            "megapixel": "#{n} MP",
+            "megapixel": "one#{n} ମେଗାପିକ୍ସେଲ|#{n} ମେଗାପିକ୍ସେଲ୍ସ",
             "megawatt": "#{n} ମେଗାୱାଟ୍",
             "meter": "#{n} ମିଟର୍",
             "meter-per-second": "#{n} ମିଟର୍ ପ୍ରତି ସେକେଣ୍ଡ୍",
@@ -164,9 +165,9 @@
             "pinch": "#{n} pinch",
             "pint": "#{n} ପାଇଣ୍ଟ୍",
             "pint-metric": "#{n} ମେଟ୍ରିକ୍ ପାଇଣ୍ଟ୍",
-            "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel": "one#{n} ପିକ୍ସେଲ|#{n} ପିକ୍ସେଲ୍ସ",
+            "pixel-per-centimeter": "#{n} ପିକ୍ସେଲ ପ୍ରତି ସେଣ୍ଟିମିଟର",
+            "pixel-per-inch": "#{n} ପ୍ରତି ଇଞ୍ଚରେ ପିକ୍ସେଲ",
             "point": "#{n} ପଏଣ୍ଟ୍",
             "pound": "#{n} ପାଉଣ୍ଡ୍",
             "pound-force": "#{n} ପାଉଣ୍ଡସ ଅଫ ଫୋର୍ସ",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} ବାର୍‌",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} ବିଟ୍",
             "bit-per-second": "#{n} ବିଟ୍/ସେକେଣ୍ଡ",
             "british-thermal-unit": "#{n} Btu",
@@ -242,15 +244,15 @@
             "cup-metric": "#{n} ମେକ",
             "dalton": "#{n} ଡିଏ",
             "day": "#{n} ଦିନ",
-            "decade": "#{n} dec",
+            "decade": "one#{n} ଦଶନ୍ଧି|#{n} dec",
             "deciliter": "#{n} ଡେଲି",
             "decimeter": "#{n} ଡେମି",
             "degree": "#{n} ଡି",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "#{n} ବିନ୍ଦୁ",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} ଡୁନାମ",
@@ -259,13 +261,13 @@
             "electronvolt": "#{n} eV",
             "em": "#{n} em",
             "fahrenheit": "#{n}°ଫା",
-            "fathom": "#{n} fth",
+            "fathom": "one#{n} ଫାଟୋମ|#{n} fth",
             "fluid-ounce": "#{n} ଫ୍ଲୁ ଓଜ୍",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
             "foodcalorie": "#{n} କ୍ୟାଲ୍",
             "foot": "#{n} ଫିଟ୍",
             "foot-per-second": "#{n} ଫିଟ୍/ସେକେଣ୍ଡ",
-            "furlong": "#{n} fur",
+            "furlong": "one#{n} ଫର୍ଲଙ୍ଗ୍|#{n} fur",
             "g-force": "#{n} ଜି",
             "gallon": "#{n} ଗ୍ୟାଲ୍",
             "gallon-imperial": "#{n} ଇମ୍ପେ. ଗ୍ୟା",
diff --git a/js/data/locale/os/unitfmt.json b/js/data/locale/os/unitfmt.json
index 5ca15efd5e..b1eb6d3a3c 100644
--- a/js/data/locale/os/unitfmt.json
+++ b/js/data/locale/os/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/osa/unitfmt.json b/js/data/locale/osa/unitfmt.json
index 79141c7900..a824b6888b 100644
--- a/js/data/locale/osa/unitfmt.json
+++ b/js/data/locale/osa/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/pa/Arab/unitfmt.json b/js/data/locale/pa/Arab/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/pa/Arab/unitfmt.json
+++ b/js/data/locale/pa/Arab/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/pa/unitfmt.json b/js/data/locale/pa/unitfmt.json
index d18eb558d3..a9518c9f62 100644
--- a/js/data/locale/pa/unitfmt.json
+++ b/js/data/locale/pa/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} ਵਾਯੂਮੰਡਲ",
             "bar": "#{n} ਬਾਰ",
             "barrel": "#{n} ਬੈਰਲ",
+            "beaufort": "#ਬਿਊਫੋਰਟ {n}",
             "bit": "#{n} ਬਿਟ",
             "bit-per-second": "#{n} ਬਿਟ ਪ੍ਰਤੀ ਸਕਿੰਟ",
             "british-thermal-unit": "#{n} ਬਰਤਾਨਵੀ ਤਾਪ ਇਕਾਈ",
@@ -42,9 +43,9 @@
             "degree": "#{n} ਡਿਗਰੀ",
             "dessert-spoon": "#{n} ਡੈਜ਼ਰਟ ਸਪੂਨ",
             "dessert-spoon-imperial": "#{n} ਇੰਪੀਰੀਅਲ ਡੈਜ਼ਰਟ ਸਪੂਨ",
-            "dot": "#{n} ਡਾਟ",
-            "dot-per-centimeter": "#{n} ਡਾਟ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ",
-            "dot-per-inch": "#{n} ਡਾਟ ਪ੍ਰਤੀ ਇੰਚ",
+            "dot": "one#{n} ਡਾਟ|#{n} ਡਾਟਸ",
+            "dot-per-centimeter": "one#{n} ਡਾਟ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ|#{n} ਡਾਟਸ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ",
+            "dot-per-inch": "one#{n} ਡਾਟ ਪ੍ਰਤੀ ਇੰਚ|#{n} ਡਾਟਸ ਪ੍ਰਤੀ ਇੰਚ",
             "dram": "#{n} ਚੁਸਕੀ",
             "drop": "#{n} ਬੂੰਦ",
             "dunam": "#{n} ਦੁਨਮ",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} ਵਾ. ਮੰ.",
             "bar": "#{n} ਬਾਰ",
             "barrel": "#{n} ਬੈਰਲ",
+            "beaufort": "#B {n}",
             "bit": "#{n} ਬਿਟ",
             "bit-per-second": "#{n} ਬਿਟ ਪ੍ਰ.ਸ.",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +250,9 @@
             "degree": "#{n} ਡਿ.",
             "dessert-spoon": "#{n} ਡੈਜ਼ਰਟ ਸਪੂਨ",
             "dessert-spoon-imperial": "#{n} ਇੰਪ. ਡੈ. ਸ.",
-            "dot": "#{n} ਡਾਟ",
+            "dot": "one#{n} ਡਾਟ|#{n} ਡਾਟਸ",
             "dot-per-centimeter": "#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|#{n} dpi",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} ਚੁਸਕੀ ਭਰ",
             "drop": "#{n} ਬੂੰਦ",
             "dunam": "#{n} ਦੁਨਮ",
diff --git a/js/data/locale/pap/unitfmt.json b/js/data/locale/pap/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/pap/unitfmt.json
+++ b/js/data/locale/pap/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/pcm/ctrynames.json b/js/data/locale/pcm/ctrynames.json
index 8838f5a693..8a1de2d226 100644
--- a/js/data/locale/pcm/ctrynames.json
+++ b/js/data/locale/pcm/ctrynames.json
@@ -35,7 +35,7 @@
     "Botswána": "BW",
     "Bọ́zniá & Hẹzẹgovína": "BA",
     "Brázil": "BR",
-    "Brítísh Índián Óshen Tẹ́rẹ́tri": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brítísh Vájín Aílands": "VG",
     "Brunẹi": "BN",
     "Burkína Fáso": "BF",
diff --git a/js/data/locale/pcm/ctryreverse.json b/js/data/locale/pcm/ctryreverse.json
index 94ab902cee..6f52217ed3 100644
--- a/js/data/locale/pcm/ctryreverse.json
+++ b/js/data/locale/pcm/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Ízrẹl",
     "IM": "Aíl ọf Man",
     "IN": "Índia",
-    "IO": "Brítísh Índián Óshen Tẹ́rẹ́tri",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Aísland",
diff --git a/js/data/locale/pcm/unitfmt.json b/js/data/locale/pcm/unitfmt.json
index 185eedad28..c427e8758f 100644
--- a/js/data/locale/pcm/unitfmt.json
+++ b/js/data/locale/pcm/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} Átmósfẹ",
             "bar": "#{n} Baa",
             "barrel": "#{n} Drọm",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit Ích Sẹ́kọn",
             "british-thermal-unit": "#{n} Brítísh Támál Yúnit",
@@ -42,9 +43,6 @@
             "degree": "#{n} Digrii",
             "dessert-spoon": "#{n} Dizát Spun",
             "dessert-spoon-imperial": "#{n} Impẹ́riál Dizát Spun",
-            "dot": "#{n}dọt",
-            "dot-per-centimeter": "#{n} Pọint fọ ích sẹntímíta",
-            "dot-per-inch": "#{n} Pọint Fọ Ẹ́vrí Inch",
             "dram": "#{n} Dram",
             "drop": "#{n} Drọp",
             "dunam": "#{n} Dúnam",
@@ -56,7 +54,6 @@
             "fathom": "#{n} fátọm",
             "fluid-ounce": "#{n} Líkwíd Áuns",
             "fluid-ounce-imperial": "#{n} Brítísh Líkwíd Aúns",
-            "foodcalorie": "#{n} Kálọ́ri",
             "foot": "#{n} Fut",
             "foot-per-second": "#{n} Fut Ích Sẹ́kọn",
             "furlong": "#{n} fọ́lọng",
@@ -216,6 +213,7 @@
             "atmosphere": "#{n} átmó",
             "bar": "#{n} Baa",
             "barrel": "#{n}dr",
+            "beaufort": "#B {n}",
             "bit": "#{n} Bit",
             "bit-per-second": "#{n} Bit/sẹ́k",
             "british-thermal-unit": "#{n}Bty",
@@ -248,9 +246,6 @@
             "degree": "#{n} dig",
             "dessert-spoon": "#{n} dztspn",
             "dessert-spoon-imperial": "#{n} dzsp Imp",
-            "dot": "#{n} dọt",
-            "dot-per-centimeter": "#{n} PFIS",
-            "dot-per-inch": "#{n} PFẸI",
             "dram": "#{n} Dram lí",
             "drop": "#{n} Drọp",
             "dunam": "#{n} Dúnam",
@@ -262,7 +257,6 @@
             "fathom": "#{n} fátọ",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Brit.",
-            "foodcalorie": "#{n} Kal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/sẹ́k",
             "furlong": "#{n} fọl",
diff --git a/js/data/locale/pis/unitfmt.json b/js/data/locale/pis/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/pis/unitfmt.json
+++ b/js/data/locale/pis/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/pl/sysres.json b/js/data/locale/pl/sysres.json
index 2f62439f85..8bf4cc36fc 100644
--- a/js/data/locale/pl/sysres.json
+++ b/js/data/locale/pl/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#za {num} sek.|few#za {num} sek.|many#za {num} sek.|#za {num} sek.",
     "#in {num}w": "one#za {num} tydz.|few#za {num} tyg.|many#za {num} tyg.|#za {num} tyg.",
     "#in {num}y": "one#za {num} rok|few#za {num} lata|many#za {num} lat|#za {num} roku",
-    "#{num} ms": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d.|few#{num} d.|many#{num} d.|#{num} d.",
     "#{num}d ago": "one#{num} dzień temu|few#{num} dni temu|many#{num} dni temu|#{num} dnia temu",
     "#{num}h": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
@@ -15,7 +15,7 @@
     "#{num}mo ago": "one#{num} mies. temu|few#{num} mies. temu|many#{num} mies. temu|#{num} mies. temu",
     "#{num}s": "one#{num} s|few#{num} s|many#{num} s|#{num} s",
     "#{num}s ago": "one#{num} sek. temu|few#{num} sek. temu|many#{num} sek. temu|#{num} sek. temu",
-    "#{num}w": "one#{num} tydz.|few#{num} t.|many#{num} tyg.|#{num} tyg.",
+    "#{num}w": "one#{num} t.|few#{num} t.|many#{num} t.|#{num} t.",
     "#{num}w ago": "one#{num} tydz. temu|few#{num} tyg. temu|many#{num} tyg. temu|#{num} tyg. temu",
     "#{num}y": "one#{num} r.|few#{num} l.|many#{num} l.|#{num} r.",
     "#{num}y ago": "one#{num} rok temu|few#{num} lata temu|many#{num} lat temu|#{num} roku temu",
@@ -31,8 +31,8 @@
     "1#1 min ago|#{num} min ago": "one#{num} minutę temu|few#{num} minuty temu|many#{num} minut temu|#{num} minuty temu",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minutę temu|few#{num} minuty temu|many#{num} minut temu|#{num} minuty temu",
     "1#1 minute|#{num} minutes": "one#{num} minuta|few#{num} minuty|many#{num} minut|#{num} minuty",
-    "1#1 min|#{num} min": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "one#{num} miesiąc temu|few#{num} miesiące temu|many#{num} miesięcy temu|#{num} miesiąca temu",
     "1#1 month ago|#{num} months ago": "one#{num} miesiąc temu|few#{num} miesiące temu|many#{num} miesięcy temu|#{num} miesiąca temu",
     "1#1 month|#{num} months": "one#{num} miesiąc|few#{num} miesiące|many#{num} miesięcy|#{num} miesiąca",
@@ -228,11 +228,11 @@
     "cccc6": "sobota",
     "durationLongDays": "one#{num} doba|few#{num} doby|many#{num} dób|#{num} doby",
     "durationMediumHours": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
-    "durationMediumWeeks": "one#{num} tydz.|few#{num} t.|many#{num} tyg.|#{num} tyg.",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "one#{num} t.|few#{num} t.|many#{num} t.|#{num} t.",
     "durationMediumYears": "one#{num} r.|few#{num} l.|many#{num} l.|#{num} r.",
-    "durationShortMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
     "durationShortMonths": "one#{num} m-c|few#{num} m-ce|many#{num} m-cy|#{num} m-ca",
     "finalSeparatorFull": " i ",
     "finalSeparatorLong": " i ",
diff --git a/js/data/locale/pl/unitfmt.json b/js/data/locale/pl/unitfmt.json
index c3c9c79504..3719887389 100644
--- a/js/data/locale/pl/unitfmt.json
+++ b/js/data/locale/pl/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|many#{n} atmosfer|#{n} atmosfery",
             "bar": "one#{n} bar|few#{n} bary|many#{n} barów|#{n} bara",
             "barrel": "one#{n} baryłka|many#{n} baryłek|#{n} baryłki",
+            "beaufort": "#{n} w skali Beauforta",
             "bit": "one#{n} bit|few#{n} bity|many#{n} bitów|#{n} bita",
             "bit-per-second": "#{n} bita na sekundę",
             "british-thermal-unit": "one#{n} brytyjska jednostka ciepła|few#{n} brytyjskie jednostki ciepła|many#{n} brytyjskich jednostek ciepła|#{n} brytyjskiej jednostki ciepła",
@@ -43,9 +44,8 @@
             "degree": "one#{n} stopień|few#{n} stopnie|many#{n} stopni|#{n} stopnia",
             "dessert-spoon": "one#{n} łyżka deserowa|few#{n} łyżki deserowe|many#{n} łyżek deserowych|#{n} łyżki deserowej",
             "dessert-spoon-imperial": "one#{n} imperialna łyżeczka deserowa|few#{n} imperialne łyżeczki deserowe|many#{n} imperialnych łyżeczek deserowych|#{n} imperialnej łyżeczki deserowej",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "one#{n} punkt na centymetr|few#{n} punkty na centymetr|many#{n} punktów na centymetr|#{n} punktu na centymetr",
+            "dot-per-inch": "one#{n} punkt na cal|few#{n} punkty na cal|many#{n} punktów na cal|#{n} punktu na cal",
             "dram": "one#{n} drachma płynu|many#{n} drachm płynu|#{n} drachmy płynu",
             "drop": "one#{n} kropla|few#{n} krople|#{n} kropli",
             "dunam": "one#{n} dunam|few#{n} dunamy|many#{n} dunamów|#{n} dunama",
@@ -57,7 +57,7 @@
             "fathom": "one#{n} sążeń|few#{n} sążnie|many#{n} sążni|#{n} sążnia",
             "fluid-ounce": "one#{n} uncja płynu amerykańska|few#{n} uncje płynu amerykańskie|many#{n} uncji płynu amerykańskich|#{n} uncji płynu amerykańskiej",
             "fluid-ounce-imperial": "one#{n} uncja płynu angielska|few#{n} uncje płynu angielskie|many#{n} uncji płynu angielskich|#{n} uncji płynu angielskiej",
-            "foodcalorie": "one#{n} kaloria|few#{n} kalorie|#{n} kalorii",
+            "foodcalorie": "one#{n} kaloria|few#{n} kilokalorie|many#{n} kilokalorii|#{n} kalorii",
             "foot": "one#{n} stopa|many#{n} stóp|#{n} stopy",
             "foot-per-second": "#{n} stopy na sekundę",
             "furlong": "one#{n} furlong|few#{n} furlongi|many#{n} furlongów|#{n} furlonga",
@@ -166,8 +166,8 @@
             "pint": "one#{n} półkwarta amerykańska|few#{n} półkwarty amerykańskie|many#{n} półkwart amerykańskich|#{n} półkwarty amerykańskiej",
             "pint-metric": "one#{n} półkwarta metryczna|few#{n} półkwarty metryczne|many#{n} półkwart metrycznych|#{n} półkwarty metrycznej",
             "pixel": "one#{n} piksel|few#{n} piksele|many#{n} pikseli|#{n} piksela",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-centimeter": "one#{n} piksel na centymetr|few#{n} piksele na centymetr|many#{n} pikseli na centymetr|#{n} piksela na centymetr",
+            "pixel-per-inch": "one#{n} piksel na cal|few#{n} piksele na cal|many#{n} pikseli na cal|#{n} piksela na cal",
             "point": "one#{n} punkt|few#{n} punkty|many#{n} punktów|#{n} punktu",
             "pound": "one#{n} funt|few#{n} funty|many#{n} funtów|#{n} funta",
             "pound-force": "one#{n} funt-siła|few#{n} funty-siły|many#{n} funtów-siły|#{n} funta-siły",
@@ -217,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} Bft",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,9 +250,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} ł. deser.",
             "dessert-spoon-imperial": "#{n} ł. deser. ang.",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "one#{n} drachma|many#{n} drachm|#{n} drachmy",
             "drop": "one#{n} kropla|few#{n} krople|#{n} kropli",
             "dunam": "one#{n} dunam|few#{n} dunamy|many#{n} dunamów|#{n} dunama",
@@ -263,7 +261,6 @@
             "fathom": "#{n} fm",
             "fluid-ounce": "#{n} fl oz am.",
             "fluid-ounce-imperial": "#{n} fl oz ang.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/prg/ctrynames.json b/js/data/locale/prg/ctrynames.json
new file mode 100644
index 0000000000..cae0d73067
--- /dev/null
+++ b/js/data/locale/prg/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "Afghanistan": "AF",
+    "Africa": "002",
+    "Åland Islands": "AX",
+    "Albania": "AL",
+    "Algeria": "DZ",
+    "American Samoa": "AS",
+    "Americas": "019",
+    "Andorra": "AD",
+    "Angola": "AO",
+    "Anguilla": "AI",
+    "Antarctica": "AQ",
+    "Antigua & Barbuda": "AG",
+    "Argentina": "AR",
+    "Armenia": "AM",
+    "Aruba": "AW",
+    "Ascension Island": "AC",
+    "Asia": "142",
+    "Australasia": "053",
+    "Australia": "AU",
+    "Austria": "AT",
+    "Azerbaijan": "AZ",
+    "Bahamas": "BS",
+    "Bahrain": "BH",
+    "Bangladesh": "BD",
+    "Barbados": "BB",
+    "Belarus": "BY",
+    "Belgium": "BE",
+    "Belize": "BZ",
+    "Benin": "BJ",
+    "Bermuda": "BM",
+    "Bhutan": "BT",
+    "Bolivia": "BO",
+    "Bosnia & Herzegovina": "BA",
+    "Botswana": "BW",
+    "Bouvet Island": "BV",
+    "Brazil": "BR",
+    "British Indian Ocean Territory": "IO",
+    "British Virgin Islands": "VG",
+    "Brunei": "BN",
+    "Bulgaria": "BG",
+    "Burkina Faso": "BF",
+    "Burundi": "BI",
+    "Cambodia": "KH",
+    "Cameroon": "CM",
+    "Canada": "CA",
+    "Canary Islands": "IC",
+    "Cape Verde": "CV",
+    "Caribbean": "029",
+    "Caribbean Netherlands": "BQ",
+    "Cayman Islands": "KY",
+    "Central African Republic": "CF",
+    "Central America": "013",
+    "Central Asia": "143",
+    "Ceuta & Melilla": "EA",
+    "Chad": "TD",
+    "Chile": "CL",
+    "China": "CN",
+    "Christmas Island": "CX",
+    "Clipperton Island": "CP",
+    "Cocos (Keeling) Islands": "CC",
+    "Colombia": "CO",
+    "Comoros": "KM",
+    "Congo - Brazzaville": "CG",
+    "Congo - Kinshasa": "CD",
+    "Cook Islands": "CK",
+    "Costa Rica": "CR",
+    "Côte d’Ivoire": "CI",
+    "Croatia": "HR",
+    "Cuba": "CU",
+    "Curaçao": "CW",
+    "Cyprus": "CY",
+    "Czechia": "CZ",
+    "Denmark": "DK",
+    "Diego Garcia": "DG",
+    "Djibouti": "DJ",
+    "Dominica": "DM",
+    "Dominican Republic": "DO",
+    "Eastern Africa": "014",
+    "Eastern Asia": "030",
+    "Eastern Europe": "151",
+    "Ecuador": "EC",
+    "Egypt": "EG",
+    "El Salvador": "SV",
+    "Equatorial Guinea": "GQ",
+    "Eritrea": "ER",
+    "Estonia": "EE",
+    "Eswatini": "SZ",
+    "Ethiopia": "ET",
+    "Europe": "150",
+    "European Union": "EU",
+    "Eurozone": "EZ",
+    "Falkland Islands": "FK",
+    "Faroe Islands": "FO",
+    "Fiji": "FJ",
+    "Finland": "FI",
+    "France": "FR",
+    "French Guiana": "GF",
+    "French Polynesia": "PF",
+    "French Southern Territories": "TF",
+    "Gabon": "GA",
+    "Gambia": "GM",
+    "Georgia": "GE",
+    "Germany": "DE",
+    "Ghana": "GH",
+    "Gibraltar": "GI",
+    "Greece": "GR",
+    "Greenland": "GL",
+    "Grenada": "GD",
+    "Guadeloupe": "GP",
+    "Guam": "GU",
+    "Guatemala": "GT",
+    "Guernsey": "GG",
+    "Guinea": "GN",
+    "Guinea-Bissau": "GW",
+    "Guyana": "GY",
+    "Haiti": "HT",
+    "Heard & McDonald Islands": "HM",
+    "Honduras": "HN",
+    "Hong Kong SAR China": "HK",
+    "Hungary": "HU",
+    "Iceland": "IS",
+    "India": "IN",
+    "Indonesia": "ID",
+    "Iran": "IR",
+    "Iraq": "IQ",
+    "Ireland": "IE",
+    "Isle of Man": "IM",
+    "Israel": "IL",
+    "Italy": "IT",
+    "Jamaica": "JM",
+    "Japan": "JP",
+    "Jersey": "JE",
+    "Jordan": "JO",
+    "Kazakhstan": "KZ",
+    "Kenya": "KE",
+    "Kiribati": "KI",
+    "Kosovo": "XK",
+    "Kuwait": "KW",
+    "Kyrgyzstan": "KG",
+    "Laos": "LA",
+    "Latin America": "419",
+    "Latvia": "LV",
+    "Lebanon": "LB",
+    "Lesotho": "LS",
+    "Liberia": "LR",
+    "Libya": "LY",
+    "Liechtenstein": "LI",
+    "Lithuania": "LT",
+    "Luxembourg": "LU",
+    "Macao SAR China": "MO",
+    "Madagascar": "MG",
+    "Malawi": "MW",
+    "Malaysia": "MY",
+    "Maldives": "MV",
+    "Mali": "ML",
+    "Malta": "MT",
+    "Marshall Islands": "MH",
+    "Martinique": "MQ",
+    "Mauritania": "MR",
+    "Mauritius": "MU",
+    "Mayotte": "YT",
+    "Melanesia": "054",
+    "Mexico": "MX",
+    "Micronesia": "FM",
+    "Micronesian Region": "057",
+    "Middle Africa": "017",
+    "Moldova": "MD",
+    "Monaco": "MC",
+    "Mongolia": "MN",
+    "Montenegro": "ME",
+    "Montserrat": "MS",
+    "Morocco": "MA",
+    "Mozambique": "MZ",
+    "Myanmar (Burma)": "MM",
+    "Namibia": "NA",
+    "Nauru": "NR",
+    "Nepal": "NP",
+    "Netherlands": "NL",
+    "New Caledonia": "NC",
+    "New Zealand": "NZ",
+    "Nicaragua": "NI",
+    "Niger": "NE",
+    "Nigeria": "NG",
+    "Niue": "NU",
+    "Norfolk Island": "NF",
+    "North America": "003",
+    "North Korea": "KP",
+    "North Macedonia": "MK",
+    "Northern Africa": "015",
+    "Northern America": "021",
+    "Northern Europe": "154",
+    "Northern Mariana Islands": "MP",
+    "Norway": "NO",
+    "Oceania": "009",
+    "Oman": "OM",
+    "Outlying Oceania": "QO",
+    "Pakistan": "PK",
+    "Palau": "PW",
+    "Palestinian Territories": "PS",
+    "Panama": "PA",
+    "Papua New Guinea": "PG",
+    "Paraguay": "PY",
+    "Peru": "PE",
+    "Philippines": "PH",
+    "Pitcairn Islands": "PN",
+    "Pōli": "PL",
+    "Polynesia": "061",
+    "Portugal": "PT",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
+    "Puerto Rico": "PR",
+    "Qatar": "QA",
+    "Réunion": "RE",
+    "Romania": "RO",
+    "Russia": "RU",
+    "Rwanda": "RW",
+    "Samoa": "WS",
+    "San Marino": "SM",
+    "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
+    "Saudi Arabia": "SA",
+    "Senegal": "SN",
+    "Serbia": "RS",
+    "Seychelles": "SC",
+    "Sierra Leone": "SL",
+    "Singapore": "SG",
+    "Sint Maarten": "SX",
+    "Slovakia": "SK",
+    "Slovenia": "SI",
+    "Solomon Islands": "SB",
+    "Somalia": "SO",
+    "South Africa": "ZA",
+    "South America": "005",
+    "South Georgia & South Sandwich Islands": "GS",
+    "South Korea": "KR",
+    "South Sudan": "SS",
+    "Southeast Asia": "035",
+    "Southern Africa": "018",
+    "Southern Asia": "034",
+    "Southern Europe": "039",
+    "Spain": "ES",
+    "Sri Lanka": "LK",
+    "St. Barthélemy": "BL",
+    "St. Helena": "SH",
+    "St. Kitts & Nevis": "KN",
+    "St. Lucia": "LC",
+    "St. Martin": "MF",
+    "St. Pierre & Miquelon": "PM",
+    "St. Vincent & Grenadines": "VC",
+    "Sub-Saharan Africa": "202",
+    "Sudan": "SD",
+    "Suriname": "SR",
+    "Svalbard & Jan Mayen": "SJ",
+    "Sweden": "SE",
+    "swītai": "001",
+    "Switzerland": "CH",
+    "Syria": "SY",
+    "Taiwan": "TW",
+    "Tajikistan": "TJ",
+    "Tanzania": "TZ",
+    "Thailand": "TH",
+    "Timor-Leste": "TL",
+    "Togo": "TG",
+    "Tokelau": "TK",
+    "Tonga": "TO",
+    "Trinidad & Tobago": "TT",
+    "Tristan da Cunha": "TA",
+    "Tunisia": "TN",
+    "Türkiye": "TR",
+    "Turkmenistan": "TM",
+    "Turks & Caicos Islands": "TC",
+    "Tuvalu": "TV",
+    "U.S. Outlying Islands": "UM",
+    "U.S. Virgin Islands": "VI",
+    "Uganda": "UG",
+    "Ukraine": "UA",
+    "United Arab Emirates": "AE",
+    "United Kingdom": "GB",
+    "United Nations": "UN",
+    "United States": "US",
+    "Unknown Region": "ZZ",
+    "Uruguay": "UY",
+    "Uzbekistan": "UZ",
+    "Vanuatu": "VU",
+    "Vatican City": "VA",
+    "Venezuela": "VE",
+    "Vietnam": "VN",
+    "Wallis & Futuna": "WF",
+    "Western Africa": "011",
+    "Western Asia": "145",
+    "Western Europe": "155",
+    "Western Sahara": "EH",
+    "Yemen": "YE",
+    "Zambia": "ZM",
+    "Zimbabwe": "ZW"
+}
\ No newline at end of file
diff --git a/js/data/locale/prg/ctryreverse.json b/js/data/locale/prg/ctryreverse.json
new file mode 100644
index 0000000000..016123ede1
--- /dev/null
+++ b/js/data/locale/prg/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "swītai",
+    "002": "Africa",
+    "003": "North America",
+    "005": "South America",
+    "009": "Oceania",
+    "011": "Western Africa",
+    "013": "Central America",
+    "014": "Eastern Africa",
+    "015": "Northern Africa",
+    "017": "Middle Africa",
+    "018": "Southern Africa",
+    "019": "Americas",
+    "021": "Northern America",
+    "029": "Caribbean",
+    "030": "Eastern Asia",
+    "034": "Southern Asia",
+    "035": "Southeast Asia",
+    "039": "Southern Europe",
+    "053": "Australasia",
+    "054": "Melanesia",
+    "057": "Micronesian Region",
+    "061": "Polynesia",
+    "142": "Asia",
+    "143": "Central Asia",
+    "145": "Western Asia",
+    "150": "Europe",
+    "151": "Eastern Europe",
+    "154": "Northern Europe",
+    "155": "Western Europe",
+    "202": "Sub-Saharan Africa",
+    "419": "Latin America",
+    "AC": "Ascension Island",
+    "AD": "Andorra",
+    "AE": "United Arab Emirates",
+    "AF": "Afghanistan",
+    "AG": "Antigua & Barbuda",
+    "AI": "Anguilla",
+    "AL": "Albania",
+    "AM": "Armenia",
+    "AO": "Angola",
+    "AQ": "Antarctica",
+    "AR": "Argentina",
+    "AS": "American Samoa",
+    "AT": "Austria",
+    "AU": "Australia",
+    "AW": "Aruba",
+    "AX": "Åland Islands",
+    "AZ": "Azerbaijan",
+    "BA": "Bosnia & Herzegovina",
+    "BB": "Barbados",
+    "BD": "Bangladesh",
+    "BE": "Belgium",
+    "BF": "Burkina Faso",
+    "BG": "Bulgaria",
+    "BH": "Bahrain",
+    "BI": "Burundi",
+    "BJ": "Benin",
+    "BL": "St. Barthélemy",
+    "BM": "Bermuda",
+    "BN": "Brunei",
+    "BO": "Bolivia",
+    "BQ": "Caribbean Netherlands",
+    "BR": "Brazil",
+    "BS": "Bahamas",
+    "BT": "Bhutan",
+    "BV": "Bouvet Island",
+    "BW": "Botswana",
+    "BY": "Belarus",
+    "BZ": "Belize",
+    "CA": "Canada",
+    "CC": "Cocos (Keeling) Islands",
+    "CD": "Congo - Kinshasa",
+    "CF": "Central African Republic",
+    "CG": "Congo - Brazzaville",
+    "CH": "Switzerland",
+    "CI": "Côte d’Ivoire",
+    "CK": "Cook Islands",
+    "CL": "Chile",
+    "CM": "Cameroon",
+    "CN": "China",
+    "CO": "Colombia",
+    "CP": "Clipperton Island",
+    "CQ": "Sark",
+    "CR": "Costa Rica",
+    "CU": "Cuba",
+    "CV": "Cape Verde",
+    "CW": "Curaçao",
+    "CX": "Christmas Island",
+    "CY": "Cyprus",
+    "CZ": "Czechia",
+    "DE": "Germany",
+    "DG": "Diego Garcia",
+    "DJ": "Djibouti",
+    "DK": "Denmark",
+    "DM": "Dominica",
+    "DO": "Dominican Republic",
+    "DZ": "Algeria",
+    "EA": "Ceuta & Melilla",
+    "EC": "Ecuador",
+    "EE": "Estonia",
+    "EG": "Egypt",
+    "EH": "Western Sahara",
+    "ER": "Eritrea",
+    "ES": "Spain",
+    "ET": "Ethiopia",
+    "EU": "European Union",
+    "EZ": "Eurozone",
+    "FI": "Finland",
+    "FJ": "Fiji",
+    "FK": "Falkland Islands",
+    "FM": "Micronesia",
+    "FO": "Faroe Islands",
+    "FR": "France",
+    "GA": "Gabon",
+    "GB": "United Kingdom",
+    "GD": "Grenada",
+    "GE": "Georgia",
+    "GF": "French Guiana",
+    "GG": "Guernsey",
+    "GH": "Ghana",
+    "GI": "Gibraltar",
+    "GL": "Greenland",
+    "GM": "Gambia",
+    "GN": "Guinea",
+    "GP": "Guadeloupe",
+    "GQ": "Equatorial Guinea",
+    "GR": "Greece",
+    "GS": "South Georgia & South Sandwich Islands",
+    "GT": "Guatemala",
+    "GU": "Guam",
+    "GW": "Guinea-Bissau",
+    "GY": "Guyana",
+    "HK": "Hong Kong SAR China",
+    "HM": "Heard & McDonald Islands",
+    "HN": "Honduras",
+    "HR": "Croatia",
+    "HT": "Haiti",
+    "HU": "Hungary",
+    "IC": "Canary Islands",
+    "ID": "Indonesia",
+    "IE": "Ireland",
+    "IL": "Israel",
+    "IM": "Isle of Man",
+    "IN": "India",
+    "IO": "British Indian Ocean Territory",
+    "IQ": "Iraq",
+    "IR": "Iran",
+    "IS": "Iceland",
+    "IT": "Italy",
+    "JE": "Jersey",
+    "JM": "Jamaica",
+    "JO": "Jordan",
+    "JP": "Japan",
+    "KE": "Kenya",
+    "KG": "Kyrgyzstan",
+    "KH": "Cambodia",
+    "KI": "Kiribati",
+    "KM": "Comoros",
+    "KN": "St. Kitts & Nevis",
+    "KP": "North Korea",
+    "KR": "South Korea",
+    "KW": "Kuwait",
+    "KY": "Cayman Islands",
+    "KZ": "Kazakhstan",
+    "LA": "Laos",
+    "LB": "Lebanon",
+    "LC": "St. Lucia",
+    "LI": "Liechtenstein",
+    "LK": "Sri Lanka",
+    "LR": "Liberia",
+    "LS": "Lesotho",
+    "LT": "Lithuania",
+    "LU": "Luxembourg",
+    "LV": "Latvia",
+    "LY": "Libya",
+    "MA": "Morocco",
+    "MC": "Monaco",
+    "MD": "Moldova",
+    "ME": "Montenegro",
+    "MF": "St. Martin",
+    "MG": "Madagascar",
+    "MH": "Marshall Islands",
+    "MK": "North Macedonia",
+    "ML": "Mali",
+    "MM": "Myanmar (Burma)",
+    "MN": "Mongolia",
+    "MO": "Macao SAR China",
+    "MP": "Northern Mariana Islands",
+    "MQ": "Martinique",
+    "MR": "Mauritania",
+    "MS": "Montserrat",
+    "MT": "Malta",
+    "MU": "Mauritius",
+    "MV": "Maldives",
+    "MW": "Malawi",
+    "MX": "Mexico",
+    "MY": "Malaysia",
+    "MZ": "Mozambique",
+    "NA": "Namibia",
+    "NC": "New Caledonia",
+    "NE": "Niger",
+    "NF": "Norfolk Island",
+    "NG": "Nigeria",
+    "NI": "Nicaragua",
+    "NL": "Netherlands",
+    "NO": "Norway",
+    "NP": "Nepal",
+    "NR": "Nauru",
+    "NU": "Niue",
+    "NZ": "New Zealand",
+    "OM": "Oman",
+    "PA": "Panama",
+    "PE": "Peru",
+    "PF": "French Polynesia",
+    "PG": "Papua New Guinea",
+    "PH": "Philippines",
+    "PK": "Pakistan",
+    "PL": "Pōli",
+    "PM": "St. Pierre & Miquelon",
+    "PN": "Pitcairn Islands",
+    "PR": "Puerto Rico",
+    "PS": "Palestinian Territories",
+    "PT": "Portugal",
+    "PW": "Palau",
+    "PY": "Paraguay",
+    "QA": "Qatar",
+    "QO": "Outlying Oceania",
+    "RE": "Réunion",
+    "RO": "Romania",
+    "RS": "Serbia",
+    "RU": "Russia",
+    "RW": "Rwanda",
+    "SA": "Saudi Arabia",
+    "SB": "Solomon Islands",
+    "SC": "Seychelles",
+    "SD": "Sudan",
+    "SE": "Sweden",
+    "SG": "Singapore",
+    "SH": "St. Helena",
+    "SI": "Slovenia",
+    "SJ": "Svalbard & Jan Mayen",
+    "SK": "Slovakia",
+    "SL": "Sierra Leone",
+    "SM": "San Marino",
+    "SN": "Senegal",
+    "SO": "Somalia",
+    "SR": "Suriname",
+    "SS": "South Sudan",
+    "ST": "São Tomé & Príncipe",
+    "SV": "El Salvador",
+    "SX": "Sint Maarten",
+    "SY": "Syria",
+    "SZ": "Eswatini",
+    "TA": "Tristan da Cunha",
+    "TC": "Turks & Caicos Islands",
+    "TD": "Chad",
+    "TF": "French Southern Territories",
+    "TG": "Togo",
+    "TH": "Thailand",
+    "TJ": "Tajikistan",
+    "TK": "Tokelau",
+    "TL": "Timor-Leste",
+    "TM": "Turkmenistan",
+    "TN": "Tunisia",
+    "TO": "Tonga",
+    "TR": "Türkiye",
+    "TT": "Trinidad & Tobago",
+    "TV": "Tuvalu",
+    "TW": "Taiwan",
+    "TZ": "Tanzania",
+    "UA": "Ukraine",
+    "UG": "Uganda",
+    "UM": "U.S. Outlying Islands",
+    "UN": "United Nations",
+    "US": "United States",
+    "UY": "Uruguay",
+    "UZ": "Uzbekistan",
+    "VA": "Vatican City",
+    "VC": "St. Vincent & Grenadines",
+    "VE": "Venezuela",
+    "VG": "British Virgin Islands",
+    "VI": "U.S. Virgin Islands",
+    "VN": "Vietnam",
+    "VU": "Vanuatu",
+    "WF": "Wallis & Futuna",
+    "WS": "Samoa",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
+    "XK": "Kosovo",
+    "YE": "Yemen",
+    "YT": "Mayotte",
+    "ZA": "South Africa",
+    "ZM": "Zambia",
+    "ZW": "Zimbabwe",
+    "ZZ": "Unknown Region"
+}
\ No newline at end of file
diff --git a/js/data/locale/prg/delimiters.jf b/js/data/locale/prg/delimiters.jf
new file mode 100644
index 0000000000..9a8520486d
--- /dev/null
+++ b/js/data/locale/prg/delimiters.jf
@@ -0,0 +1,9 @@
+{
+    "delimiter": {
+        "alternateQuotationEnd": "“",
+        "alternateQuotationStart": "„",
+        "quotationEnd": "“",
+        "quotationStart": "„"
+    },
+    "generated": true
+}
\ No newline at end of file
diff --git a/js/data/locale/prg/numfmt.jf b/js/data/locale/prg/numfmt.jf
new file mode 100644
index 0000000000..277420711c
--- /dev/null
+++ b/js/data/locale/prg/numfmt.jf
@@ -0,0 +1,11 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "common": "{n} {s}",
+            "commonNegative": "-{n} {s}"
+        },
+        "decimalChar": ",",
+        "groupChar": " "
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/prg/sysres.json b/js/data/locale/prg/sysres.json
index 03ebba6582..7e5c88c051 100644
--- a/js/data/locale/prg/sysres.json
+++ b/js/data/locale/prg/sysres.json
@@ -65,66 +65,77 @@
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 year|#in {num} years": "#+{num} y",
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "EE0": "Sun",
-    "EE1": "Mon",
-    "EE2": "Tue",
-    "EE3": "Wed",
-    "EE4": "Thu",
-    "EE5": "Fri",
-    "EE6": "Sat",
-    "EEEE0": "Sun",
-    "EEEE1": "Mon",
-    "EEEE2": "Tue",
-    "EEEE3": "Wed",
-    "EEEE4": "Thu",
-    "EEEE5": "Fri",
-    "EEEE6": "Sat",
-    "MMM1": "M01",
-    "MMM10": "M10",
-    "MMM11": "M11",
-    "MMM12": "M12",
-    "MMM2": "M02",
-    "MMM3": "M03",
-    "MMM4": "M04",
-    "MMM5": "M05",
-    "MMM6": "M06",
-    "MMM7": "M07",
-    "MMM8": "M08",
-    "MMM9": "M09",
-    "MMMM1": "M01",
-    "MMMM10": "M10",
-    "MMMM11": "M11",
-    "MMMM12": "M12",
-    "MMMM2": "M02",
-    "MMMM3": "M03",
-    "MMMM4": "M04",
-    "MMMM5": "M05",
-    "MMMM6": "M06",
-    "MMMM7": "M07",
-    "MMMM8": "M08",
-    "MMMM9": "M09",
-    "N1": "M",
-    "N10": "M",
-    "N11": "M",
-    "N12": "M",
-    "N2": "M",
-    "N4": "M",
-    "N6": "M",
-    "N7": "M",
-    "N8": "M",
-    "N9": "M",
-    "NN1": "M0",
-    "NN10": "M1",
-    "NN11": "M1",
-    "NN12": "M1",
-    "NN2": "M0",
-    "NN3": "M0",
-    "NN4": "M0",
-    "NN5": "M0",
-    "NN6": "M0",
-    "NN7": "M0",
-    "NN8": "M0",
-    "NN9": "M0",
+    "EE0": "nadīli",
+    "EE1": "panadīli",
+    "EE2": "wisasīdis",
+    "EE3": "pussisawaiti",
+    "EE4": "ketwirtiks",
+    "EE5": "pēntniks",
+    "EE6": "sabattika",
+    "EEE0": "nadīli",
+    "EEE1": "panadīli",
+    "EEE2": "wisasīdis",
+    "EEE3": "pussisawaiti",
+    "EEE4": "ketwirtiks",
+    "EEE5": "pēntniks",
+    "EEE6": "sabattika",
+    "EEEE0": "nadīli",
+    "EEEE1": "panadīli",
+    "EEEE2": "wisasīdis",
+    "EEEE3": "pussisawaiti",
+    "EEEE4": "ketwirtiks",
+    "EEEE5": "pēntniks",
+    "EEEE6": "sabattika",
+    "MMM1": "rags",
+    "MMM10": "spallins",
+    "MMM11": "lapkrūtis",
+    "MMM12": "sallaws",
+    "MMM2": "wassarins",
+    "MMM3": "pūlis",
+    "MMM4": "sakkis",
+    "MMM5": "zallaws",
+    "MMM6": "sīmenis",
+    "MMM7": "līpa",
+    "MMM8": "daggis",
+    "MMM9": "sillins",
+    "MMMM1": "rags",
+    "MMMM10": "spallins",
+    "MMMM11": "lapkrūtis",
+    "MMMM12": "sallaws",
+    "MMMM2": "wassarins",
+    "MMMM3": "pūlis",
+    "MMMM4": "sakkis",
+    "MMMM5": "zallaws",
+    "MMMM6": "sīmenis",
+    "MMMM7": "līpa",
+    "MMMM8": "daggis",
+    "MMMM9": "sillins",
+    "N1": "r",
+    "N10": "s",
+    "N11": "l",
+    "N12": "s",
+    "N2": "w",
+    "N3": "p",
+    "N4": "s",
+    "N5": "z",
+    "N6": "s",
+    "N7": "l",
+    "N8": "d",
+    "N9": "s",
+    "NN1": "ra",
+    "NN10": "sp",
+    "NN11": "la",
+    "NN12": "sa",
+    "NN2": "wa",
+    "NN3": "pū",
+    "NN4": "sa",
+    "NN5": "za",
+    "NN6": "sī",
+    "NN7": "lī",
+    "NN8": "da",
+    "NN9": "si",
+    "a0": "ankstāinan",
+    "a1": "pa pussideinan",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
     "durationMediumMillis": "#{num} ms",
diff --git a/js/data/locale/prg/unitfmt.json b/js/data/locale/prg/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/prg/unitfmt.json
+++ b/js/data/locale/prg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ps/PK/unitfmt.json b/js/data/locale/ps/PK/unitfmt.json
index 6d71d1a518..f2a0ba9809 100644
--- a/js/data/locale/ps/PK/unitfmt.json
+++ b/js/data/locale/ps/PK/unitfmt.json
@@ -10,13 +10,14 @@
             "atmosphere": "one#{n} اتموسپير|#{n} اتموسپيرز",
             "bar": "#{n} bar",
             "barrel": "one#{n} بېرل|#{n} بېرلز",
+            "beaufort": "#بیوفورټ {n}",
             "bit": "one#{n} بټ|#{n} بټس",
-            "bit-per-second": "#{n} بټس/s",
+            "bit-per-second": "#{n} بټس هره ثانیه",
             "british-thermal-unit": "one#برتانوي ترمل یونټ|#{n} برتانوي ترمل يونټس",
-            "bushel": "one#{n} bu|#{n} بوشیل",
+            "bushel": "#{n} بوشیل",
             "byte": "one#{n} بايټ|#{n} بايټس",
             "byte-per-hour": "#{n} بايټس/h",
-            "byte-per-second": "#{n} بايټس/s",
+            "byte-per-second": "#{n} بايټس هره ثانیه",
             "calorie": "one#{n} کيلري|#{n} کيلريز",
             "candela": "#{n} cd",
             "carat": "#{n} قيراط",
@@ -33,42 +34,41 @@
             "cubic-mile": "#{n} مکعب ميل",
             "cubic-yard": "#{n} مکعب ګز",
             "cup": "one#{n} پياله|#{n} پيالے",
-            "cup-metric": "#{n} mc",
+            "cup-metric": "#{n} میټریک کپ",
             "dalton": "one#{n} ډالټن|#{n} ډالټنز",
             "day": "one#{n} ورځ|#{n} ورځے",
             "decade": "one#{n} لسيزه|#{n} لسيزې",
             "deciliter": "one#{n} ډيسي ليټر|#{n} ډيسي ليټرز",
             "decimeter": "one#{n} ډيسي متر|#{n} ډيسي متره",
             "degree": "#{n} درجے",
-            "dessert-spoon": "one#{n} dessert spoon|#{n} مچ چمچ",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dessert-spoon": "#{n} مچ چمچ",
+            "dessert-spoon-imperial": "one#{n} Imp. dessert spoon|#{n} Imp. dessert spoons",
+            "dot": "one#{n} نقطه|#{n} نقطې",
+            "dot-per-centimeter": "",
             "dram": "#{n} ډرام",
             "drop": "#{n} څاڅک",
             "dunam": "one#{n} دونم|#{n} دونمز",
             "earth-mass": "one#{n} د زمکې حجم|#{n} د زمکې حجمونه",
-            "earth-radius": "#{n} R⊕",
+            "earth-radius": "#{n} د ځمکې وړانګې",
             "electronvolt": "one#{n} اليکټران وولټ|#{n} اليکټران وولټس",
             "em": "#{n} em",
             "fahrenheit": "#{n} درجے فارنهايټ",
             "fathom": "one#{n} fathom|#{n} فتومونه",
-            "fluid-ounce": "#{n} fl oz",
+            "fluid-ounce": "#{n} مایع اونس",
             "fluid-ounce-imperial": "#{n} امپيريل مايع اونس",
             "foodcalorie": "one#{n} کيلري|#{n} کيلريز",
             "foot": "one#{n} فټ|#{n} فټه",
-            "foot-per-second": "#{n} فټه/s",
+            "foot-per-second": "#{n} فټه هره ثانیه",
             "furlong": "one#{n} fur|#{n} فرلانګونه",
             "g-force": "#{n} د جاذبے قوه",
             "gallon": "one#{n} ګيلن|#{n} ګيلنز",
             "gallon-imperial": "#{n} gal Imp.",
             "generic": "#{n}°",
             "gigabit": "one#{n} ګيګا بټ|#{n} ګيګا بټس",
-            "gigabit-per-second": "#{n} ګيګا بټس/s",
+            "gigabit-per-second": "#{n} ګيګا بټس هره ثانیه",
             "gigabyte": "#{n} ګيګا بايټس",
             "gigabyte-per-hour": "#{n} ګيګا بايټس/h",
-            "gigabyte-per-second": "#{n} ګيګا بايټس/s",
+            "gigabyte-per-second": "#{n} ګيګا بايټس هره ثانیه",
             "gigahertz": "#{n} ګيګا هرټز",
             "gigawatt": "one#{n} ګيګا واټ|#{n} ګيګا واټس",
             "grain": "#{n} grain",
@@ -87,10 +87,10 @@
             "karat": "#{n} قيراط",
             "kelvin": "one#{n} کيلون|#{n} کيلونز",
             "kilobit": "one#{n} کيلو بټ|#{n} کيلو بټس",
-            "kilobit-per-second": "#{n} کيلو بټس/s",
+            "kilobit-per-second": "#{n} کيلو بټس هره ثانیه",
             "kilobyte": "one#{n} کيلو بايټ|#{n} کيلو بايټس",
             "kilobyte-per-hour": "#{n} کيلو بايټس/h",
-            "kilobyte-per-second": "#{n} کيلو بايټس/s",
+            "kilobyte-per-second": "#{n} کيلو بايټس هره ثانیه",
             "kilocalorie": "one#{n} کيلو کيلري|#{n} کيلو کيلريز",
             "kilogram": "one#{n} کيلو ګرام|#{n} کيلو ګرامز",
             "kilohertz": "#{n} کيلو هرټز",
@@ -98,7 +98,7 @@
             "kilometer": "one#{n} کيلومتر|#{n} کيلومتره",
             "kilometer-per-hour": "#{n} کيلو متر في ساعت",
             "kilometer-per-liter": "#{n} کيلومتره في ليټر",
-            "kilometer-per-second": "#{n} کيلومتره/s",
+            "kilometer-per-second": "#{n} کيلومتره هره ثانیه",
             "kilopascal": "one#{n} کيلو پاسکیل|#{n} کيلو پاسکیلز",
             "kilowatt": "one#{n} کيلو واټ|#{n} کيلو واټس",
             "kilowatt-hour": "one#{n} کيلو واټ ساعت|#{n} کيلو واټ ساعته",
@@ -111,10 +111,10 @@
             "lumen": "#{n} lm",
             "lux": "#{n} lx",
             "megabit": "one#{n} ميګا بټ|#{n} ميګا بټس",
-            "megabit-per-second": "#{n} ميګا بټس/s",
+            "megabit-per-second": "#{n} ميګا بټس هره ثانیه",
             "megabyte": "one#{n} ميګا بايټ|#{n} ميګا بايټس",
             "megabyte-per-hour": "#{n} ميګا بايټس/h",
-            "megabyte-per-second": "#{n} ميګا بايټس/s",
+            "megabyte-per-second": "#{n} ميګا بايټس هره ثانیه",
             "megahertz": "#{n} ميګا هرټز",
             "megaliter": "one#{n} ميګا ليټر|#{n} ميګا ليټرز",
             "megapascal": "one#{n} ميګا پاسکیل|#{n} ميګا پاسکیلز",
@@ -130,7 +130,7 @@
             "mile-per-gallon": "one#{n} ميل في ګيلن|#{n} ميلز في ګيلن",
             "mile-per-gallon-imperial": "one#{n} ميل في ايمپيريل ګيلن|#{n} ميلز في ايمپيريل ګيلن",
             "mile-per-hour": "#{n} ميل في ساعت",
-            "mile-per-second": "#{n} ميلونه/s",
+            "mile-per-second": "#{n} ميلونه هره ثانیه",
             "mile-scandinavian": "one#{n} سکېنډنيوين ميل|#{n} سکېنډنيوين ميلونه",
             "milliampere": "one#{n} ملي ايمپير|#{n} ملي ايمپيرز",
             "millibar": "one#{n} ملي بار|#{n} ملي بارز",
@@ -142,7 +142,7 @@
             "millimole-per-liter": "#{n} ملي مول في ليټر",
             "millisecond": "#{n} ms",
             "milliwatt": "one#{n} ملي واټ|#{n} ملي واټس",
-            "minute": "#{n} min",
+            "minute": "one#{n} دقیقه|#{n} دقیقې",
             "mole": "one#{n} مول|#{n} مولز",
             "month": "one#{n} مياشت|#{n} مياشتے",
             "nanometer": "one#{n} نينو متر|#{n} نينو متره",
@@ -153,7 +153,7 @@
             "ohm": "one#{n} اوهم|#{n} اوهمز",
             "ounce": "one#{n} اونس|#{n} اونسز",
             "ounce-troy": "one#{n} ټرای اونس|#{n} ټرای اونسز",
-            "parsec": "one#{n} في ثانيه|#{n} في ثانيې",
+            "parsec": "one#{n} پارسيکس|#{n} في ثانيې",
             "pascal": "#{n} Pa",
             "percent": "#{n} سلنه",
             "permille": "#{n} في ميل",
@@ -163,10 +163,10 @@
             "picometer": "one#{n} پيکو متر|#{n} پيکو متره",
             "pinch": "#{n} چنه",
             "pint": "#{n} pt",
-            "pint-metric": "#{n} mpt",
+            "pint-metric": "one#{n} metric pint|#{n} metric pints",
             "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-centimeter": "one#{n} پکسل فی سانتي متره|#{n} پکسلز فی سانتي متره",
+            "pixel-per-inch": "one#{n} پکسل فی انچ|#{n} پکسلز فی انچ",
             "point": "one#{n} نمره|#{n} نمرې",
             "pound": "one#{n} پاونډ|#{n} پاونډز",
             "pound-force": "one#{n} د قوې پاونډ|#{n} د قوې پاونډز",
@@ -177,7 +177,7 @@
             "quarter": "#{n} q",
             "radian": "#{n} راديان",
             "revolution": "#{n} انقلاب",
-            "second": "#{n} s",
+            "second": "one#{n} s|#{n} ثانیې",
             "short-ton": "one#{n} ټن|#{n} ټنز",
             "solar-luminosity": "one#{n} لمريز ځلښت|#{n} لمريز ځلښتونه",
             "solar-mass": "#{n} لمريز حجم",
@@ -193,10 +193,10 @@
             "tablespoon": "#{n} tbsp",
             "teaspoon": "one#{n} د ميز کاچوغه|#{n} د ميز کاچوغے",
             "terabit": "one#{n} ټرا بايټ|#{n} ټرا بايټس",
-            "terabit-per-second": "#{n} ټرا بايټس/s",
+            "terabit-per-second": "#{n} ټرا بايټس هره ثانیه",
             "terabyte": "one#{n} ټيرا بايټ|#{n} ټيرا بايټس",
             "terabyte-per-hour": "#{n} ټيرا بايټس/h",
-            "terabyte-per-second": "#{n} ټيرا بايټس/s",
+            "terabyte-per-second": "#{n} ټيرا بايټس هره ثانیه",
             "therm-us": "#{n} US therm",
             "ton": "one#{n} ټن|#{n} ټنز",
             "tonne": "one#{n} ميټرک ټن|#{n} ميټرک ټنز",
@@ -216,6 +216,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +249,8 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "",
+            "dot-per-centimeter": "",
             "dram": "#{n} dram fl",
             "drop": "#{n} څاڅک",
             "dunam": "#{n} دونم",
@@ -262,12 +262,11 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
-            "gallon": "#{n} gal",
+            "gallon": "#{n} ګيلن",
             "gallon-imperial": "#{n} gal Imp.",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
@@ -348,7 +347,7 @@
             "millimole-per-liter": "#{n} mmol/L",
             "millisecond": "#{n} ms",
             "milliwatt": "#{n} mW",
-            "minute": "#{n} min",
+            "minute": "#{n} دقیقه",
             "mole": "#{n} مول",
             "month": "one#{n} m|#{n} mths",
             "nanometer": "#{n} nm",
@@ -383,7 +382,7 @@
             "quarter": "#{n} q",
             "radian": "#{n} rad",
             "revolution": "#{n} rev",
-            "second": "#{n} s",
+            "second": "#{n} sec",
             "short-ton": "#{n} tn",
             "solar-luminosity": "#{n} L☉",
             "solar-mass": "#{n} M☉",
@@ -410,7 +409,7 @@
             "watt": "#{n} W",
             "week": "one#{n} w|#{n} wks",
             "yard": "#{n} yd",
-            "year": "#{n} y"
+            "year": "one#{n}/کال|#{n} کالونه"
         }
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/ps/dateformats.json b/js/data/locale/ps/dateformats.json
index 8a90d07501..c9764c29c5 100644
--- a/js/data/locale/ps/dateformats.json
+++ b/js/data/locale/ps/dateformats.json
@@ -14,25 +14,28 @@
                 "s": "‏M/d"
             },
             "dmw": {
-                "f": "EEEE MMMM d",
-                "l": "EEE MMMM d",
-                "m": "EE MMM d",
-                "s": "E ‏M/d"
+                "f": "EEEE د MMMM d",
+                "l": "EEE د MMMM d",
+                "m": "EE د MMM d",
+                "s": "E د ‏M/d"
             },
             "dmwy": {
                 "f": "EEEE د yyyy د MMMM d",
-                "l": "EEE د yyyy د MMMM d",
-                "m": "EE yyyy MMM d",
-                "s": "E yyyy/M/d"
+                "l": "EEE د yyyy MMMM d",
+                "m": "EE د yyyy MMM d",
+                "s": "E د yyyy/M/d"
             },
             "dmy": {
-                "f": "د yyyy د MMMM d",
-                "l": "د yyyy د MMMM d",
+                "f": "‏yyyy د MMMM d",
+                "l": "‏yyyy MMMM d",
                 "m": "‏yyyy MMM d",
                 "s": "‏yyyy/M/d"
             },
             "dw": {
-                "s": "E d"
+                "f": "EEEE د d",
+                "l": "EEE د d",
+                "m": "EE د d",
+                "s": "E د d"
             },
             "l": {
                 "f": "LLLL",
@@ -45,8 +48,8 @@
                 "m": "MMM"
             },
             "my": {
-                "f": "د yyyy د MMMM",
-                "l": "د yyyy د MMMM",
+                "f": "‏yyyy د MMMM",
+                "l": "‏yyyy MMMM",
                 "m": "‏yyyy MMM",
                 "s": "‏yyyy/M"
             },
@@ -56,50 +59,50 @@
         },
         "range": {
             "c00": {
-                "f": "د {sy} د {sm} {sd} {st} – {et}",
-                "l": "د {sy} د {sm} {sd} {st} – {et}",
+                "f": "‏{sy} د {sm} {sd} {st} – {et}",
+                "l": "‏{sy} {sm} {sd} {st} – {et}",
                 "m": "‏{sy} {sm} {sd} {st} – {et}",
                 "s": "‏{sy}/{sm}/{sd} {st} – {et}"
             },
             "c01": {
-                "f": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
-                "l": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
+                "f": "‏{sy} د {sm} {sd} {st} – ‏{ey} د {em} {ed} {et}",
+                "l": "‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}",
                 "m": "‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}",
                 "s": "‏{sy}/{sm}/{sd} {st} – ‏{ey}/{em}/{ed} {et}"
             },
             "c02": {
-                "f": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
-                "l": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
+                "f": "‏{sy} د {sm} {sd} {st} – ‏{ey} د {em} {ed} {et}",
+                "l": "‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}",
                 "m": "‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}",
                 "s": "‏{sy}/{sm}/{sd} {st} – ‏{ey}/{em}/{ed} {et}"
             },
             "c03": {
-                "f": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
-                "l": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
+                "f": "‏{sy} د {sm} {sd} {st} – ‏{ey} د {em} {ed} {et}",
+                "l": "‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}",
                 "m": "‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}",
                 "s": "‏{sy}/{sm}/{sd} {st} – ‏{ey}/{em}/{ed} {et}"
             },
             "c10": {
-                "f": "د {sy} د {sm} {sd} – {ed}",
-                "l": "د {sy} د {sm} {sd} – {ed}",
+                "f": "‏{sy} د {sm} {sd} – {ed}",
+                "l": "‏{sy} {sm} {sd} – {ed}",
                 "m": "‏{sy} {sm} {sd} – {ed}",
                 "s": "‏{sy}/{sm}/{sd} – {ed}"
             },
             "c11": {
-                "f": "د {sy} د {sm} {sd} – د {em} {ed}",
-                "l": "د {sy} د {sm} {sd} – د {em} {ed}",
+                "f": "‏{sy} د {sm} {sd} – ‏{em} {ed}",
+                "l": "‏{sy} {sm} {sd} – ‏{em} {ed}",
                 "m": "‏{sy} {sm} {sd} – ‏{ey} {em} {ed}",
                 "s": "‏{sy}/{sm}/{sd} – ‏{ey}/{em}/{ed}"
             },
             "c12": {
-                "f": "د {sy} د {sm} {sd} – د {ey} د {em} {ed}",
-                "l": "د {sy} د {sm} {sd} – د {ey} د {em} {ed}",
+                "f": "‏{sy} د {sm} {sd} – ‏{ey} د {em} {ed}",
+                "l": "‏{sy} {sm} {sd} – ‏{ey} {em} {ed}",
                 "m": "‏{sy} {sm} {sd} – ‏{ey} {em} {ed}",
                 "s": "‏{sy}/{sm}/{sd} – ‏{ey}/{em}/{ed}"
             },
             "c20": {
-                "f": "د {sy} د {sm} – د {ey} د {em}",
-                "l": "د {sy} د {sm} – د {ey} د {em}",
+                "f": "‏{sy} د {sm} – ‏{ey} د {em}",
+                "l": "‏{sy} {sm} – ‏{ey} {em}",
                 "m": "‏{sy} {sm} – ‏{ey} {em}",
                 "s": "‏{sy}/{sm} – ‏{ey}/{em}"
             },
diff --git a/js/data/locale/ps/sysres.json b/js/data/locale/ps/sysres.json
index e18a1ada0b..ecf0d19639 100644
--- a/js/data/locale/ps/sysres.json
+++ b/js/data/locale/ps/sysres.json
@@ -6,10 +6,10 @@
     "#in {num}s": "one#‏په {num} ثانيه کې|#‏په {num} ثانيه کې",
     "#in {num}w": "one#‏په {num} اونۍ کې|#‏په {num} اونۍ کې",
     "#in {num}y": "one#‏په {num} کال کې|#‏په {num} کالونو کې",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} ورځ|#{num}d",
     "#{num}d ago": "one#‏{num} ورځ مخکې|#‏{num} ورځې مخکې",
-    "#{num}h": "one#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#‏{num} ساعت مخکې|#‏{num} ساعت مخکې",
     "#{num}mi ago": "one#‏{num} دقيقه مخکې|#‏{num} دقيقه مخکې",
     "#{num}mo ago": "one#‏{num} مياشت مخکې|#‏{num} مياشت مخکې",
@@ -24,15 +24,15 @@
     "1#1 dy ago|#{num} dys ago": "one#‏{num} ورځ مخکې|#‏{num} ورځې مخکې",
     "1#1 dy|#{num} dys": "one#{num} ورځ|#{num}d",
     "1#1 hour ago|#{num} hours ago": "one#‏{num} ساعت مخکې|#‏{num} ساعتونه مخکې",
-    "1#1 hour|#{num} hours": "one#{num} h|#{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
     "1#1 hr ago|#{num} hrs ago": "one#‏{num} ساعت مخکې|#‏{num} ساعتونه مخکې",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
-    "1#1 millisecond|#{num} milliseconds": "one#{num} ms|#{num} ms",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
     "1#1 min ago|#{num} min ago": "one#‏{num} دقيقه مخکې|#‏{num} دقيقې مخکې",
     "1#1 minute ago|#{num} minutes ago": "one#‏{num} دقيقه مخکې|#‏{num} دقيقې مخکې",
-    "1#1 minute|#{num} minutes": "one#{num} min|#{num} min",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|#{num}m",
+    "1#1 minute|#{num} minutes": "one#{num} دقیقه|#{num} دقیقې",
+    "1#1 min|#{num} min": "one#{num} دقیقه|#{num} دقیقه",
+    "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "one#‏{num} مياشت مخکې|#‏{num} مياشتې مخکې",
     "1#1 month ago|#{num} months ago": "one#‏{num} مياشت مخکې|#‏{num} مياشتې مخکې",
     "1#1 month|#{num} months": "one#{num} مياشت|#{num} مياشتې",
@@ -40,8 +40,8 @@
     "1#1 mo|#{num} mos": "one#{num} m|#{num} m",
     "1#1 sec ago|#{num} sec ago": "one#‏{num} ثانيه مخکې|#‏{num} ثانيې مخکې",
     "1#1 second ago|#{num} seconds ago": "one#‏{num} ثانيه مخکې|#‏{num} ثانيې مخکې",
-    "1#1 second|#{num} seconds": "one#{num} s|#{num} s",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 second|#{num} seconds": "one#{num} s|#{num} ثانیې",
+    "1#1 sec|#{num} sec": "one#{num} sec|#{num} sec",
     "1#1 se|#{num} sec": "one#{num} s|#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#‏{num} اونۍ مخکې|#‏{num} اونۍ مخکې",
     "1#1 week|#{num} weeks": "one#اونۍ|#{num} اونۍ",
@@ -50,7 +50,7 @@
     "1#1 year ago|#{num} years ago": "one#‏{num} کال مخکې|#‏{num} کاله مخکې",
     "1#1 year|#{num} years": "one#{num} کال|#{num} کالونه",
     "1#1 yr ago|#{num} yrs ago": "one#‏{num} کال مخکې|#‏{num} کاله مخکې",
-    "1#1 yr|#{num} yrs": "one#{num} y|#{num} y",
+    "1#1 yr|#{num} yrs": "one#{num}/کال|#{num} کالونه",
     "1#in 1 day|#in {num} days": "one#‏په {num} ورځ کې|#‏په {num} ورځو کې",
     "1#in 1 dy|#in {num} dys": "one#‏په {num} ورځ کې|#‏په {num} ورځو کې",
     "1#in 1 hour|#in {num} hours": "one#‏په {num} ساعت کې|#‏په {num} ساعتو کې",
@@ -264,12 +264,12 @@
     "a1": "غ.و.",
     "a1-persian": "غ.و.",
     "durationLongDays": "one#{num} ورځ|#{num} ورځې",
-    "durationMediumHours": "one#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} w|#{num} w",
     "durationMediumYears": "one#{num} y|#{num} y",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|#{num}m",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "one#{num}m|#{num}m",
     "durationShortMonths": "one#{num} m|#{num} m",
     "finalSeparatorFull": ", ",
     "finalSeparatorLong": ", ",
diff --git a/js/data/locale/ps/unitfmt.json b/js/data/locale/ps/unitfmt.json
index 1cf364028b..8bc6540160 100644
--- a/js/data/locale/ps/unitfmt.json
+++ b/js/data/locale/ps/unitfmt.json
@@ -10,13 +10,14 @@
             "atmosphere": "one#{n} اتموسپير|#{n} اتموسپيرز",
             "bar": "#{n} bar",
             "barrel": "one#{n} بېرل|#{n} بېرلز",
+            "beaufort": "#بیوفورټ {n}",
             "bit": "one#{n} بټ|#{n} بټس",
-            "bit-per-second": "#{n} بټس/s",
+            "bit-per-second": "#{n} بټس هره ثانیه",
             "british-thermal-unit": "one#برتانوي ترمل یونټ|#{n} برتانوي ترمل يونټس",
-            "bushel": "one#{n} bu|#{n} بوشیل",
+            "bushel": "#{n} بوشیل",
             "byte": "one#{n} بايټ|#{n} بايټس",
             "byte-per-hour": "#{n} بايټس/h",
-            "byte-per-second": "#{n} بايټس/s",
+            "byte-per-second": "#{n} بايټس هره ثانیه",
             "calorie": "one#{n} کيلري|#{n} کيلريز",
             "candela": "#{n} cd",
             "carat": "#{n} قيراط",
@@ -33,42 +34,41 @@
             "cubic-mile": "#{n} مکعب ميل",
             "cubic-yard": "#{n} مکعب ګز",
             "cup": "one#{n} پياله|#{n} پيالې",
-            "cup-metric": "#{n} mc",
+            "cup-metric": "#{n} میټریک کپ",
             "dalton": "one#{n} ډالټن|#{n} ډالټنز",
             "day": "one#{n} ورځ|#{n} ورځې",
             "decade": "one#{n} لسيزه|#{n} لسيزې",
             "deciliter": "one#{n} ډيسي ليټر|#{n} ډيسي ليټرز",
             "decimeter": "one#{n} ډيسي متر|#{n} ډيسي متره",
             "degree": "#{n} درجې",
-            "dessert-spoon": "one#{n} dessert spoon|#{n} مچ چمچ",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dessert-spoon": "#{n} مچ چمچ",
+            "dessert-spoon-imperial": "one#{n} Imp. dessert spoon|#{n} Imp. dessert spoons",
+            "dot": "one#{n} نقطه|#{n} نقطې",
+            "dot-per-centimeter": "",
             "dram": "#{n} ډرام",
             "drop": "#{n} څاڅک",
             "dunam": "one#{n} دونم|#{n} دونمز",
             "earth-mass": "one#{n} د زمکې حجم|#{n} د زمکې حجمونه",
-            "earth-radius": "#{n} R⊕",
+            "earth-radius": "#{n} د ځمکې وړانګې",
             "electronvolt": "one#{n} اليکټران وولټ|#{n} اليکټران وولټس",
             "em": "#{n} em",
             "fahrenheit": "#{n} درجې فارنهايټ",
             "fathom": "one#{n} fathom|#{n} فتومونه",
-            "fluid-ounce": "#{n} fl oz",
+            "fluid-ounce": "#{n} مایع اونس",
             "fluid-ounce-imperial": "#{n} امپيريل مايع اونس",
             "foodcalorie": "one#{n} کيلري|#{n} کيلريز",
             "foot": "one#{n} فټ|#{n} فټه",
-            "foot-per-second": "#{n} فټه/s",
+            "foot-per-second": "#{n} فټه هره ثانیه",
             "furlong": "one#{n} fur|#{n} فرلانګونه",
             "g-force": "#{n} د جاذبې قوه",
             "gallon": "one#{n} ګيلن|#{n} ګيلنز",
             "gallon-imperial": "#{n} gal Imp.",
             "generic": "#{n}°",
             "gigabit": "one#{n} ګيګا بټ|#{n} ګيګا بټس",
-            "gigabit-per-second": "#{n} ګيګا بټس/s",
+            "gigabit-per-second": "#{n} ګيګا بټس هره ثانیه",
             "gigabyte": "#{n} ګيګا بايټس",
             "gigabyte-per-hour": "#{n} ګيګا بايټس/h",
-            "gigabyte-per-second": "#{n} ګيګا بايټس/s",
+            "gigabyte-per-second": "#{n} ګيګا بايټس هره ثانیه",
             "gigahertz": "#{n} ګيګا هرټز",
             "gigawatt": "one#{n} ګيګا واټ|#{n} ګيګا واټس",
             "grain": "#{n} grain",
@@ -87,10 +87,10 @@
             "karat": "#{n} قيراط",
             "kelvin": "one#{n} کيلون|#{n} کيلونز",
             "kilobit": "one#{n} کيلو بټ|#{n} کيلو بټس",
-            "kilobit-per-second": "#{n} کيلو بټس/s",
+            "kilobit-per-second": "#{n} کيلو بټس هره ثانیه",
             "kilobyte": "one#{n} کيلو بايټ|#{n} کيلو بايټس",
             "kilobyte-per-hour": "#{n} کيلو بايټس/h",
-            "kilobyte-per-second": "#{n} کيلو بايټس/s",
+            "kilobyte-per-second": "#{n} کيلو بايټس هره ثانیه",
             "kilocalorie": "one#{n} کيلو کيلري|#{n} کيلو کيلريز",
             "kilogram": "one#{n} کيلو ګرام|#{n} کيلو ګرامز",
             "kilohertz": "#{n} کيلو هرټز",
@@ -98,7 +98,7 @@
             "kilometer": "one#{n} کيلومتر|#{n} کيلومتره",
             "kilometer-per-hour": "#{n} کيلو متر في ساعت",
             "kilometer-per-liter": "#{n} کيلومتره في ليټر",
-            "kilometer-per-second": "#{n} کيلومتره/s",
+            "kilometer-per-second": "#{n} کيلومتره هره ثانیه",
             "kilopascal": "one#{n} کيلو پاسکیل|#{n} کيلو پاسکیلز",
             "kilowatt": "one#{n} کيلو واټ|#{n} کيلو واټس",
             "kilowatt-hour": "one#{n} کيلو واټ ساعت|#{n} کيلو واټ ساعته",
@@ -111,10 +111,10 @@
             "lumen": "#{n} lm",
             "lux": "#{n} lx",
             "megabit": "one#{n} ميګا بټ|#{n} ميګا بټس",
-            "megabit-per-second": "#{n} ميګا بټس/s",
+            "megabit-per-second": "#{n} ميګا بټس هره ثانیه",
             "megabyte": "one#{n} ميګا بايټ|#{n} ميګا بايټس",
             "megabyte-per-hour": "#{n} ميګا بايټس/h",
-            "megabyte-per-second": "#{n} ميګا بايټس/s",
+            "megabyte-per-second": "#{n} ميګا بايټس هره ثانیه",
             "megahertz": "#{n} ميګا هرټز",
             "megaliter": "one#{n} ميګا ليټر|#{n} ميګا ليټرز",
             "megapascal": "one#{n} ميګا پاسکیل|#{n} ميګا پاسکیلز",
@@ -130,7 +130,7 @@
             "mile-per-gallon": "one#{n} ميل في ګيلن|#{n} ميلز في ګيلن",
             "mile-per-gallon-imperial": "one#{n} ميل في ايمپيريل ګيلن|#{n} ميلز في ايمپيريل ګيلن",
             "mile-per-hour": "#{n} ميل في ساعت",
-            "mile-per-second": "#{n} ميلونه/s",
+            "mile-per-second": "#{n} ميلونه هره ثانیه",
             "mile-scandinavian": "one#{n} سکېنډنيوين ميل|#{n} سکېنډنيوين ميلونه",
             "milliampere": "one#{n} ملي ايمپير|#{n} ملي ايمپيرز",
             "millibar": "one#{n} ملي بار|#{n} ملي بارز",
@@ -142,7 +142,7 @@
             "millimole-per-liter": "#{n} ملي مول في ليټر",
             "millisecond": "#{n} ms",
             "milliwatt": "one#{n} ملي واټ|#{n} ملي واټس",
-            "minute": "#{n} min",
+            "minute": "one#{n} دقیقه|#{n} دقیقې",
             "mole": "one#{n} مول|#{n} مولز",
             "month": "one#{n} مياشت|#{n} مياشتې",
             "nanometer": "one#{n} نينو متر|#{n} نينو متره",
@@ -153,7 +153,7 @@
             "ohm": "one#{n} اوهم|#{n} اوهمز",
             "ounce": "one#{n} اونس|#{n} اونسز",
             "ounce-troy": "one#{n} ټرای اونس|#{n} ټرای اونسز",
-            "parsec": "one#{n} في ثانيه|#{n} في ثانيې",
+            "parsec": "one#{n} پارسيکس|#{n} في ثانيې",
             "pascal": "#{n} Pa",
             "percent": "#{n} سلنه",
             "permille": "#{n} في ميل",
@@ -163,10 +163,10 @@
             "picometer": "one#{n} پيکو متر|#{n} پيکو متره",
             "pinch": "#{n} چنه",
             "pint": "#{n} pt",
-            "pint-metric": "#{n} mpt",
+            "pint-metric": "one#{n} metric pint|#{n} metric pints",
             "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-centimeter": "one#{n} پکسل فی سانتي متره|#{n} پکسلز فی سانتي متره",
+            "pixel-per-inch": "one#{n} پکسل فی انچ|#{n} پکسلز فی انچ",
             "point": "one#{n} نمره|#{n} نمرې",
             "pound": "one#{n} پاونډ|#{n} پاونډز",
             "pound-force": "one#{n} د قوې پاونډ|#{n} د قوې پاونډز",
@@ -177,7 +177,7 @@
             "quarter": "#{n} q",
             "radian": "#{n} راديان",
             "revolution": "#{n} انقلاب",
-            "second": "#{n} s",
+            "second": "one#{n} s|#{n} ثانیې",
             "short-ton": "one#{n} ټن|#{n} ټنز",
             "solar-luminosity": "one#{n} لمريز ځلښت|#{n} لمريز ځلښتونه",
             "solar-mass": "#{n} لمريز حجم",
@@ -193,10 +193,10 @@
             "tablespoon": "#{n} tbsp",
             "teaspoon": "one#{n} د ميز کاچوغه|#{n} د ميز کاچوغې",
             "terabit": "one#{n} ټرا بايټ|#{n} ټرا بايټس",
-            "terabit-per-second": "#{n} ټرا بايټس/s",
+            "terabit-per-second": "#{n} ټرا بايټس هره ثانیه",
             "terabyte": "one#{n} ټيرا بايټ|#{n} ټيرا بايټس",
             "terabyte-per-hour": "#{n} ټيرا بايټس/h",
-            "terabyte-per-second": "#{n} ټيرا بايټس/s",
+            "terabyte-per-second": "#{n} ټيرا بايټس هره ثانیه",
             "therm-us": "#{n} US therm",
             "ton": "one#{n} ټن|#{n} ټنز",
             "tonne": "one#{n} ميټرک ټن|#{n} ميټرک ټنز",
@@ -216,6 +216,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +249,8 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "",
+            "dot-per-centimeter": "",
             "dram": "#{n} dram fl",
             "drop": "#{n} څاڅک",
             "dunam": "#{n} دونم",
@@ -262,12 +262,11 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
-            "gallon": "#{n} gal",
+            "gallon": "#{n} ګيلن",
             "gallon-imperial": "#{n} gal Imp.",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
@@ -348,7 +347,7 @@
             "millimole-per-liter": "#{n} mmol/L",
             "millisecond": "#{n} ms",
             "milliwatt": "#{n} mW",
-            "minute": "#{n} min",
+            "minute": "#{n} دقیقه",
             "mole": "#{n} مول",
             "month": "one#{n} m|#{n} mths",
             "nanometer": "#{n} nm",
@@ -383,7 +382,7 @@
             "quarter": "#{n} q",
             "radian": "#{n} rad",
             "revolution": "#{n} rev",
-            "second": "#{n} s",
+            "second": "#{n} sec",
             "short-ton": "#{n} tn",
             "solar-luminosity": "#{n} L☉",
             "solar-mass": "#{n} M☉",
@@ -410,7 +409,7 @@
             "watt": "#{n} W",
             "week": "one#{n} w|#{n} wks",
             "yard": "#{n} yd",
-            "year": "#{n} y"
+            "year": "one#{n}/کال|#{n} کالونه"
         }
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/AO/unitfmt.json b/js/data/locale/pt/AO/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/AO/unitfmt.json
+++ b/js/data/locale/pt/AO/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/CH/unitfmt.json b/js/data/locale/pt/CH/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/CH/unitfmt.json
+++ b/js/data/locale/pt/CH/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/CV/unitfmt.json b/js/data/locale/pt/CV/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/CV/unitfmt.json
+++ b/js/data/locale/pt/CV/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/GQ/unitfmt.json b/js/data/locale/pt/GQ/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/GQ/unitfmt.json
+++ b/js/data/locale/pt/GQ/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/GW/unitfmt.json b/js/data/locale/pt/GW/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/GW/unitfmt.json
+++ b/js/data/locale/pt/GW/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/LU/unitfmt.json b/js/data/locale/pt/LU/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/LU/unitfmt.json
+++ b/js/data/locale/pt/LU/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/MO/unitfmt.json b/js/data/locale/pt/MO/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/MO/unitfmt.json
+++ b/js/data/locale/pt/MO/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/MZ/unitfmt.json b/js/data/locale/pt/MZ/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/MZ/unitfmt.json
+++ b/js/data/locale/pt/MZ/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/PT/unitfmt.json b/js/data/locale/pt/PT/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/PT/unitfmt.json
+++ b/js/data/locale/pt/PT/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/ST/unitfmt.json b/js/data/locale/pt/ST/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/ST/unitfmt.json
+++ b/js/data/locale/pt/ST/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/TL/unitfmt.json b/js/data/locale/pt/TL/unitfmt.json
index db75b5cdd7..76ecba0672 100644
--- a/js/data/locale/pt/TL/unitfmt.json
+++ b/js/data/locale/pt/TL/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,11 +248,10 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "one#{n}°|#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp.",
-            "dot": "#{n} p",
-            "dot-per-centimeter": "#{n} ppcm",
+            "dot": "one#{n} ponto|#{n} pontos",
             "dot-per-inch": "#{n} ppp",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "one#{n} onça fluida imp.|#{n} onças fluidas imp.",
             "foodcalorie": "#{n} kcal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
diff --git a/js/data/locale/pt/sysres.json b/js/data/locale/pt/sysres.json
index 2f6ed3253d..1ff3d91c81 100644
--- a/js/data/locale/pt/sysres.json
+++ b/js/data/locale/pt/sysres.json
@@ -6,14 +6,14 @@
     "#in {num}s": "one#em {num} seg.|#em {num} seg.",
     "#in {num}w": "one#em {num} sem.|#em {num} sem.",
     "#in {num}y": "one#em {num} ano|#em {num} anos",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} dia|#{num} dias",
     "#{num}d ago": "one#há {num} dia|#há {num} dias",
-    "#{num}h": "one#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#há {num} h|#há {num} h",
     "#{num}mi ago": "one#há {num} min.|#há {num} min.",
     "#{num}mo ago": "one#há {num} mês|#há {num} meses",
-    "#{num}s": "one#{num} s|#{num} s",
+    "#{num}s": "#{num} s",
     "#{num}s ago": "one#há {num} seg.|#há {num} seg.",
     "#{num}w": "one#{num} sem.|#{num} sem.",
     "#{num}w ago": "one#há {num} sem.|#há {num} sem.",
@@ -26,13 +26,13 @@
     "1#1 hour ago|#{num} hours ago": "one#há {num} hora|#há {num} horas",
     "1#1 hour|#{num} hours": "one#{num} hora|#{num} horas",
     "1#1 hr ago|#{num} hrs ago": "one#há {num} hora|#há {num} horas",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milissegundo|#{num} milissegundos",
     "1#1 min ago|#{num} min ago": "one#há {num} minuto|#há {num} minutos",
     "1#1 minute ago|#{num} minutes ago": "one#há {num} minuto|#há {num} minutos",
     "1#1 minute|#{num} minutes": "one#{num} minuto|#{num} minutos",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "one#há {num} mês|#há {num} meses",
     "1#1 month ago|#{num} months ago": "one#há {num} mês|#há {num} meses",
     "1#1 month|#{num} months": "one#{num} mês|#{num} meses",
@@ -41,8 +41,8 @@
     "1#1 sec ago|#{num} sec ago": "one#há {num} segundo|#há {num} segundos",
     "1#1 second ago|#{num} seconds ago": "one#há {num} segundo|#há {num} segundos",
     "1#1 second|#{num} seconds": "one#{num} segundo|#{num} segundos",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 se|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#há {num} semana|#há {num} semanas",
     "1#1 week|#{num} weeks": "one#{num} semana|#{num} semanas",
     "1#1 wk ago|#{num} wks ago": "one#há {num} semana|#há {num} semanas",
@@ -150,12 +150,12 @@
     "NN8": "ag",
     "NN9": "se",
     "durationLongDays": "one#{num} dia|#{num} dias",
-    "durationMediumHours": "one#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} sem.|#{num} sem.",
     "durationMediumYears": "one#{num} ano|#{num} anos",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|#{num} min",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
     "durationShortMonths": "one#{num} mês|#{num} meses",
     "finalSeparatorFull": " e ",
     "finalSeparatorLong": " e ",
diff --git a/js/data/locale/pt/unitfmt.json b/js/data/locale/pt/unitfmt.json
index c1971b2d4c..741c496943 100644
--- a/js/data/locale/pt/unitfmt.json
+++ b/js/data/locale/pt/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barril|#{n} barris",
+            "beaufort": "#{n} Beaufort",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits por segundo",
             "british-thermal-unit": "one#{n} unidade térmica britânica|#{n} unidades térmicas britânicas",
@@ -57,7 +58,7 @@
             "fathom": "one#{n} braça|#{n} braças",
             "fluid-ounce": "one#{n} onça fluida|#{n} onças fluidas",
             "fluid-ounce-imperial": "one#{n} onça fluida imperial|#{n} onças fluidas imperiais",
-            "foodcalorie": "one#{n} Caloria|#{n} Calorias",
+            "foodcalorie": "one#{n} caloria|#{n} calorias",
             "foot": "one#{n} pé|#{n} pés",
             "foot-per-second": "#{n} pés por segundo",
             "furlong": "one#{n} furlong|#{n} furlongs",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n}B",
             "bit": "#{n} bits",
             "bit-per-second": "#{n} bits/s",
             "british-thermal-unit": "#{n} BTU",
@@ -246,12 +248,11 @@
             "decade": "#{n} déc.",
             "deciliter": "#{n} dl",
             "decimeter": "#{n} dm",
-            "degree": "#{n}°",
+            "degree": "#{n} °",
             "dessert-spoon": "#{n} csb",
             "dessert-spoon-imperial": "#{n} csb imp",
-            "dot": "one#{n} p|#{n} pts",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "one#{n} ponto|#{n} pts",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
             "drop": "one#{n} gota|#{n} gotas",
             "dunam": "one#{n} dunam|#{n} dunans",
@@ -264,8 +265,8 @@
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
             "foodcalorie": "#{n} cal",
-            "foot": "one#{n} pé|#{n} pés",
-            "foot-per-second": "#{n} pés/s",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
             "g-force": "#{n} G",
             "gallon": "#{n} gal",
@@ -288,7 +289,7 @@
             "hour": "#{n} h",
             "inch": "#{n} pol.",
             "inch-ofhg": "#{n} inHg",
-            "item": "#{n} itens",
+            "item": "one#{n} item|#{n} itens",
             "jigger": "one#{n} dosador|#{n} dosadores",
             "joule": "#{n} J",
             "karat": "#{n} k",
diff --git a/js/data/locale/qu/dateformats.json b/js/data/locale/qu/dateformats.json
index c905c82471..eadcb2b22b 100644
--- a/js/data/locale/qu/dateformats.json
+++ b/js/data/locale/qu/dateformats.json
@@ -5,50 +5,43 @@
                 "f": "d",
                 "l": "d",
                 "m": "d",
-                "s": "dd"
+                "s": "d"
             },
             "dm": {
                 "l": "d MMMM",
-                "m": "d MMM",
-                "s": "dd/MM"
+                "m": "d MMM"
             },
             "dmw": {
                 "f": "EEEE, d MMMM",
                 "l": "EEE, d MMMM",
                 "m": "EE, d MMM",
-                "s": "E, dd/MM"
+                "s": "E, d/M"
             },
             "dmwy": {
                 "f": "EEEE, d MMMM, yyyy",
                 "l": "EEE, d MMMM yyyy",
                 "m": "EE, d MMM yyyy",
-                "s": "E, dd/MM/yyyy"
+                "s": "E, d/M/yy"
             },
             "dmy": {
                 "f": "d MMMM, yyyy",
                 "l": "d MMMM yyyy",
-                "m": "d MMM yyyy",
-                "s": "dd/MM/yyyy"
+                "m": "d MMM yyyy"
             },
             "dw": {
                 "f": "EEEE, d",
                 "l": "EEE, d",
                 "m": "EE, d",
-                "s": "E, dd"
+                "s": "E, d"
             },
             "m": {
                 "l": "MMMM",
-                "m": "MMM",
-                "s": "MM"
+                "m": "MMM"
             },
             "my": {
                 "f": "MMMM, yyyy",
                 "l": "MMMM yyyy",
-                "m": "MMM yyyy",
-                "s": "MM/yyyy"
-            },
-            "y": {
-                "s": "yyyy"
+                "m": "MMM yyyy"
             }
         },
         "order": {
@@ -109,7 +102,11 @@
         },
         "time": {
             "12": {
-                "ah": "h a"
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
             },
             "24": {
                 "ah": "HH",
diff --git a/js/data/locale/qu/unitfmt.json b/js/data/locale/qu/unitfmt.json
index f80af6422f..6b1afb1710 100644
--- a/js/data/locale/qu/unitfmt.json
+++ b/js/data/locale/qu/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} barril",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit por segundo",
             "british-thermal-unit": "#{n} Btu",
@@ -56,7 +57,7 @@
             "fathom": "#{n} fathoms",
             "fluid-ounce": "#{n} US Onza líquida",
             "fluid-ounce-imperial": "#{n} UK Onza líquida",
-            "foodcalorie": "#{n} kcal",
+            "foodcalorie": "#{n} calorias",
             "foot": "#{n} pie",
             "foot-per-second": "#{n} pie por segundo",
             "furlong": "#{n} furlongs",
@@ -199,7 +200,7 @@
             "terabyte-per-second": "#{n} TB por segundo",
             "therm-us": "#{n} US therm",
             "ton": "#{n} tn",
-            "tonne": "#{n} t",
+            "tonne": "#{n} toneladas metricas",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} semana",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,6 @@
             "dessert-spoon": "#{n} cucharilla",
             "dessert-spoon-imperial": "#{n} Imp cucharilla",
             "dot": "#{n} punto",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} trago fluido",
             "drop": "#{n} gota",
             "dunam": "#{n} dunam",
@@ -262,7 +262,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/quc/unitfmt.json b/js/data/locale/quc/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/quc/unitfmt.json
+++ b/js/data/locale/quc/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/raj/unitfmt.json b/js/data/locale/raj/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/raj/unitfmt.json
+++ b/js/data/locale/raj/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/rangeToScript.json b/js/data/locale/rangeToScript.json
index 5322d5da31..a0ea8e0a49 100644
--- a/js/data/locale/rangeToScript.json
+++ b/js/data/locale/rangeToScript.json
@@ -1956,11 +1956,6 @@
     [
         "Zyyy",
         12272,
-        12283
-    ],
-    [
-        "Zyyy",
-        12288,
         12292
     ],
     [
@@ -2074,6 +2069,10 @@
         12736,
         12771
     ],
+    [
+        "Zyyy",
+        12783
+    ],
     [
         "Kana",
         12784,
@@ -4597,6 +4596,11 @@
         183984,
         191456
     ],
+    [
+        "Hani",
+        191472,
+        192093
+    ],
     [
         "Hani",
         194560,
diff --git a/js/data/locale/rhg/unitfmt.json b/js/data/locale/rhg/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/rhg/unitfmt.json
+++ b/js/data/locale/rhg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/rif/unitfmt.json b/js/data/locale/rif/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/rif/unitfmt.json
+++ b/js/data/locale/rif/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/rm/ctrynames.json b/js/data/locale/rm/ctrynames.json
index b5388f7332..fb9a5abcfb 100644
--- a/js/data/locale/rm/ctrynames.json
+++ b/js/data/locale/rm/ctrynames.json
@@ -51,6 +51,7 @@
     "Bosnia ed Erzegovina": "BA",
     "Botswana": "BW",
     "Brasilia": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bulgaria": "BG",
     "Burkina Faso": "BF",
@@ -268,7 +269,6 @@
     "Tailanda": "TH",
     "Taiwan": "TW",
     "Tansania": "TZ",
-    "Territori Britannic en l’Ocean Indic": "IO",
     "Territori Palestinais": "PS",
     "Territoris Franzos Meridiunals": "TF",
     "Timor da l’Ost": "TL",
diff --git a/js/data/locale/rm/ctryreverse.json b/js/data/locale/rm/ctryreverse.json
index dc539a7a8d..203b94ace1 100644
--- a/js/data/locale/rm/ctryreverse.json
+++ b/js/data/locale/rm/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Insla da Man",
     "IN": "India",
-    "IO": "Territori Britannic en l’Ocean Indic",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irac",
     "IR": "Iran",
     "IS": "Islanda",
diff --git a/js/data/locale/rm/sysres.json b/js/data/locale/rm/sysres.json
index 5c23cff16a..038bcbff55 100644
--- a/js/data/locale/rm/sysres.json
+++ b/js/data/locale/rm/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "#+{num} s",
     "#in {num}w": "#+{num} w",
     "#in {num}y": "#+{num} y",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} dis|#{num} dis",
     "#{num}d ago": "#-{num} d",
     "#{num}h": "one#{num} uras|#{num} uras",
diff --git a/js/data/locale/rm/unitfmt.json b/js/data/locale/rm/unitfmt.json
index 0b905474e1..3c874a9c77 100644
--- a/js/data/locale/rm/unitfmt.json
+++ b/js/data/locale/rm/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits per secunda",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/rn/ctrynames.json b/js/data/locale/rn/ctrynames.json
index 147eeec28c..6683d947aa 100644
--- a/js/data/locale/rn/ctrynames.json
+++ b/js/data/locale/rn/ctrynames.json
@@ -40,6 +40,7 @@
     "Bosiniya na Herigozevine": "BA",
     "Botswana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Buligariya": "BG",
     "Burezili": "BR",
     "Burukina Faso": "BF",
@@ -99,7 +100,6 @@
     "Ibirwa bya Keyimani": "KY",
     "Ikerene": "UA",
     "Indoneziya": "ID",
-    "Intara y’Ubwongereza yo mu birwa by’Abahindi": "IO",
     "Iraki": "IQ",
     "Irani": "IR",
     "Irigwe": "UY",
diff --git a/js/data/locale/rn/ctryreverse.json b/js/data/locale/rn/ctryreverse.json
index 3fc13d16d2..2e6ec8f232 100644
--- a/js/data/locale/rn/ctryreverse.json
+++ b/js/data/locale/rn/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isiraheli",
     "IM": "Isle of Man",
     "IN": "Ubuhindi",
-    "IO": "Intara y’Ubwongereza yo mu birwa by’Abahindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irani",
     "IS": "Ayisilandi",
diff --git a/js/data/locale/rn/unitfmt.json b/js/data/locale/rn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/rn/unitfmt.json
+++ b/js/data/locale/rn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ro/MD/sysres.json b/js/data/locale/ro/MD/sysres.json
index 1aad71cd99..094610d855 100644
--- a/js/data/locale/ro/MD/sysres.json
+++ b/js/data/locale/ro/MD/sysres.json
@@ -22,6 +22,7 @@
     "EEE4": "Joi",
     "EEE5": "Vin",
     "EEE6": "Sâm",
+    "G-1": "î.e.n.",
     "durationMediumYears": "one#{num} an|few#{num} ani|#{num} ani",
     "durationShortMinutes": "one#{num} min.|few#{num} min.|#{num} min.",
     "durationShortMonths": "one#{num} lună|few#{num} luni|#{num} luni"
diff --git a/js/data/locale/ro/sysres.json b/js/data/locale/ro/sysres.json
index c8a3a2e0f3..d435f5e557 100644
--- a/js/data/locale/ro/sysres.json
+++ b/js/data/locale/ro/sysres.json
@@ -6,14 +6,14 @@
     "#in {num}s": "one#peste {num} sec.|few#peste {num} sec.|#peste {num} sec.",
     "#in {num}w": "one#peste {num} săpt.|few#peste {num} săpt.|#peste {num} săpt.",
     "#in {num}y": "one#peste {num} an|few#peste {num} ani|#peste {num} de ani",
-    "#{num} ms": "one#{num} ms|few#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} z|few#{num} z|#{num} z",
     "#{num}d ago": "one#acum {num} zi|few#acum {num} zile|#acum {num} de zile",
     "#{num}h": "one#{num} h|few#{num} h|#{num} h",
     "#{num}h ago": "one#acum {num} h|few#acum {num} h|#acum {num} h",
     "#{num}mi ago": "one#acum {num} min.|few#acum {num} min.|#acum {num} min.",
     "#{num}mo ago": "one#acum {num} lună|few#acum {num} luni|#acum {num} luni",
-    "#{num}s": "one#{num} s|few#{num} s|#{num} s",
+    "#{num}s": "#{num} s",
     "#{num}s ago": "one#acum {num} sec.|few#acum {num} sec.|#acum {num} sec.",
     "#{num}w": "one#{num} săpt.|few#{num} săpt.|#{num} săpt.",
     "#{num}w ago": "one#acum {num} săpt.|few#acum {num} săpt.|#acum {num} săpt.",
@@ -41,8 +41,8 @@
     "1#1 sec ago|#{num} sec ago": "one#acum {num} secundă|few#acum {num} secunde|#acum {num} de secunde",
     "1#1 second ago|#{num} seconds ago": "one#acum {num} secundă|few#acum {num} secunde|#acum {num} de secunde",
     "1#1 second|#{num} seconds": "one#{num} secundă|few#{num} secunde|#{num} de secunde",
-    "1#1 sec|#{num} sec": "one#{num} s|few#{num} s|#{num} s",
-    "1#1 se|#{num} sec": "one#{num} s|few#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#acum {num} săptămână|few#acum {num} săptămâni|#acum {num} de săptămâni",
     "1#1 week|#{num} weeks": "one#{num} săptămână|few#{num} săptămâni|#{num} de săptămâni",
     "1#1 wk ago|#{num} wks ago": "one#acum {num} săptămână|few#acum {num} săptămâni|#acum {num} de săptămâni",
@@ -154,10 +154,10 @@
     "a1": "p.m.",
     "durationLongDays": "one#{num} zi|few#{num} zile|#{num} zile",
     "durationMediumHours": "one#{num} h|few#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|few#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} săpt.|few#{num} săpt.|#{num} săpt.",
     "durationMediumYears": "one#{num} a|few#{num} a|#{num} a",
-    "durationShortMillis": "one#{num} ms|few#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} m|few#{num} m|#{num} m",
     "durationShortMonths": "one#{num} l|few#{num} l|#{num} l",
     "finalSeparatorFull": ", ",
diff --git a/js/data/locale/ro/unitfmt.json b/js/data/locale/ro/unitfmt.json
index 34f87d110e..65b2c048fa 100644
--- a/js/data/locale/ro/unitfmt.json
+++ b/js/data/locale/ro/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosferă|few#{n} atmosfere|#{n} de atmosfere",
             "bar": "one#{n} bar|few#{n} bari|#{n} de bari",
             "barrel": "one#{n} baril|few#{n} barili|#{n} de barili",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|few#{n} biți|#{n} de biți",
             "bit-per-second": "#{n} de biți pe secundă",
             "british-thermal-unit": "one#{n} unitate termică britanică|few#{n} unități termice britanice|#{n} de unități termice britanice",
@@ -199,7 +200,7 @@
             "terabyte-per-second": "#{n} de terabyți pe secundă",
             "therm-us": "one#{n} therm S.U.A.|few#{n} thermi S.U.A.|#{n} de thermi S.U.A.",
             "ton": "one#{n} tonă scurtă|few#{n} tone scurte|#{n} de tone scurte",
-            "tonne": "one#{n} tonă|few#{n} tone|#{n} de tone",
+            "tonne": "one#{n} tonă metrică|few#{n} tone metrice|#{n} de tone metrice",
             "volt": "one#{n} volt|few#{n} volți|#{n} de volți",
             "watt": "one#{n} watt|few#{n} wați|#{n} de wați",
             "week": "one#{n} săptămână|few#{n} săptămâni|#{n} de săptămâni",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
@@ -247,8 +249,8 @@
             "decimeter": "#{n} dm",
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "one#{n} pct|few#{n} pct.|#{n} de pct.",
+            "dessert-spoon-imperial": "#{n} dsp im",
+            "dot": "one#{n} pct|#{n} pct.",
             "dot-per-centimeter": "#{n} dpc",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
@@ -262,7 +264,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/rof/ctrynames.json b/js/data/locale/rof/ctrynames.json
index 16d65c0c33..dd6becfadd 100644
--- a/js/data/locale/rof/ctrynames.json
+++ b/js/data/locale/rof/ctrynames.json
@@ -34,6 +34,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -61,7 +62,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/rof/ctryreverse.json b/js/data/locale/rof/ctryreverse.json
index 935a049770..23e73b1101 100644
--- a/js/data/locale/rof/ctryreverse.json
+++ b/js/data/locale/rof/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/rof/unitfmt.json b/js/data/locale/rof/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/rof/unitfmt.json
+++ b/js/data/locale/rof/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ru/unitfmt.json b/js/data/locale/ru/unitfmt.json
index c6adad82e3..ab144dc07c 100644
--- a/js/data/locale/ru/unitfmt.json
+++ b/js/data/locale/ru/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} атмосфера|many#{n} атмосфер|#{n} атмосферы",
             "bar": "one#{n} бар|many#{n} бар|#{n} бара",
             "barrel": "one#{n} баррель|many#{n} баррелей|#{n} барреля",
+            "beaufort": "one#{n} балл Бофорта|many#{n} баллов Бофорта|#{n} балла Бофорта",
             "bit": "one#{n} бит|many#{n} бит|#{n} бита",
             "bit-per-second": "#{n} бита в секунду",
             "british-thermal-unit": "one#{n} британская тепловая единица|few#{n} британские тепловые единицы|many#{n} британских тепловых единиц|#{n} британской тепловой единицы",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} атм",
             "bar": "#{n} бар",
             "barrel": "#{n} барр.",
+            "beaufort": "#{n} Бфт",
             "bit": "one#{n} бит|many#{n} бит|#{n} бита",
             "bit-per-second": "#{n} бита/c",
             "british-thermal-unit": "#{n} БТЕ",
@@ -262,7 +264,6 @@
             "fathom": "one#{n} мор. сажень|many#{n} мор. саженей|#{n} мор. сажени",
             "fluid-ounce": "#{n} ам. жидк. унц.",
             "fluid-ounce-imperial": "#{n} имп. жидк. унц.",
-            "foodcalorie": "#{n} ккал",
             "foot": "#{n} фт",
             "foot-per-second": "#{n} фт/c",
             "furlong": "#{n} фурл.",
diff --git a/js/data/locale/rw/unitfmt.json b/js/data/locale/rw/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/rw/unitfmt.json
+++ b/js/data/locale/rw/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/rwk/ctrynames.json b/js/data/locale/rwk/ctrynames.json
index f17a4fc647..2f48370426 100644
--- a/js/data/locale/rwk/ctrynames.json
+++ b/js/data/locale/rwk/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/rwk/ctryreverse.json b/js/data/locale/rwk/ctryreverse.json
index 3919b41208..894a6816e2 100644
--- a/js/data/locale/rwk/ctryreverse.json
+++ b/js/data/locale/rwk/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/rwk/unitfmt.json b/js/data/locale/rwk/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/rwk/unitfmt.json
+++ b/js/data/locale/rwk/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sa/unitfmt.json b/js/data/locale/sa/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sa/unitfmt.json
+++ b/js/data/locale/sa/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sah/unitfmt.json b/js/data/locale/sah/unitfmt.json
index 2bce7947ce..c6502477f6 100644
--- a/js/data/locale/sah/unitfmt.json
+++ b/js/data/locale/sah/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} биит",
             "bit-per-second": "#сөкүүндэҕэ {n} биит",
             "british-thermal-unit": "#{n} Btu",
@@ -53,7 +54,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Калорий",
             "foot": "#{n} ft",
             "foot-per-second": "#сөкүүндэҕэ {n} ft",
             "furlong": "#{n} fur",
@@ -213,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} бит",
             "bit-per-second": "#{n} бит/сөк",
             "british-thermal-unit": "#{n} Btu",
@@ -256,7 +257,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} Кал",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/сөк",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/saq/ctrynames.json b/js/data/locale/saq/ctrynames.json
index f17a4fc647..2f48370426 100644
--- a/js/data/locale/saq/ctrynames.json
+++ b/js/data/locale/saq/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/saq/ctryreverse.json b/js/data/locale/saq/ctryreverse.json
index 3919b41208..894a6816e2 100644
--- a/js/data/locale/saq/ctryreverse.json
+++ b/js/data/locale/saq/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/saq/unitfmt.json b/js/data/locale/saq/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/saq/unitfmt.json
+++ b/js/data/locale/saq/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sat/unitfmt.json b/js/data/locale/sat/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sat/unitfmt.json
+++ b/js/data/locale/sat/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sbp/ctrynames.json b/js/data/locale/sbp/ctrynames.json
index 6e6fd7ba13..dc8e32c413 100644
--- a/js/data/locale/sbp/ctrynames.json
+++ b/js/data/locale/sbp/ctrynames.json
@@ -34,6 +34,7 @@
     "Bosiniya ni Hesegovina": "BA",
     "Botiswana": "BW",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Bukinafaso": "BF",
     "Bukini": "MG",
     "Bulasili": "BR",
@@ -263,7 +264,6 @@
     "Uganda": "UG",
     "Uhabeshi": "ET",
     "Ulugwayi": "UY",
-    "Uluvala lwa Uwingelesa ku Bahali ya Hindi": "IO",
     "United Nations": "UN",
     "Unknown Region": "ZZ",
     "Usibekisitani": "UZ",
diff --git a/js/data/locale/sbp/ctryreverse.json b/js/data/locale/sbp/ctryreverse.json
index 085631d665..a17e19a05c 100644
--- a/js/data/locale/sbp/ctryreverse.json
+++ b/js/data/locale/sbp/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isilaeli",
     "IM": "Isle of Man",
     "IN": "Indiya",
-    "IO": "Uluvala lwa Uwingelesa ku Bahali ya Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Ilaki",
     "IR": "Uwajemi",
     "IS": "Ayisilendi",
diff --git a/js/data/locale/sbp/unitfmt.json b/js/data/locale/sbp/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sbp/unitfmt.json
+++ b/js/data/locale/sbp/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sc/sysres.json b/js/data/locale/sc/sysres.json
index 12a973b57f..d3695455ab 100644
--- a/js/data/locale/sc/sysres.json
+++ b/js/data/locale/sc/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#intro de {num} seg.|#intro de {num} seg.",
     "#in {num}w": "one#intro de {num} ch.|#intro de {num} ch.",
     "#in {num}y": "one#intro de {num} annu|#intro de {num} annos",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}d|#{num}d",
     "#{num}d ago": "one#{num} die a como|#{num} dies a como",
     "#{num}h": "one#{num}o|#{num}o",
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#{num} minutu a como|#{num} minutos a como",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minutu a como|#{num} minutos a como",
     "1#1 minute|#{num} minutes": "one#{num} minutu|#{num} minutos",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "one#{num} mese a como|#{num} meses a como",
     "1#1 month ago|#{num} months ago": "one#{num} mese a como|#{num} meses a como",
diff --git a/js/data/locale/sc/unitfmt.json b/js/data/locale/sc/unitfmt.json
index cf91759ddc..ec6f006cd1 100644
--- a/js/data/locale/sc/unitfmt.json
+++ b/js/data/locale/sc/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|#{n} atmosferas",
             "bar": "one#{n} bar|#{n} bars",
             "barrel": "one#{n} barile|#{n} bariles",
+            "beaufort": "#Beaufort {n}",
             "bit": "one#{n} bit|#{n} bits",
             "bit-per-second": "#{n} bits a su segundu",
             "british-thermal-unit": "one#{n} unidade tèrmica britànnica|#{n} unidades tèrmicas britànnicas",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -262,7 +264,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz imp.",
-            "foodcalorie": "#{n} kcal",
+            "foodcalorie": "#{n} Cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/scn/unitfmt.json b/js/data/locale/scn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/scn/unitfmt.json
+++ b/js/data/locale/scn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/scriptToRange.json b/js/data/locale/scriptToRange.json
index 5637c2284d..f65b0d499a 100644
--- a/js/data/locale/scriptToRange.json
+++ b/js/data/locale/scriptToRange.json
@@ -1424,6 +1424,10 @@
             183984,
             191456
         ],
+        [
+            191472,
+            192093
+        ],
         [
             194560,
             195101
@@ -3538,10 +3542,6 @@
         ],
         [
             12272,
-            12283
-        ],
-        [
-            12288,
             12292
         ],
         [
@@ -3578,6 +3578,9 @@
             12736,
             12771
         ],
+        [
+            12783
+        ],
         [
             12832,
             12895
diff --git a/js/data/locale/scripts.json b/js/data/locale/scripts.json
index 5846c2326e..977b445eb1 100644
--- a/js/data/locale/scripts.json
+++ b/js/data/locale/scripts.json
@@ -198,6 +198,11 @@
         "nm": "Cherokee",
         "rtl": false
     },
+    "Chis": {
+        "lid": "Chisoi",
+        "nb": 298,
+        "nm": "Chisoi"
+    },
     "Chrs": {
         "casing": false,
         "ime": false,
@@ -330,6 +335,11 @@
         "nm": "Ethiopic (Geʻez)",
         "rtl": false
     },
+    "Gara": {
+        "lid": "Garay",
+        "nb": 164,
+        "nm": "Garay"
+    },
     "Geok": {
         "lid": "Georgian",
         "nb": 241,
@@ -399,6 +409,11 @@
         "nm": "Gujarati",
         "rtl": false
     },
+    "Gukh": {
+        "lid": "Gurung_Khema",
+        "nb": 397,
+        "nm": "Gurung Khema"
+    },
     "Guru": {
         "casing": false,
         "ime": false,
@@ -640,6 +655,11 @@
         "nb": 436,
         "nm": "Kpelle"
     },
+    "Krai": {
+        "lid": "Kirat_Rai",
+        "nb": 396,
+        "nm": "Kirat Rai"
+    },
     "Kthi": {
         "casing": false,
         "ime": false,
@@ -968,6 +988,11 @@
         "nm": "Ol Chiki (Ol Cemet’, Ol, Santali)",
         "rtl": false
     },
+    "Onao": {
+        "lid": "Ol_Onal",
+        "nb": 296,
+        "nm": "Ol Onal"
+    },
     "Orkh": {
         "casing": false,
         "ime": false,
@@ -1215,6 +1240,11 @@
         "nm": "Siddham, Siddhaṃ, Siddhamātṛkā",
         "rtl": false
     },
+    "Sidt": {
+        "lid": "Sidetic",
+        "nb": 180,
+        "nm": "Sidetic"
+    },
     "Sind": {
         "casing": false,
         "ime": false,
@@ -1363,6 +1393,11 @@
         "nm": "Tai Viet",
         "rtl": false
     },
+    "Tayo": {
+        "lid": "Tai_Yo",
+        "nb": 380,
+        "nm": "Tai Yo"
+    },
     "Telu": {
         "casing": false,
         "ime": false,
@@ -1432,6 +1467,16 @@
         "nm": "Tangsa",
         "rtl": false
     },
+    "Todr": {
+        "lid": "Todhri",
+        "nb": 229,
+        "nm": "Todhri"
+    },
+    "Tols": {
+        "lid": "Tolong_Siki",
+        "nb": 299,
+        "nm": "Tolong Siki"
+    },
     "Toto": {
         "casing": false,
         "ime": false,
@@ -1440,6 +1485,11 @@
         "nm": "Toto",
         "rtl": false
     },
+    "Tutg": {
+        "lid": "Tulu-Tigalari",
+        "nb": 341,
+        "nm": "Tulu-Tigalari"
+    },
     "Ugar": {
         "casing": false,
         "ime": false,
diff --git a/js/data/locale/sd/Deva/unitfmt.json b/js/data/locale/sd/Deva/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sd/Deva/unitfmt.json
+++ b/js/data/locale/sd/Deva/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sd/unitfmt.json b/js/data/locale/sd/unitfmt.json
index a030d494d5..18235f07a6 100644
--- a/js/data/locale/sd/unitfmt.json
+++ b/js/data/locale/sd/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} ايٽماس فيئر",
             "bar": "one#{n} بار|#{n} بارس",
             "barrel": "#{n} بيريلز",
+            "beaufort": "#بوفورٽ {n}",
             "bit": "one#{n} بٽ|#{n} بٽز",
             "bit-per-second": "#{n} بٽز في سيڪنڊ",
             "british-thermal-unit": "one#{n} برٽش ٿرمل يونٽ|#{n} برٽش ٿرمل يونٽس",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} بار|#{n} بارس",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} بٽ",
             "bit-per-second": "#{n} بٽ في سيڪنڊ",
             "british-thermal-unit": "#{n} Btu",
@@ -248,7 +250,6 @@
             "degree": "#{n} ڊگريز",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
diff --git a/js/data/locale/sdh/unitfmt.json b/js/data/locale/sdh/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sdh/unitfmt.json
+++ b/js/data/locale/sdh/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/se/sysres.json b/js/data/locale/se/sysres.json
index 7b9b704022..6438d57ac0 100644
--- a/js/data/locale/se/sysres.json
+++ b/js/data/locale/se/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#{num} sekunda maŋŋilit|two#{num} sekundda maŋŋilit|#{num} sekundda maŋŋilit",
     "#in {num}w": "one#{num} vahku maŋŋilit|two#{num} vahkku maŋŋilit|#{num} vahkku maŋŋilit",
     "#in {num}y": "one#{num} jahki maŋŋilit|two#{num} jahkki maŋŋilit|#{num} jahkki maŋŋilit",
-    "#{num} ms": "one#{num} ms|two#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}d|two#{num}d|#{num}d",
     "#{num}d ago": "one#{num} jándor árat|two#{num} jándora árat|#{num} jándora árat",
     "#{num}h": "one#{num}h|two#{num}h|#{num}h",
@@ -26,12 +26,12 @@
     "1#1 hour ago|#{num} hours ago": "one#{num} diibmu árat|two#{num} diibmur árat|#{num} diibmur árat",
     "1#1 hour|#{num} hours": "one#{num} diibmu|two#{num} diimmur|#{num} diibmur",
     "1#1 hr ago|#{num} hrs ago": "one#{num} diibmu árat|two#{num} diibmur árat|#{num} diibmur árat",
-    "1#1 hr|#{num} hrs": "one#{num} h|two#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} millisekunda|two#{num} millisekundda|#{num} millisekundda",
     "1#1 min ago|#{num} min ago": "one#{num} minuhta árat|two#{num} minuhtta árat|#{num} minuhtta árat",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minuhta árat|two#{num} minuhtta árat|#{num} minuhtta árat",
     "1#1 minute|#{num} minutes": "one#{num} minuhta|two#{num} minuhtta|#{num} minuhtta",
-    "1#1 min|#{num} min": "one#{num} min|two#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}m|two#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "one#{num} mánotbadji árat|two#{num} mánotbadji árat|#{num} mánotbadji árat",
     "1#1 month ago|#{num} months ago": "one#{num} mánotbadji árat|two#{num} mánotbadji árat|#{num} mánotbadji árat",
@@ -41,7 +41,7 @@
     "1#1 sec ago|#{num} sec ago": "one#{num} sekunda árat|two#{num} sekundda árat|#{num} sekundda árat",
     "1#1 second ago|#{num} seconds ago": "one#{num} sekunda árat|two#{num} sekundda árat|#{num} sekundda árat",
     "1#1 second|#{num} seconds": "one#{num} sekunda|two#{num} sekundda|#{num} sekundda",
-    "1#1 sec|#{num} sec": "one#{num} s|two#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
     "1#1 se|#{num} sec": "one#{num}s|two#{num}s|#{num}s",
     "1#1 week ago|#{num} weeks ago": "one#{num} vahku árat|two#{num} vahkku árat|#{num} vahkku árat",
     "1#1 week|#{num} weeks": "one#{num} váhku|two#{num} váhkku|#{num} váhkku",
@@ -142,7 +142,7 @@
     "NN9": "ča",
     "a0": "iđitbeaivet",
     "a1": "eahketbeaivet",
-    "durationLongDays": "one#{num} d|two#{num} d|#{num} d",
+    "durationLongDays": "#{num} d",
     "durationMediumHours": "one#{num}h|two#{num}h|#{num}h",
     "durationMediumMillis": "one#{num}ms|two#{num}ms|#{num}ms",
     "durationMediumWeeks": "one#{num}v|two#{num}v|#{num}v",
diff --git a/js/data/locale/se/unitfmt.json b/js/data/locale/se/unitfmt.json
index d7bd8a3267..b39a753673 100644
--- a/js/data/locale/se/unitfmt.json
+++ b/js/data/locale/se/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/seh/ctrynames.json b/js/data/locale/seh/ctrynames.json
index 7a86a47247..67487ab042 100644
--- a/js/data/locale/seh/ctrynames.json
+++ b/js/data/locale/seh/ctrynames.json
@@ -36,6 +36,7 @@
     "Botsuana": "BW",
     "Bouvet Island": "BV",
     "Brasil": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bulgária": "BG",
     "Burquina Faso": "BF",
@@ -263,7 +264,6 @@
     "Tailândia": "TH",
     "Taiwan": "TW",
     "Tanzania": "TZ",
-    "Território Britânico do Oceano Índico": "IO",
     "Território da Palestina": "PS",
     "Timor Leste": "TL",
     "Togo": "TG",
diff --git a/js/data/locale/seh/ctryreverse.json b/js/data/locale/seh/ctryreverse.json
index 1d3b1f3b33..e10b041a52 100644
--- a/js/data/locale/seh/ctryreverse.json
+++ b/js/data/locale/seh/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Isle of Man",
     "IN": "Índia",
-    "IO": "Território Britânico do Oceano Índico",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraque",
     "IR": "Irã",
     "IS": "Islândia",
diff --git a/js/data/locale/seh/unitfmt.json b/js/data/locale/seh/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/seh/unitfmt.json
+++ b/js/data/locale/seh/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ses/ctrynames.json b/js/data/locale/ses/ctrynames.json
index 7d6fd94b1f..1a102a4c0c 100644
--- a/js/data/locale/ses/ctrynames.json
+++ b/js/data/locale/ses/ctrynames.json
@@ -37,7 +37,7 @@
     "Botswaana": "BW",
     "Bouvet Island": "BV",
     "Breezil": "BR",
-    "Britiši Indu teekoo laama": "IO",
+    "British Indian Ocean Territory": "IO",
     "Britiši Virgin gungey": "VG",
     "Bruunee": "BN",
     "Bulgaari": "BG",
diff --git a/js/data/locale/ses/ctryreverse.json b/js/data/locale/ses/ctryreverse.json
index 24e7ca136f..9f4b3bd258 100644
--- a/js/data/locale/ses/ctryreverse.json
+++ b/js/data/locale/ses/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israyel",
     "IM": "Isle of Man",
     "IN": "Indu laboo",
-    "IO": "Britiši Indu teekoo laama",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Ayceland",
diff --git a/js/data/locale/ses/unitfmt.json b/js/data/locale/ses/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ses/unitfmt.json
+++ b/js/data/locale/ses/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sg/ctrynames.json b/js/data/locale/sg/ctrynames.json
index d2cbd238df..57d878dce6 100644
--- a/js/data/locale/sg/ctrynames.json
+++ b/js/data/locale/sg/ctrynames.json
@@ -40,6 +40,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brezîli": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunêi": "BN",
     "Bulugarïi": "BG",
     "Burkina Faso": "BF",
@@ -221,7 +222,6 @@
     "Sênt-Helêna": "SH",
     "Sênt-Lisïi": "LC",
     "Serbia": "RS",
-    "Sêse tî Anglëe na Ngûyämä tî Ênnde": "IO",
     "Sêse tî Palestîni": "PS",
     "Sëyshêle": "SC",
     "Shilïi": "CL",
diff --git a/js/data/locale/sg/ctryreverse.json b/js/data/locale/sg/ctryreverse.json
index eee2de9da7..c023600d44 100644
--- a/js/data/locale/sg/ctryreverse.json
+++ b/js/data/locale/sg/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israëli",
     "IM": "Isle of Man",
     "IN": "Ênnde",
-    "IO": "Sêse tî Anglëe na Ngûyämä tî Ênnde",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irâki",
     "IR": "Iräan",
     "IS": "Islânde",
diff --git a/js/data/locale/sg/unitfmt.json b/js/data/locale/sg/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sg/unitfmt.json
+++ b/js/data/locale/sg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/shi/Latn/ctrynames.json b/js/data/locale/shi/Latn/ctrynames.json
index 099f3b3a70..6bb98210f4 100644
--- a/js/data/locale/shi/Latn/ctrynames.json
+++ b/js/data/locale/shi/Latn/ctrynames.json
@@ -41,6 +41,7 @@
     "bljika": "BE",
     "Bouvet Island": "BV",
     "brazil": "BR",
+    "British Indian Ocean Territory": "IO",
     "brmuda": "BM",
     "bṛṭqiz": "PT",
     "bruni": "BN",
@@ -251,7 +252,6 @@
     "tagdudant tanammast n ifriqya": "CF",
     "tagdudant tatcikit": "CZ",
     "tagldit imunn": "GB",
-    "tamnaḍt tanglizit n ugaru ahindi": "IO",
     "ṭanẓanya": "TZ",
     "ṭayland": "TH",
     "ṭaywan": "TW",
diff --git a/js/data/locale/shi/Latn/ctryreverse.json b/js/data/locale/shi/Latn/ctryreverse.json
index c805b9757a..b0fb3c79a8 100644
--- a/js/data/locale/shi/Latn/ctryreverse.json
+++ b/js/data/locale/shi/Latn/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "israyil",
     "IM": "Isle of Man",
     "IN": "lhind",
-    "IO": "tamnaḍt tanglizit n ugaru ahindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "lɛiraq",
     "IR": "iran",
     "IS": "island",
diff --git a/js/data/locale/shi/Tfng/ctrynames.json b/js/data/locale/shi/Tfng/ctrynames.json
index 3bcb833913..849b6ecceb 100644
--- a/js/data/locale/shi/Tfng/ctrynames.json
+++ b/js/data/locale/shi/Tfng/ctrynames.json
@@ -7,6 +7,7 @@
     "Asia": "142",
     "Australasia": "053",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Canary Islands": "IC",
     "Caribbean": "029",
     "Caribbean Netherlands": "BQ",
@@ -265,7 +266,6 @@
     "ⵜⴰⴳⴷⵓⴷⴰⵏⵜ ⵜⴰⵜⵛⵉⴽⵉⵜ": "CZ",
     "ⵜⴰⴳⵍⴷⵉⵜ ⵉⵎⵓⵏⵏ": "GB",
     "ⵜⴰⴷⵊⴰⴽⵉⵙⵜⴰⵏ": "TJ",
-    "ⵜⴰⵎⵏⴰⴹⵜ ⵜⴰⵏⴳⵍⵉⵣⵉⵜ ⵏ ⵓⴳⴰⵔⵓ ⴰⵀⵉⵏⴷⵉ": "IO",
     "ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⴽⴰⴱⴱⵉⵔⴷⵉ": "CV",
     "ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⴽⴰⵢⵎⴰⵏ": "KY",
     "ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⴽⵓⴽ": "CK",
diff --git a/js/data/locale/shi/Tfng/ctryreverse.json b/js/data/locale/shi/Tfng/ctryreverse.json
index e55bca795b..a42b029236 100644
--- a/js/data/locale/shi/Tfng/ctryreverse.json
+++ b/js/data/locale/shi/Tfng/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ⵉⵙⵔⴰⵢⵉⵍ",
     "IM": "Isle of Man",
     "IN": "ⵍⵀⵉⵏⴷ",
-    "IO": "ⵜⴰⵎⵏⴰⴹⵜ ⵜⴰⵏⴳⵍⵉⵣⵉⵜ ⵏ ⵓⴳⴰⵔⵓ ⴰⵀⵉⵏⴷⵉ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ⵍⵄⵉⵔⴰⵇ",
     "IR": "ⵉⵔⴰⵏ",
     "IS": "ⵉⵙⵍⴰⵏⴷ",
diff --git a/js/data/locale/shi/ctrynames.json b/js/data/locale/shi/ctrynames.json
index 3bcb833913..849b6ecceb 100644
--- a/js/data/locale/shi/ctrynames.json
+++ b/js/data/locale/shi/ctrynames.json
@@ -7,6 +7,7 @@
     "Asia": "142",
     "Australasia": "053",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Canary Islands": "IC",
     "Caribbean": "029",
     "Caribbean Netherlands": "BQ",
@@ -265,7 +266,6 @@
     "ⵜⴰⴳⴷⵓⴷⴰⵏⵜ ⵜⴰⵜⵛⵉⴽⵉⵜ": "CZ",
     "ⵜⴰⴳⵍⴷⵉⵜ ⵉⵎⵓⵏⵏ": "GB",
     "ⵜⴰⴷⵊⴰⴽⵉⵙⵜⴰⵏ": "TJ",
-    "ⵜⴰⵎⵏⴰⴹⵜ ⵜⴰⵏⴳⵍⵉⵣⵉⵜ ⵏ ⵓⴳⴰⵔⵓ ⴰⵀⵉⵏⴷⵉ": "IO",
     "ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⴽⴰⴱⴱⵉⵔⴷⵉ": "CV",
     "ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⴽⴰⵢⵎⴰⵏ": "KY",
     "ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⴽⵓⴽ": "CK",
diff --git a/js/data/locale/shi/ctryreverse.json b/js/data/locale/shi/ctryreverse.json
index e55bca795b..a42b029236 100644
--- a/js/data/locale/shi/ctryreverse.json
+++ b/js/data/locale/shi/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ⵉⵙⵔⴰⵢⵉⵍ",
     "IM": "Isle of Man",
     "IN": "ⵍⵀⵉⵏⴷ",
-    "IO": "ⵜⴰⵎⵏⴰⴹⵜ ⵜⴰⵏⴳⵍⵉⵣⵉⵜ ⵏ ⵓⴳⴰⵔⵓ ⴰⵀⵉⵏⴷⵉ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ⵍⵄⵉⵔⴰⵇ",
     "IR": "ⵉⵔⴰⵏ",
     "IS": "ⵉⵙⵍⴰⵏⴷ",
diff --git a/js/data/locale/shi/unitfmt.json b/js/data/locale/shi/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/shi/unitfmt.json
+++ b/js/data/locale/shi/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/shn/unitfmt.json b/js/data/locale/shn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/shn/unitfmt.json
+++ b/js/data/locale/shn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/si/unitfmt.json b/js/data/locale/si/unitfmt.json
index bd7af8c10c..b2ab1b7e8e 100644
--- a/js/data/locale/si/unitfmt.json
+++ b/js/data/locale/si/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#වායුගෝල {n}",
             "bar": "#බාර් {n}",
             "barrel": "#{n} බැරල්",
+            "beaufort": "#බියුෆෝර්ට් {n}",
             "bit": "#බීට් {n}",
             "bit-per-second": "#තත්පරයට බීට් {n}",
             "british-thermal-unit": "#{n} බ්‍රිතාන්‍ය තාප ඒකක",
@@ -42,7 +43,7 @@
             "degree": "#අංශක {n}",
             "dessert-spoon": "one#{n} අතුරුපස හැන්ද|#අතුරුපස හැඳි {n}",
             "dessert-spoon-imperial": "one#{n} ඉම්පීරියල් අතුරුපස හැන්ද|#ඉම්පීරියල් අතුරුපස හැඳි {n}",
-            "dot": "#{n}තිත",
+            "dot": "one#{n}තිත|#තිත් {n}",
             "dot-per-centimeter": "#සෙන්ටිමීටරයකට තිත් {n}",
             "dot-per-inch": "#අඟලකට තිත් {n}",
             "dram": "one#{n} ඩ්‍රූම|#ඩ්‍රූම {n}",
@@ -216,6 +217,7 @@
             "atmosphere": "#වායුගෝ {n}",
             "bar": "#බාර් {n}",
             "barrel": "#{n} බැරල්",
+            "beaufort": "#බි {n}",
             "bit": "#බීට් {n}",
             "bit-per-second": "#තත්පරයට බීට් {n}",
             "british-thermal-unit": "#{n} බ්‍රිතාඒ",
@@ -249,8 +251,8 @@
             "dessert-spoon": "#අතුරුපස හැඳි {n}",
             "dessert-spoon-imperial": "#ඉම්පී. අතුරුපස හැඳි {n}",
             "dot": "one#{n} තිත|#තිත් {n}",
-            "dot-per-centimeter": "one#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "#සෙමීති {n}",
+            "dot-per-inch": "#අටති {n}",
             "dram": "#ඩ්‍රූම තරල {n}",
             "drop": "#බින්දු {n}",
             "dunam": "#{n} ඩනම්ස්",
diff --git a/js/data/locale/sid/unitfmt.json b/js/data/locale/sid/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sid/unitfmt.json
+++ b/js/data/locale/sid/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sk/sysres.json b/js/data/locale/sk/sysres.json
index d7c9e91154..54efa6b2a2 100644
--- a/js/data/locale/sk/sysres.json
+++ b/js/data/locale/sk/sysres.json
@@ -6,14 +6,14 @@
     "#in {num}s": "one#o {num} s|few#o {num} s|many#o {num} s|#o {num} s",
     "#in {num}w": "one#o {num} týž.|few#o {num} týž.|many#o {num} týž.|#o {num} týž.",
     "#in {num}y": "one#o {num} r.|few#o {num} r.|many#o {num} r.|#o {num} r.",
-    "#{num} ms": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} d.|few#{num} d.|many#{num} d.|#{num} d.",
     "#{num}d ago": "one#pred {num} d.|few#pred {num} d.|many#pred {num} d.|#pred {num} d.",
-    "#{num}h": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#pred {num} h|few#pred {num} h|many#pred {num} h|#pred {num} h",
     "#{num}mi ago": "one#pred {num} min|few#pred {num} min|many#pred {num} min|#pred {num} min",
     "#{num}mo ago": "one#pred {num} mes.|few#pred {num} mes.|many#pred {num} mes.|#pred {num} mes.",
-    "#{num}s": "one#{num} s|few#{num} s|many#{num} s|#{num} s",
+    "#{num}s": "#{num} s",
     "#{num}s ago": "one#pred {num} s|few#pred {num} s|many#pred {num} s|#pred {num} s",
     "#{num}w": "one#{num} t.|few#{num} t.|many#{num} t.|#{num} t.",
     "#{num}w ago": "one#pred {num} týž.|few#pred {num} týž.|many#pred {num} týž.|#pred {num} týž.",
@@ -26,13 +26,13 @@
     "1#1 hour ago|#{num} hours ago": "one#pred {num} hodinou|few#pred {num} hodinami|many#pred {num} hodinou|#pred {num} hodinami",
     "1#1 hour|#{num} hours": "one#{num} hodina|few#{num} hodiny|many#{num} hodiny|#{num} hodín",
     "1#1 hr ago|#{num} hrs ago": "one#pred {num} hodinou|few#pred {num} hodinami|many#pred {num} hodinou|#pred {num} hodinami",
-    "1#1 hr|#{num} hrs": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisekunda|few#{num} milisekundy|many#{num} milisekundy|#{num} milisekúnd",
     "1#1 min ago|#{num} min ago": "one#pred {num} minútou|few#pred {num} minútami|many#pred {num} minúty|#pred {num} minútami",
     "1#1 minute ago|#{num} minutes ago": "one#pred {num} minútou|few#pred {num} minútami|many#pred {num} minúty|#pred {num} minútami",
     "1#1 minute|#{num} minutes": "one#{num} minúta|few#{num} minúty|many#{num} minúty|#{num} minút",
-    "1#1 min|#{num} min": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "one#pred {num} mesiacom|few#pred {num} mesiacmi|many#pred {num} mesiaca|#pred {num} mesiacmi",
     "1#1 month ago|#{num} months ago": "one#pred {num} mesiacom|few#pred {num} mesiacmi|many#pred {num} mesiaca|#pred {num} mesiacmi",
     "1#1 month|#{num} months": "one#{num} mesiac|few#{num} mesiace|many#{num} mesiaca|#{num} mesiacov",
@@ -41,8 +41,8 @@
     "1#1 sec ago|#{num} sec ago": "one#pred {num} sekundou|few#pred {num} sekundami|many#pred {num} sekundy|#pred {num} sekundami",
     "1#1 second ago|#{num} seconds ago": "one#pred {num} sekundou|few#pred {num} sekundami|many#pred {num} sekundy|#pred {num} sekundami",
     "1#1 second|#{num} seconds": "one#{num} sekunda|few#{num} sekundy|many#{num} sekundy|#{num} sekúnd",
-    "1#1 sec|#{num} sec": "one#{num} s|few#{num} s|many#{num} s|#{num} s",
-    "1#1 se|#{num} sec": "one#{num} s|few#{num} s|many#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#pred {num} týždňom|few#pred {num} týždňami|many#pred {num} týždňa|#pred {num} týždňami",
     "1#1 week|#{num} weeks": "one#{num} týždeň|few#{num} týždne|many#{num} týždňa|#{num} týždňov",
     "1#1 wk ago|#{num} wks ago": "one#pred {num} týždňom|few#pred {num} týždňami|many#pred {num} týždňa|#pred {num} týždňami",
@@ -201,12 +201,12 @@
     "NN8": "au",
     "NN9": "se",
     "durationLongDays": "one#{num} deň|few#{num} dni|many#{num} dňa|#{num} dní",
-    "durationMediumHours": "one#{num} h|few#{num} h|many#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} t.|few#{num} t.|many#{num} t.|#{num} t.",
     "durationMediumYears": "one#{num} r.|few#{num} r.|many#{num} r.|#{num} r.",
-    "durationShortMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
     "durationShortMonths": "one#{num} m.|few#{num} m.|many#{num} m.|#{num} m.",
     "finalSeparatorFull": ", ",
     "finalSeparatorLong": ", ",
diff --git a/js/data/locale/sk/unitfmt.json b/js/data/locale/sk/unitfmt.json
index f603771981..844ea71c65 100644
--- a/js/data/locale/sk/unitfmt.json
+++ b/js/data/locale/sk/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosféra|few#{n} atmosféry|many#{n} atmosféry|#{n} atmosfér",
             "bar": "one#{n} bar|few#{n} bary|many#{n} baru|#{n} barov",
             "barrel": "one#{n} barel|few#{n} barely|many#{n} barelu|#{n} barelov",
+            "beaufort": "one#{n} stupeň Beaufortovej stupnice|few#{n} stupne Beaufortovej stupnice|many#{n} stupňa Beaufortovej stupnice|#{n} stupňov Beaufortovej stupnice",
             "bit": "one#{n} bit|few#{n} bity|many#{n} bitu|#{n} bitov",
             "bit-per-second": "#{n} bitov za sekundu",
             "british-thermal-unit": "one#{n} britská tepelná jednotka|few#{n} britské tepelné jednotky|many#{n} britskej tepelnej jednotky|#{n} britských tepelných jednotiek",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} BTU",
@@ -249,7 +251,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "one#{n} bod|few#{n} body|many#{n} bodu|#{n} bodov",
+            "dot": "one#{n} bod|#{n} px",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dr",
diff --git a/js/data/locale/skr/dateformats.json b/js/data/locale/skr/dateformats.json
new file mode 100644
index 0000000000..97a8977cbb
--- /dev/null
+++ b/js/data/locale/skr/dateformats.json
@@ -0,0 +1,133 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/skr/sysres.json b/js/data/locale/skr/sysres.json
new file mode 100644
index 0000000000..03ebba6582
--- /dev/null
+++ b/js/data/locale/skr/sysres.json
@@ -0,0 +1,142 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "EE0": "Sun",
+    "EE1": "Mon",
+    "EE2": "Tue",
+    "EE3": "Wed",
+    "EE4": "Thu",
+    "EE5": "Fri",
+    "EE6": "Sat",
+    "EEEE0": "Sun",
+    "EEEE1": "Mon",
+    "EEEE2": "Tue",
+    "EEEE3": "Wed",
+    "EEEE4": "Thu",
+    "EEEE5": "Fri",
+    "EEEE6": "Sat",
+    "MMM1": "M01",
+    "MMM10": "M10",
+    "MMM11": "M11",
+    "MMM12": "M12",
+    "MMM2": "M02",
+    "MMM3": "M03",
+    "MMM4": "M04",
+    "MMM5": "M05",
+    "MMM6": "M06",
+    "MMM7": "M07",
+    "MMM8": "M08",
+    "MMM9": "M09",
+    "MMMM1": "M01",
+    "MMMM10": "M10",
+    "MMMM11": "M11",
+    "MMMM12": "M12",
+    "MMMM2": "M02",
+    "MMMM3": "M03",
+    "MMMM4": "M04",
+    "MMMM5": "M05",
+    "MMMM6": "M06",
+    "MMMM7": "M07",
+    "MMMM8": "M08",
+    "MMMM9": "M09",
+    "N1": "M",
+    "N10": "M",
+    "N11": "M",
+    "N12": "M",
+    "N2": "M",
+    "N4": "M",
+    "N6": "M",
+    "N7": "M",
+    "N8": "M",
+    "N9": "M",
+    "NN1": "M0",
+    "NN10": "M1",
+    "NN11": "M1",
+    "NN12": "M1",
+    "NN2": "M0",
+    "NN3": "M0",
+    "NN4": "M0",
+    "NN5": "M0",
+    "NN6": "M0",
+    "NN7": "M0",
+    "NN8": "M0",
+    "NN9": "M0",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": ", ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/skr/unitfmt.json b/js/data/locale/skr/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/skr/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/sl/dateformats.json b/js/data/locale/sl/dateformats.json
index 31d29b7afa..96cf5a311d 100644
--- a/js/data/locale/sl/dateformats.json
+++ b/js/data/locale/sl/dateformats.json
@@ -47,25 +47,25 @@
                 "f": "d. MMMM",
                 "l": "d. MMMM",
                 "m": "d. MMM",
-                "s": "d. MM"
+                "s": "d. M"
             },
             "dmw": {
                 "f": "EEEE, d. MMMM",
                 "l": "EEE, d. MMMM",
                 "m": "EE, d. MMM",
-                "s": "E, d. MM"
+                "s": "E, d. M"
             },
             "dmwy": {
                 "f": "EEEE, d. MMMM yyyy",
                 "l": "EEE, d. MMMM yyyy",
                 "m": "EE, d. MMM yyyy",
-                "s": "E, d. MM. yy"
+                "s": "E, d. M. yy"
             },
             "dmy": {
                 "f": "d. MMMM yyyy",
                 "l": "d. MMMM yyyy",
                 "m": "d. MMM yyyy",
-                "s": "d. MM. yy"
+                "s": "d. M. yy"
             },
             "dw": {
                 "f": "EEEE, d",
@@ -75,13 +75,12 @@
             },
             "m": {
                 "l": "MMMM",
-                "m": "MMM",
-                "s": "MM"
+                "m": "MMM"
             },
             "my": {
                 "l": "MMMM yyyy",
                 "m": "MMM yyyy",
-                "s": "MM. yy"
+                "s": "M. yy"
             }
         },
         "order": {
diff --git a/js/data/locale/sl/sysres.json b/js/data/locale/sl/sysres.json
index b0de423570..152ddd84d8 100644
--- a/js/data/locale/sl/sysres.json
+++ b/js/data/locale/sl/sysres.json
@@ -6,10 +6,10 @@
     "#in {num}s": "one#čez {num} s|two#čez {num} s|few#čez {num} s|#čez {num} s",
     "#in {num}w": "one#čez {num} ted.|two#čez {num} ted.|few#čez {num} ted.|#čez {num} ted.",
     "#in {num}y": "one#čez {num} leto|two#čez {num} leti|few#čez {num} leta|#čez {num} let",
-    "#{num} ms": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
-    "#{num}d": "one#{num} d|two#{num} d|few#{num} d|#{num} d",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
     "#{num}d ago": "one#pred {num} dnevom|two#pred {num} dnevoma|few#pred {num} dnevi|#pred {num} dnevi",
-    "#{num}h": "one#{num} h|two#{num} h|few#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#pred {num} uro|two#pred {num} urama|few#pred {num} urami|#pred {num} urami",
     "#{num}mi ago": "one#pred {num} min.|two#pred {num} min.|few#pred {num} min.|#pred {num} min.",
     "#{num}mo ago": "one#pred {num} mes.|two#pred {num} mes.|few#pred {num} mes.|#pred {num} mes.",
@@ -22,22 +22,22 @@
     "1#1 day ago|#{num} days ago": "one#pred {num} dnevom|two#pred {num} dnevoma|few#pred {num} dnevi|#pred {num} dnevi",
     "1#1 day|#{num} days": "one#{num} dan|two#{num} dneva|few#{num} dni|#{num} dni",
     "1#1 dy ago|#{num} dys ago": "one#pred {num} dnevom|two#pred {num} dnevoma|few#pred {num} dnevi|#pred {num} dnevi",
-    "1#1 dy|#{num} dys": "one#{num} d|two#{num} d|few#{num} d|#{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
     "1#1 hour ago|#{num} hours ago": "one#pred {num} uro|two#pred {num} urama|few#pred {num} urami|#pred {num} urami",
     "1#1 hour|#{num} hours": "one#{num} ura|two#{num} uri|few#{num} ure|#{num} ur",
     "1#1 hr ago|#{num} hrs ago": "one#pred {num} uro|two#pred {num} urama|few#pred {num} urami|#pred {num} urami",
-    "1#1 hr|#{num} hrs": "one#{num} h|two#{num} h|few#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisekunda|two#{num} millisekundi|few#{num} milisekunde|#{num} milisekund",
     "1#1 min ago|#{num} min ago": "one#pred {num} minuto|two#pred {num} minutama|few#pred {num} minutami|#pred {num} minutami",
     "1#1 minute ago|#{num} minutes ago": "one#pred {num} minuto|two#pred {num} minutama|few#pred {num} minutami|#pred {num} minutami",
     "1#1 minute|#{num} minutes": "one#{num} minuta|two#{num} minuti|few#{num} minute|#{num} minut",
-    "1#1 min|#{num} min": "one#{num} min|two#{num} min|few#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|two#{num} min|few#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "one#pred {num} mesecem|two#pred {num} mesecema|few#pred {num} meseci|#pred {num} meseci",
     "1#1 month ago|#{num} months ago": "one#pred {num} mesecem|two#pred {num} mesecema|few#pred {num} meseci|#pred {num} meseci",
     "1#1 month|#{num} months": "one#{num} mesec|two#{num} meseca|few#{num} meseci|#{num} mesecev",
-    "1#1 mon|#{num} mons": "one#{num} m|two#{num} m|few#{num} m|#{num} m",
-    "1#1 mo|#{num} mos": "one#{num} m|two#{num} m|few#{num} m|#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
     "1#1 sec ago|#{num} sec ago": "one#pred {num} sekundo|two#pred {num} sekundama|few#pred {num} sekundami|#pred {num} sekundami",
     "1#1 second ago|#{num} seconds ago": "one#pred {num} sekundo|two#pred {num} sekundama|few#pred {num} sekundami|#pred {num} sekundami",
     "1#1 second|#{num} seconds": "one#{num} sekunda|two#{num} sekundi|few#{num} sekunde|#{num} sekund",
@@ -154,14 +154,14 @@
     "NN9": "se",
     "a0": "dop.",
     "a1": "pop.",
-    "durationLongDays": "one#{num} d|two#{num} d|few#{num} d|#{num} d",
-    "durationMediumHours": "one#{num} h|two#{num} h|few#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} t|two#{num} t|few#{num} t|#{num} t",
     "durationMediumYears": "one#{num} l|two#{num} l|few#{num} l|#{num} l",
-    "durationShortMillis": "one#{num} ms|two#{num} ms|few#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|two#{num} min|few#{num} min|#{num} min",
-    "durationShortMonths": "one#{num} m|two#{num} m|few#{num} m|#{num} m",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
     "finalSeparatorFull": " in ",
     "finalSeparatorLong": " in ",
     "finalSeparatorMedium": " in ",
diff --git a/js/data/locale/sl/unitfmt.json b/js/data/locale/sl/unitfmt.json
index 49ba8626d8..6ab4a1abc8 100644
--- a/js/data/locale/sl/unitfmt.json
+++ b/js/data/locale/sl/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfera|two#{n} atmosferi|few#{n} atmosfere|#{n} atmosfer",
             "bar": "one#{n} bar|two#{n} bara|few#{n} bari|#{n} barov",
             "barrel": "one#{n} sodček|two#{n} sodčka|few#{n} sodčki|#{n} sodčkov",
+            "beaufort": "one#{n} bofor|two#{n} bofora|few#{n} bofori|#{n} boforov",
             "bit": "one#{n} bit|two#{n} bita|few#{n} biti|#{n} bitov",
             "bit-per-second": "#{n} bitov na sekundo",
             "british-thermal-unit": "one#{n} britanska toplotna enota|two#{n} britanski toplotni enoti|few#{n} britanske toplotne enote|#{n} britanskih toplotnih enot",
@@ -43,8 +44,8 @@
             "dessert-spoon": "one#{n} desertna žlička|two#{n} desertni žlički|few#{n} desertne žličke|#{n} desertnih žličk",
             "dessert-spoon-imperial": "one#{n} imp. desertna žlička|two#{n} imp. desertni žlički|few#{n} imp. desertne žličke|#{n} imp. desertnih žličk",
             "dot": "one#{n} pika|two#{n} piki|few#{n} pike|#{n} pik",
-            "dot-per-centimeter": "#{n} dpcm",
-            "dot-per-inch": "#{n} dpi",
+            "dot-per-centimeter": "one#{n} pika na centimeter|two#{n} dpcm|few#{n} dpcm|#{n} pik na centimeter",
+            "dot-per-inch": "one#{n} pika na palec|two#{n} dpi|few#{n} dpi|#{n} pik na palec",
             "dram": "one#{n} drahma|two#{n} drahmi|few#{n} drahme|#{n} drahm",
             "drop": "one#{n} kapljica|two#{n} kapljici|few#{n} kapljice|#{n} kapljic",
             "dunam": "one#{n} dunum|two#{n} dunuma|#{n} dunumi",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} Bf",
             "bit": "one#{n} bit|two#{n} bita|few#{n} biti|#{n} bitov",
             "bit-per-second": "#{n} bitov/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,8 @@
             "dessert-spoon": "one#{n} desertna žlička|two#{n} desertni žlički|few#{n} desertne žličke|#{n} desertnih žličk",
             "dessert-spoon-imperial": "one#{n} imp. desertna žlička|two#{n} imp. desertni žlički|few#{n} imp. desertne žličke|#{n} imp. desertnih žličk",
             "dot": "one#{n} pika|two#{n} piki|few#{n} pike|#{n} pik",
-            "dot-per-centimeter": "one#{n} ppcm|two#{n} ppcm|few#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|two#{n} ppi|few#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "one#{n} tekoča drahma|two#{n} tekoči drahmi|few#{n} tekoče drahme|#{n} tekočih drahm",
             "drop": "one#{n} kapljica|two#{n} kapljici|few#{n} kapljice|#{n} kapljic",
             "dunam": "one#{n} dunum|two#{n} dunuma|#{n} dunumi",
@@ -262,7 +264,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} imp. fl. oz.",
-            "foodcalorie": "#{n} Cal",
+            "foodcalorie": "two#{n} kcal|few#{n} kcal|#{n} cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/sma/unitfmt.json b/js/data/locale/sma/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sma/unitfmt.json
+++ b/js/data/locale/sma/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/smj/unitfmt.json b/js/data/locale/smj/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/smj/unitfmt.json
+++ b/js/data/locale/smj/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/smn/ctrynames.json b/js/data/locale/smn/ctrynames.json
index 6d1d7d9325..c04f9c5515 100644
--- a/js/data/locale/smn/ctrynames.json
+++ b/js/data/locale/smn/ctrynames.json
@@ -33,7 +33,7 @@
     "Botswana": "BW",
     "Bouvetsuálui": "BV",
     "Brasilia": "BR",
-    "Brittilâš India väldimeerâ kuávlu": "IO",
+    "British Indian Ocean Territory": "IO",
     "Brittiliih Nieidâsuolluuh": "VG",
     "Brunei": "BN",
     "Bulgaria": "BG",
diff --git a/js/data/locale/smn/ctryreverse.json b/js/data/locale/smn/ctryreverse.json
index 709fb590e8..bd555d302a 100644
--- a/js/data/locale/smn/ctryreverse.json
+++ b/js/data/locale/smn/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Mansuálui",
     "IN": "India",
-    "IO": "Brittilâš India väldimeerâ kuávlu",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Island",
diff --git a/js/data/locale/smn/unitfmt.json b/js/data/locale/smn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/smn/unitfmt.json
+++ b/js/data/locale/smn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sms/unitfmt.json b/js/data/locale/sms/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sms/unitfmt.json
+++ b/js/data/locale/sms/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sn/unitfmt.json b/js/data/locale/sn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/sn/unitfmt.json
+++ b/js/data/locale/sn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/so/DJ/ctrynames.json b/js/data/locale/so/DJ/ctrynames.json
index 08f2f78fce..adaa275718 100644
--- a/js/data/locale/so/DJ/ctrynames.json
+++ b/js/data/locale/so/DJ/ctrynames.json
@@ -68,7 +68,7 @@
     "Costa Rica": "CR",
     "Cumaan": "OM",
     "Denmark": "DK",
-    "Dhul xadeedka Badweynta Hindiya ee Biritishka": "IO",
+    "Dhul xadeedka Badweynta Hindiya ee Ingiriiska": "IO",
     "Dhul xadeedka Koonfureed ee Faransiiska": "TF",
     "Dhulka Falastiiniyiinta daanta galbeed iyo marinka qasa": "PS",
     "Dhulxeebeedka Osheeniya": "QO",
diff --git a/js/data/locale/so/DJ/ctryreverse.json b/js/data/locale/so/DJ/ctryreverse.json
index 4c8e16adf8..45b1569024 100644
--- a/js/data/locale/so/DJ/ctryreverse.json
+++ b/js/data/locale/so/DJ/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israaʼiil",
     "IM": "Jasiiradda Isle of Man",
     "IN": "Hindiya",
-    "IO": "Dhul xadeedka Badweynta Hindiya ee Biritishka",
+    "IO": "Dhul xadeedka Badweynta Hindiya ee Ingiriiska",
     "IQ": "Ciraaq",
     "IR": "Iiraan",
     "IS": "Ayslaand",
diff --git a/js/data/locale/so/ET/ctrynames.json b/js/data/locale/so/ET/ctrynames.json
index 08f2f78fce..adaa275718 100644
--- a/js/data/locale/so/ET/ctrynames.json
+++ b/js/data/locale/so/ET/ctrynames.json
@@ -68,7 +68,7 @@
     "Costa Rica": "CR",
     "Cumaan": "OM",
     "Denmark": "DK",
-    "Dhul xadeedka Badweynta Hindiya ee Biritishka": "IO",
+    "Dhul xadeedka Badweynta Hindiya ee Ingiriiska": "IO",
     "Dhul xadeedka Koonfureed ee Faransiiska": "TF",
     "Dhulka Falastiiniyiinta daanta galbeed iyo marinka qasa": "PS",
     "Dhulxeebeedka Osheeniya": "QO",
diff --git a/js/data/locale/so/ET/ctryreverse.json b/js/data/locale/so/ET/ctryreverse.json
index 4c8e16adf8..45b1569024 100644
--- a/js/data/locale/so/ET/ctryreverse.json
+++ b/js/data/locale/so/ET/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israaʼiil",
     "IM": "Jasiiradda Isle of Man",
     "IN": "Hindiya",
-    "IO": "Dhul xadeedka Badweynta Hindiya ee Biritishka",
+    "IO": "Dhul xadeedka Badweynta Hindiya ee Ingiriiska",
     "IQ": "Ciraaq",
     "IR": "Iiraan",
     "IS": "Ayslaand",
diff --git a/js/data/locale/so/KE/ctrynames.json b/js/data/locale/so/KE/ctrynames.json
index 08f2f78fce..adaa275718 100644
--- a/js/data/locale/so/KE/ctrynames.json
+++ b/js/data/locale/so/KE/ctrynames.json
@@ -68,7 +68,7 @@
     "Costa Rica": "CR",
     "Cumaan": "OM",
     "Denmark": "DK",
-    "Dhul xadeedka Badweynta Hindiya ee Biritishka": "IO",
+    "Dhul xadeedka Badweynta Hindiya ee Ingiriiska": "IO",
     "Dhul xadeedka Koonfureed ee Faransiiska": "TF",
     "Dhulka Falastiiniyiinta daanta galbeed iyo marinka qasa": "PS",
     "Dhulxeebeedka Osheeniya": "QO",
diff --git a/js/data/locale/so/KE/ctryreverse.json b/js/data/locale/so/KE/ctryreverse.json
index 4c8e16adf8..45b1569024 100644
--- a/js/data/locale/so/KE/ctryreverse.json
+++ b/js/data/locale/so/KE/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israaʼiil",
     "IM": "Jasiiradda Isle of Man",
     "IN": "Hindiya",
-    "IO": "Dhul xadeedka Badweynta Hindiya ee Biritishka",
+    "IO": "Dhul xadeedka Badweynta Hindiya ee Ingiriiska",
     "IQ": "Ciraaq",
     "IR": "Iiraan",
     "IS": "Ayslaand",
diff --git a/js/data/locale/so/ctrynames.json b/js/data/locale/so/ctrynames.json
index 08f2f78fce..adaa275718 100644
--- a/js/data/locale/so/ctrynames.json
+++ b/js/data/locale/so/ctrynames.json
@@ -68,7 +68,7 @@
     "Costa Rica": "CR",
     "Cumaan": "OM",
     "Denmark": "DK",
-    "Dhul xadeedka Badweynta Hindiya ee Biritishka": "IO",
+    "Dhul xadeedka Badweynta Hindiya ee Ingiriiska": "IO",
     "Dhul xadeedka Koonfureed ee Faransiiska": "TF",
     "Dhulka Falastiiniyiinta daanta galbeed iyo marinka qasa": "PS",
     "Dhulxeebeedka Osheeniya": "QO",
diff --git a/js/data/locale/so/ctryreverse.json b/js/data/locale/so/ctryreverse.json
index 4c8e16adf8..45b1569024 100644
--- a/js/data/locale/so/ctryreverse.json
+++ b/js/data/locale/so/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israaʼiil",
     "IM": "Jasiiradda Isle of Man",
     "IN": "Hindiya",
-    "IO": "Dhul xadeedka Badweynta Hindiya ee Biritishka",
+    "IO": "Dhul xadeedka Badweynta Hindiya ee Ingiriiska",
     "IQ": "Ciraaq",
     "IR": "Iiraan",
     "IS": "Ayslaand",
diff --git a/js/data/locale/so/sysres.json b/js/data/locale/so/sysres.json
index b143931ac0..c0256aa3e7 100644
--- a/js/data/locale/so/sysres.json
+++ b/js/data/locale/so/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#{num} ilbrqsi|#{num} ilbrqsi",
     "#in {num}w": "one#{num} tdbd|#{num} tdbd",
     "#in {num}y": "one#{num} snd|#{num} snd",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}m|#{num}m",
     "#{num}d ago": "one#{num} mln khr|#{num} mlmd khr",
     "#{num}h": "one#{num} scd|#{num} s",
diff --git a/js/data/locale/so/unitfmt.json b/js/data/locale/so/unitfmt.json
index 98b445921a..9c02ac5a72 100644
--- a/js/data/locale/so/unitfmt.json
+++ b/js/data/locale/so/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} hawada agagaarka",
             "bar": "#{n} bar",
             "barrel": "#{n} foosto",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit Ilbiriqsigiiba",
             "british-thermal-unit": "one#halbeega kulaylka ee Biritishka|#{n} halbeega kulaylka ee Biritishka",
@@ -42,8 +43,8 @@
             "degree": "#{n} digrii",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "one#dhibco halkii sentimitir|#{n} dhibco halkii sentimitirkii",
+            "dot": "one#{n} dhiibic|#{n} dhibicyo",
+            "dot-per-centimeter": "#{n} dhibco halkii sentimitir",
             "dot-per-inch": "#{n} dhibic injigiiba",
             "dram": "#{n} dram",
             "drop": "#{n} drop",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} ha",
             "bar": "#{n} bar",
             "barrel": "#{n} fsto",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/ilbrgba",
             "british-thermal-unit": "#{n} Hkb",
@@ -248,8 +250,8 @@
             "degree": "#{n} dig",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "one#dhsm|#{n} dhsm",
+            "dot": "one#{n} dhiibic|#{n} dhibicyo",
+            "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dhbi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
diff --git a/js/data/locale/sq/sysres.json b/js/data/locale/sq/sysres.json
index 6b4e4b61f9..08aebffb94 100644
--- a/js/data/locale/sq/sysres.json
+++ b/js/data/locale/sq/sysres.json
@@ -88,13 +88,13 @@
     "EE4": "enj",
     "EE5": "pre",
     "EE6": "sht",
-    "EEE0": "Die",
-    "EEE1": "Hën",
-    "EEE2": "Mar",
-    "EEE3": "Mër",
-    "EEE4": "Enj",
-    "EEE5": "Pre",
-    "EEE6": "Sht",
+    "EEE0": "die",
+    "EEE1": "hën",
+    "EEE2": "mar",
+    "EEE3": "mër",
+    "EEE4": "enj",
+    "EEE5": "pre",
+    "EEE6": "sht",
     "EEEE0": "e diel",
     "EEEE1": "e hënë",
     "EEEE2": "e martë",
diff --git a/js/data/locale/sq/unitfmt.json b/js/data/locale/sq/unitfmt.json
index 5e5492a0a1..d960a6775d 100644
--- a/js/data/locale/sq/unitfmt.json
+++ b/js/data/locale/sq/unitfmt.json
@@ -10,10 +10,11 @@
             "atmosphere": "#{n} atmosferë",
             "bar": "one#{n} bar|#{n} bare",
             "barrel": "#{n} fuçi",
+            "beaufort": "#{n} Beaufort",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/sekondë",
             "british-thermal-unit": "#{n} njësi termale britanike",
-            "bushel": "one#{n} bushel|#{n} bushelë",
+            "bushel": "one#{n} shinik|#{n} shinikë",
             "byte": "#{n} bajt",
             "byte-per-hour": "#{n} bajt/orë",
             "byte-per-second": "#{n} bajt/sekondë",
@@ -40,26 +41,26 @@
             "deciliter": "one#{n} decilitër|#{n} decilitra",
             "decimeter": "one#{n} decimetër|#{n} decimetra",
             "degree": "#{n} gradë",
-            "dessert-spoon": "#{n} dstspn",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dessert-spoon": "#{n} lugë ëmbëlsire",
+            "dessert-spoon-imperial": "#{n} lugë ëmbëlsire imperiale",
             "dot": "one#{n} pikë|#{n} pika",
             "dot-per-centimeter": "one#{n} pikë për centimetër|#{n} pika për centimetër",
             "dot-per-inch": "one#{n} pikë për inç|#{n} pika për inç",
             "dram": "one#{n} drahmë i lëngshëm|#{n} drahma të lëngshme",
-            "drop": "#{n} drop",
+            "drop": "one#{n} çikë|#{n} çika",
             "dunam": "one#{n} dynym|#{n} dynymë",
             "earth-mass": "one#{n} masë Toke|#{n} masa Toke",
             "earth-radius": "#{n} rreze toke",
             "electronvolt": "#{n} elektrovolt",
             "em": "#{n} em tipografike",
             "fahrenheit": "#{n} gradë Farenhait",
-            "fathom": "#{n} fth",
+            "fathom": "one#{n} pash detar|#{n} pashë detare",
             "fluid-ounce": "one#{n} ons i lëngshëm|#{n} onsë të lëngshëm",
             "fluid-ounce-imperial": "one#{n} ons i lëngshëm imperial|#{n} onsë të lëngshëm imperial",
             "foodcalorie": "#{n} kalori ushqimore",
             "foot": "#{n} këmbë",
             "foot-per-second": "#{n} këmbë/sekondë",
-            "furlong": "#{n} fur",
+            "furlong": "one#{n} furlong|#{n} furlongë",
             "g-force": "#{n} g-forcë",
             "gallon": "one#{n} gallon|#{n} gallonë",
             "gallon-imperial": "one#{n} gallon imperial|#{n} gallonë imperial",
@@ -82,7 +83,7 @@
             "inch": "#{n} inç",
             "inch-ofhg": "#{n} inç merkuri",
             "item": "#{n} njësi",
-            "jigger": "#{n} jigger",
+            "jigger": "#{n} teke",
             "joule": "#{n} zhul",
             "karat": "one#{n} karat|#{n} karatë",
             "kelvin": "#{n} Kelvin",
@@ -104,7 +105,7 @@
             "kilowatt-hour": "#{n} kilovat-orë",
             "kilowatt-hour-per-100-kilometer": "#{n} kilovat-orë në 100 kilometra",
             "knot": "#{n} milje nautike në orë",
-            "light-year": "one#{n} vit drite|#{n} vite dritë",
+            "light-year": "one#{n} vit dritë|#{n} vite dritë",
             "liter": "one#{n} litër|#{n} litra",
             "liter-per-100-kilometer": "one#{n} litër për 100 kilometra|#{n} litra për 100 kilometra",
             "liter-per-kilometer": "one#{n} litër për kilometër|#{n} litra për kilometër",
@@ -154,14 +155,14 @@
             "ounce": "one#{n} ons|#{n} onsë",
             "ounce-troy": "one#{n} ons troi|#{n} onsë troi",
             "parsec": "one#{n} parsek|#{n} parsekë",
-            "pascal": "#{n} Pa",
+            "pascal": "one#{n} paskal|#{n} paskalë",
             "percent": "#{n} përqind",
             "permille": "#{n} përmijë",
             "permillion": "#{n} pjesë për milion",
             "permyriad": "#{n} përdhjetëmijë",
             "petabyte": "#{n} petabajt",
             "picometer": "one#{n} pikometër|#{n} pikometra",
-            "pinch": "#{n} pinch",
+            "pinch": "one#{n} pisk|#{n} piska",
             "pint": "one#{n} pintë|#{n} pinta",
             "pint-metric": "one#{n} pintë metrike|#{n} pinta metrike",
             "pixel": "one#{n} piksel|#{n} pikselë",
@@ -173,7 +174,7 @@
             "pound-force-foot": "#{n} paund-këmbë",
             "pound-force-per-square-inch": "#{n} paund për inç në katror",
             "quart": "one#{n} çerek|#{n} çerekë",
-            "quart-imperial": "#{n} qt Imp.",
+            "quart-imperial": "one#{n} çerek imperialë|#{n} çerekë imperialë",
             "quarter": "one#{n} çerek|#{n} çerekë",
             "radian": "#{n} radianë",
             "revolution": "one#{n} rrotullim|#{n} rrotullime",
@@ -199,7 +200,7 @@
             "terabyte-per-second": "#{n} terabajt/sekondë",
             "therm-us": "#{n} njësi termale amerikane",
             "ton": "one#{n} ton|#{n} tonë",
-            "tonne": "one#{n} ton metrik|#{n} tonë metrik",
+            "tonne": "one#{n} ton metrik|#{n} tonë metrikë",
             "volt": "#{n} volt",
             "watt": "#{n} vat",
             "week": "#{n} javë",
@@ -216,10 +217,11 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#{n} B",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/sek.",
             "british-thermal-unit": "#{n} Btu",
-            "bushel": "#{n} bu",
+            "bushel": "one#{n} shinik|#{n} shinikë",
             "byte": "#{n} bajt",
             "byte-per-hour": "#{n} bajt/orë",
             "byte-per-second": "#{n} bajt/sek.",
@@ -248,10 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
-            "dram": "#{n} dram fl",
+            "dram": "one#{n} fl.dr.|#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "one#{n} dynym|#{n} dynymë",
             "earth-mass": "#{n} M⊕",
@@ -288,7 +287,7 @@
             "inch": "#{n} in",
             "inch-ofhg": "#{n} inHg",
             "item": "#{n} njësi",
-            "jigger": "#{n} jigger",
+            "jigger": "one#{n} teke|#{n} jigger",
             "joule": "#{n} J",
             "karat": "#{n} kt",
             "kelvin": "#{n} K",
@@ -367,7 +366,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
+            "pinch": "one#{n} pisk|#{n} pinch",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
diff --git a/js/data/locale/sr/Cyrl/BA/sysres.json b/js/data/locale/sr/Cyrl/BA/sysres.json
index 526789b589..82df8b7650 100644
--- a/js/data/locale/sr/Cyrl/BA/sysres.json
+++ b/js/data/locale/sr/Cyrl/BA/sysres.json
@@ -5,8 +5,11 @@
     "#{num}h ago": "one#прије {num} ч.|few#прије {num} ч.|#прије {num} ч.",
     "#{num}mi ago": "one#прије {num} мин.|few#прије {num} мин.|#прије {num} мин.",
     "#{num}mo ago": "one#прије {num} мјес.|few#прије {num} мјес.|#прије {num} мјес.",
+    "#{num}s": "one#{num} сек|few#{num} с|#{num} с",
     "#{num}s ago": "one#прије {num} сек.|few#прије {num} сек.|#прије {num} сек.",
+    "#{num}w": "one#{num} нед.|few#{num} н|#{num} н",
     "#{num}w ago": "one#прије {num} седм.|few#прије {num} седм.|#прије {num} седм.",
+    "#{num}y": "one#{num} г|few#{num} год.|#{num} г",
     "#{num}y ago": "one#прије {num} год.|few#прије {num} год.|#прије {num} год.",
     "1#1 day ago|#{num} days ago": "one#прије {num} дана|few#прије {num} дана|#прије {num} дана",
     "1#1 dy ago|#{num} dys ago": "one#прије {num} дана|few#прије {num} дана|#прије {num} дана",
@@ -18,8 +21,10 @@
     "1#1 month ago|#{num} months ago": "one#прије {num} мјесеца|few#прије {num} мјесеца|#прије {num} мјесеци",
     "1#1 month|#{num} months": "one#{num} мјесец|few#{num} мјесеца|#{num} мјесеци",
     "1#1 mon|#{num} mons": "one#{num} мјес.|few#{num} мјес.|#{num} мјес.",
+    "1#1 mo|#{num} mos": "one#{num} м|few#{num} мјес.|#{num} м",
     "1#1 sec ago|#{num} sec ago": "one#прије {num} секунде|few#прије {num} секунде|#прије {num} секунди",
     "1#1 second ago|#{num} seconds ago": "one#прије {num} секунде|few#прије {num} секунде|#прије {num} секунди",
+    "1#1 se|#{num} sec": "one#{num} сек|few#{num} с|#{num} с",
     "1#1 week ago|#{num} weeks ago": "one#прије {num} седмице|few#прије {num} седмице|#прије {num} седмица",
     "1#1 week|#{num} weeks": "one#{num} недјеља|few#{num} недјеље|#{num} недјеља",
     "1#1 wk ago|#{num} wks ago": "one#прије {num} седмице|few#прије {num} седмице|#прије {num} седмица",
@@ -36,5 +41,8 @@
     "EEEE1": "понедјељак",
     "EEEE3": "сриједа",
     "a0": "прије подне",
-    "a1": "по подне"
+    "a1": "по подне",
+    "durationMediumWeeks": "one#{num} нед.|few#{num} н|#{num} н",
+    "durationMediumYears": "one#{num} г|few#{num} год.|#{num} г",
+    "durationShortMonths": "one#{num} м|few#{num} мјес.|#{num} м"
 }
\ No newline at end of file
diff --git a/js/data/locale/sr/Cyrl/BA/unitfmt.json b/js/data/locale/sr/Cyrl/BA/unitfmt.json
index 7593d78fd7..ea82d4963c 100644
--- a/js/data/locale/sr/Cyrl/BA/unitfmt.json
+++ b/js/data/locale/sr/Cyrl/BA/unitfmt.json
@@ -2,7 +2,7 @@
     "unitfmt": {
         "long": {
             "acre": "one#{n} акер|#{n} акера",
-            "acre-foot": "few#{n} акер стопе|#{n} акер стопа",
+            "acre-foot": "one#{n} ac ft|few#{n} акер стопе|#{n} акер стопа",
             "ampere": "one#{n} ампер|#{n} ампера",
             "arc-minute": "one#{n} лучни минут|few#{n} лучна минута|#{n} лучних минута",
             "arc-second": "one#{n} лучна секунда|few#{n} лучне секунде|#{n} лучних секунди",
@@ -10,6 +10,7 @@
             "atmosphere": "few#{n} атмосфере|#{n} атмосфера",
             "bar": "one#{n} бар|#{n} бара",
             "barrel": "one#{n} барел|#{n} барела",
+            "beaufort": "#B {n}",
             "bit": "one#{n} бит|few#{n} бита|#{n} битова",
             "bit-per-second": "#{n} битова/у секунди",
             "british-thermal-unit": "#{n} Btu",
@@ -43,8 +44,8 @@
             "dessert-spoon": "one#{n} десертна кашичица|few#{n} десертне кашичице|#{n} десертних кашичица",
             "dessert-spoon-imperial": "one#{n} империјска десертна кашичица|few#{n} империјске десертне кашичице|#{n} империјских десертних кашичица",
             "dot": "one#{n} тачка|few#{n} тачке|#{n} тачака",
-            "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "one#{n} тачка по центиметру|few#{n} ppcm|#{n} dpcm",
+            "dot-per-inch": "one#{n} тачка по инчу|few#{n} ppi|#{n} dpi",
             "dram": "one#{n} драм течности|#{n} драма течности",
             "drop": "one#{n} кап|#{n} капи",
             "dunam": "one#{n} дунам|#{n} дунама",
@@ -60,9 +61,9 @@
             "foot": "few#{n} стопе|#{n} стопа",
             "foot-per-second": "#{n} стопа/у секунди",
             "furlong": "one#{n} фурлонг|#{n} фурлонга",
-            "g-force": "#{n} ге сила",
+            "g-force": "few#{n} G|#{n} ге сила",
             "gallon": "one#{n} галон|#{n} галона",
-            "gallon-imperial": "one#{n} имп. галон|#{n} имп. галона",
+            "gallon-imperial": "one#{n} имп. галон|few#{n} gal Imp.|#{n} имп. галона",
             "generic": "#{n}°",
             "gigabit": "one#{n} гигабит|few#{n} гигабита|#{n} гигабитова",
             "gigabit-per-second": "#{n} гигабитова/у секунди",
@@ -76,11 +77,11 @@
             "hectare": "one#{n} хектар|#{n} хектара",
             "hectoliter": "one#{n} хектолитар|few#{n} хектолитра|#{n} хектолитара",
             "hectopascal": "one#{n} хектопаскал|#{n} хектопаскала",
-            "hertz": "one#{n} херц|#{n} херца",
+            "hertz": "one#{n} херц|few#{n} Hz|#{n} херца",
             "horsepower": "one#{n} коњска снага|few#{n} коњске снаге|#{n} коњских снага",
             "hour": "one#{n} сат|few#{n} сата|#{n} сати",
             "inch": "one#{n} инч|#{n} инча",
-            "inch-ofhg": "one#{n} инч живиног стуба|#{n} инча живиног стуба",
+            "inch-ofhg": "one#{n} инч живиног стуба|few#{n} inHg|#{n} инча живиног стуба",
             "item": "one#{n} ставка|few#{n} ставке|#{n} ставки",
             "jigger": "one#{n} џигер|#{n} џигера",
             "joule": "one#{n} џул|#{n} џула",
@@ -94,7 +95,7 @@
             "kilocalorie": "few#{n} килокалорије|#{n} килокалорија",
             "kilogram": "one#{n} килограм|#{n} килограма",
             "kilohertz": "one#{n} килохерц|#{n} килохерца",
-            "kilojoule": "one#{n} килоџул|#{n} килоџула",
+            "kilojoule": "one#{n} килоџул|few#{n} kJ|#{n} килоџула",
             "kilometer": "one#{n} километар|few#{n} километра|#{n} километара",
             "kilometer-per-hour": "one#{n} километар на сат|few#{n} километра на сат|#{n} километара на сат",
             "kilometer-per-liter": "#{n} километара по литри",
@@ -132,8 +133,8 @@
             "mile-per-hour": "few#{n} миље на сат|#{n} миља на сат",
             "mile-per-second": "#{n} миља/у секунди",
             "mile-scandinavian": "one#{n} скандинавска миља|few#{n} скандинавске миље|#{n} скандинавских миља",
-            "milliampere": "one#{n} милиампер|#{n} милиампера",
-            "millibar": "one#{n} милибар|#{n} милибара",
+            "milliampere": "one#{n} милиампер|few#{n} mA|#{n} милиампера",
+            "millibar": "one#{n} милибар|few#{n} mbar|#{n} милибара",
             "milligram": "one#{n} милиграм|#{n} милиграма",
             "milligram-ofglucose-per-deciliter": "one#{n} милиграм по децилитру|#{n} милиграма по децилитру",
             "milliliter": "one#{n} милилитар|few#{n} милилитра|#{n} милилитара",
@@ -166,7 +167,7 @@
             "pint-metric": "one#{n} метричка пинта|few#{n} метричке пинте|#{n} метричких пинти",
             "pixel": "one#{n} пиксел|#{n} пиксела",
             "pixel-per-centimeter": "one#{n} пиксел на центиметар|#{n} пиксела на центиметар",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-inch": "one#{n} пиксел по инчу|#{n} пиксела по инчу",
             "point": "#{n} pt",
             "pound": "one#{n} фунта|few#{n} фунте|#{n} фунти",
             "pound-force": "one#{n} фунта силе|few#{n} фунте силе|#{n} фунти силе",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "one#B {n}|few#B {n}|#Б {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/с",
             "british-thermal-unit": "#{n} Btu",
@@ -246,8 +248,8 @@
             "deciliter": "#{n} dL",
             "decimeter": "#{n} dm",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} dstspn",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dessert-spoon": "#{n} дес. каш.",
+            "dessert-spoon-imperial": "#{n} имп. дес. каш.",
             "dot": "one#{n} тачка|few#{n} тачке|#{n} тачака",
             "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
             "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
@@ -288,7 +290,7 @@
             "inch": "one#{n} инч|#{n} инча",
             "inch-ofhg": "#{n} inHg",
             "item": "one#{n} ставка|few#{n} ставке|#{n} ставки",
-            "jigger": "#{n} jigger",
+            "jigger": "one#{n} џигер|#{n} џигера",
             "joule": "#{n} J",
             "karat": "#{n} kt",
             "kelvin": "#{n} K",
@@ -367,7 +369,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
+            "pinch": "one#{n} прстохват|#{n} прстохвата",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
diff --git a/js/data/locale/sr/Cyrl/ME/sysres.json b/js/data/locale/sr/Cyrl/ME/sysres.json
index 7274c8ff2a..f0ad8829cd 100644
--- a/js/data/locale/sr/Cyrl/ME/sysres.json
+++ b/js/data/locale/sr/Cyrl/ME/sysres.json
@@ -1,6 +1,9 @@
 {
     "B1": "прије подне",
+    "B2": "јутро",
+    "B4": "по под.",
     "B5": "по подне",
+    "B6": "вече",
     "EEEE0": "недјеља",
     "EEEE3": "сриједа",
     "LLL3": "март",
diff --git a/js/data/locale/sr/Cyrl/XK/sysres.json b/js/data/locale/sr/Cyrl/XK/sysres.json
index f92fbd4b1c..38a9d015b3 100644
--- a/js/data/locale/sr/Cyrl/XK/sysres.json
+++ b/js/data/locale/sr/Cyrl/XK/sysres.json
@@ -1,4 +1,6 @@
 {
+    "B2": "јутро",
+    "B4": "по под.",
     "LLL3": "март",
     "LLL9": "септ",
     "MMM3": "март",
diff --git a/js/data/locale/sr/Latn/BA/sysres.json b/js/data/locale/sr/Latn/BA/sysres.json
index 57727ae58a..2a11124c06 100644
--- a/js/data/locale/sr/Latn/BA/sysres.json
+++ b/js/data/locale/sr/Latn/BA/sysres.json
@@ -5,8 +5,11 @@
     "#{num}h ago": "one#prije {num} č.|few#prije {num} č.|#prije {num} č.",
     "#{num}mi ago": "one#prije {num} min.|few#prije {num} min.|#prije {num} min.",
     "#{num}mo ago": "one#prije {num} mjes.|few#prije {num} mjes.|#prije {num} mjes.",
+    "#{num}s": "one#{num} sek|few#{num} s|#{num} s",
     "#{num}s ago": "one#prije {num} sek.|few#prije {num} sek.|#prije {num} sek.",
+    "#{num}w": "one#{num} ned.|few#{num} n|#{num} n",
     "#{num}w ago": "one#prije {num} sedm.|few#prije {num} sedm.|#prije {num} sedm.",
+    "#{num}y": "one#{num} g|few#{num} god.|#{num} g",
     "#{num}y ago": "one#prije {num} god.|few#prije {num} god.|#prije {num} god.",
     "1#1 day ago|#{num} days ago": "one#prije {num} dana|few#prije {num} dana|#prije {num} dana",
     "1#1 dy ago|#{num} dys ago": "one#prije {num} dana|few#prije {num} dana|#prije {num} dana",
@@ -18,8 +21,10 @@
     "1#1 month ago|#{num} months ago": "one#prije {num} mjeseca|few#prije {num} mjeseca|#prije {num} mjeseci",
     "1#1 month|#{num} months": "one#{num} mjesec|few#{num} mjeseca|#{num} mjeseci",
     "1#1 mon|#{num} mons": "one#{num} mjes.|few#{num} mjes.|#{num} mjes.",
+    "1#1 mo|#{num} mos": "one#{num} m|few#{num} mjes.|#{num} m",
     "1#1 sec ago|#{num} sec ago": "one#prije {num} sekunde|few#prije {num} sekunde|#prije {num} sekundi",
     "1#1 second ago|#{num} seconds ago": "one#prije {num} sekunde|few#prije {num} sekunde|#prije {num} sekundi",
+    "1#1 se|#{num} sec": "one#{num} sek|few#{num} s|#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#prije {num} sedmice|few#prije {num} sedmice|#prije {num} sedmica",
     "1#1 week|#{num} weeks": "one#{num} nedjelja|few#{num} nedjelje|#{num} nedjelja",
     "1#1 wk ago|#{num} wks ago": "one#prije {num} sedmice|few#prije {num} sedmice|#prije {num} sedmica",
@@ -36,5 +41,8 @@
     "EEEE1": "ponedjeljak",
     "EEEE3": "srijeda",
     "a0": "prije podne",
-    "a1": "po podne"
+    "a1": "po podne",
+    "durationMediumWeeks": "one#{num} ned.|few#{num} n|#{num} n",
+    "durationMediumYears": "one#{num} g|few#{num} god.|#{num} g",
+    "durationShortMonths": "one#{num} m|few#{num} mjes.|#{num} m"
 }
\ No newline at end of file
diff --git a/js/data/locale/sr/Latn/BA/unitfmt.json b/js/data/locale/sr/Latn/BA/unitfmt.json
index fdc135695e..8397fd6b42 100644
--- a/js/data/locale/sr/Latn/BA/unitfmt.json
+++ b/js/data/locale/sr/Latn/BA/unitfmt.json
@@ -2,7 +2,7 @@
     "unitfmt": {
         "long": {
             "acre": "one#{n} aker|#{n} akera",
-            "acre-foot": "few#{n} aker stope|#{n} aker stopa",
+            "acre-foot": "one#{n} ac ft|few#{n} aker stope|#{n} aker stopa",
             "ampere": "one#{n} amper|#{n} ampera",
             "arc-minute": "one#{n} lučni minut|few#{n} lučna minuta|#{n} lučnih minuta",
             "arc-second": "one#{n} lučna sekunda|few#{n} lučne sekunde|#{n} lučnih sekundi",
@@ -10,6 +10,7 @@
             "atmosphere": "few#{n} atmosfere|#{n} atmosfera",
             "bar": "one#{n} bar|#{n} bara",
             "barrel": "one#{n} barel|#{n} barela",
+            "beaufort": "#B {n}",
             "bit": "one#{n} bit|few#{n} bita|#{n} bitova",
             "bit-per-second": "#{n} bitova/u sekundi",
             "british-thermal-unit": "#{n} Btu",
@@ -43,8 +44,8 @@
             "dessert-spoon": "one#{n} desertna kašičica|few#{n} desertne kašičice|#{n} desertnih kašičica",
             "dessert-spoon-imperial": "one#{n} imperijska desertna kašičica|few#{n} imperijske desertne kašičice|#{n} imperijskih desertnih kašičica",
             "dot": "one#{n} tačka|few#{n} tačke|#{n} tačaka",
-            "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "one#{n} tačka po centimetru|few#{n} ppcm|#{n} dpcm",
+            "dot-per-inch": "one#{n} tačka po inču|few#{n} ppi|#{n} dpi",
             "dram": "one#{n} dram tečnosti|#{n} drama tečnosti",
             "drop": "one#{n} kap|#{n} kapi",
             "dunam": "one#{n} dunam|#{n} dunama",
@@ -60,9 +61,9 @@
             "foot": "few#{n} stope|#{n} stopa",
             "foot-per-second": "#{n} stopa/u sekundi",
             "furlong": "one#{n} furlong|#{n} furlonga",
-            "g-force": "#{n} ge sila",
+            "g-force": "few#{n} G|#{n} ge sila",
             "gallon": "one#{n} galon|#{n} galona",
-            "gallon-imperial": "one#{n} imp. galon|#{n} imp. galona",
+            "gallon-imperial": "one#{n} imp. galon|few#{n} gal Imp.|#{n} imp. galona",
             "generic": "#{n}°",
             "gigabit": "one#{n} gigabit|few#{n} gigabita|#{n} gigabitova",
             "gigabit-per-second": "#{n} gigabitova/u sekundi",
@@ -76,11 +77,11 @@
             "hectare": "one#{n} hektar|#{n} hektara",
             "hectoliter": "one#{n} hektolitar|few#{n} hektolitra|#{n} hektolitara",
             "hectopascal": "one#{n} hektopaskal|#{n} hektopaskala",
-            "hertz": "one#{n} herc|#{n} herca",
+            "hertz": "one#{n} herc|few#{n} Hz|#{n} herca",
             "horsepower": "one#{n} konjska snaga|few#{n} konjske snage|#{n} konjskih snaga",
             "hour": "one#{n} sat|few#{n} sata|#{n} sati",
             "inch": "one#{n} inč|#{n} inča",
-            "inch-ofhg": "one#{n} inč živinog stuba|#{n} inča živinog stuba",
+            "inch-ofhg": "one#{n} inč živinog stuba|few#{n} inHg|#{n} inča živinog stuba",
             "item": "one#{n} stavka|few#{n} stavke|#{n} stavki",
             "jigger": "one#{n} džiger|#{n} džigera",
             "joule": "one#{n} džul|#{n} džula",
@@ -94,7 +95,7 @@
             "kilocalorie": "few#{n} kilokalorije|#{n} kilokalorija",
             "kilogram": "one#{n} kilogram|#{n} kilograma",
             "kilohertz": "one#{n} kiloherc|#{n} kiloherca",
-            "kilojoule": "one#{n} kilodžul|#{n} kilodžula",
+            "kilojoule": "one#{n} kilodžul|few#{n} kJ|#{n} kilodžula",
             "kilometer": "one#{n} kilometar|few#{n} kilometra|#{n} kilometara",
             "kilometer-per-hour": "one#{n} kilometar na sat|few#{n} kilometra na sat|#{n} kilometara na sat",
             "kilometer-per-liter": "#{n} kilometara po litri",
@@ -132,8 +133,8 @@
             "mile-per-hour": "few#{n} milje na sat|#{n} milja na sat",
             "mile-per-second": "#{n} milja/u sekundi",
             "mile-scandinavian": "one#{n} skandinavska milja|few#{n} skandinavske milje|#{n} skandinavskih milja",
-            "milliampere": "one#{n} miliamper|#{n} miliampera",
-            "millibar": "one#{n} milibar|#{n} milibara",
+            "milliampere": "one#{n} miliamper|few#{n} mA|#{n} miliampera",
+            "millibar": "one#{n} milibar|few#{n} mbar|#{n} milibara",
             "milligram": "one#{n} miligram|#{n} miligrama",
             "milligram-ofglucose-per-deciliter": "one#{n} miligram po decilitru|#{n} miligrama po decilitru",
             "milliliter": "one#{n} mililitar|few#{n} mililitra|#{n} mililitara",
@@ -166,7 +167,7 @@
             "pint-metric": "one#{n} metrička pinta|few#{n} metričke pinte|#{n} metričkih pinti",
             "pixel": "one#{n} piksel|#{n} piksela",
             "pixel-per-centimeter": "one#{n} piksel na centimetar|#{n} piksela na centimetar",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-inch": "one#{n} piksel po inču|#{n} piksela po inču",
             "point": "#{n} pt",
             "pound": "one#{n} funta|few#{n} funte|#{n} funti",
             "pound-force": "one#{n} funta sile|few#{n} funte sile|#{n} funti sile",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -246,8 +248,8 @@
             "deciliter": "#{n} dL",
             "decimeter": "#{n} dm",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} dstspn",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dessert-spoon": "#{n} des. kaš.",
+            "dessert-spoon-imperial": "#{n} imp. des. kaš.",
             "dot": "one#{n} tačka|few#{n} tačke|#{n} tačaka",
             "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
             "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
@@ -288,7 +290,7 @@
             "inch": "one#{n} inč|#{n} inča",
             "inch-ofhg": "#{n} inHg",
             "item": "one#{n} stavka|few#{n} stavke|#{n} stavki",
-            "jigger": "#{n} jigger",
+            "jigger": "one#{n} džiger|#{n} džigera",
             "joule": "#{n} J",
             "karat": "#{n} kt",
             "kelvin": "#{n} K",
@@ -367,7 +369,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
+            "pinch": "one#{n} prstohvat|#{n} prstohvata",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
diff --git a/js/data/locale/sr/Latn/ME/sysres.json b/js/data/locale/sr/Latn/ME/sysres.json
index 5902f6cf63..de9289963b 100644
--- a/js/data/locale/sr/Latn/ME/sysres.json
+++ b/js/data/locale/sr/Latn/ME/sysres.json
@@ -1,6 +1,9 @@
 {
     "B1": "prije podne",
+    "B2": "jutro",
+    "B4": "po pod.",
     "B5": "po podne",
+    "B6": "veče",
     "EEEE0": "nedjelja",
     "EEEE3": "srijeda",
     "LLL3": "mart",
diff --git a/js/data/locale/sr/Latn/ME/unitfmt.json b/js/data/locale/sr/Latn/ME/unitfmt.json
index 6e572d1f5c..7f236e2aaf 100644
--- a/js/data/locale/sr/Latn/ME/unitfmt.json
+++ b/js/data/locale/sr/Latn/ME/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "few#{n} atmosfere|#{n} atmosfera",
             "bar": "one#{n} bar|#{n} bara",
             "barrel": "one#{n} barel|#{n} barela",
+            "beaufort": "few#B {n}|#Bofor {n}",
             "bit": "one#{n} bit|few#{n} bita|#{n} bitova",
             "bit-per-second": "#{n} bitova/u sekundi",
             "british-thermal-unit": "#{n} Btu",
@@ -43,8 +44,8 @@
             "dessert-spoon": "one#{n} desertna kašičica|few#{n} desertne kašičice|#{n} desertnih kašičica",
             "dessert-spoon-imperial": "one#{n} imperijska desertna kašičica|few#{n} imperijske desertne kašičice|#{n} imperijskih desertnih kašičica",
             "dot": "one#{n} tačka|few#{n} tačke|#{n} tačaka",
-            "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "one#{n} tačka po centimetru|few#{n} ppcm|#{n} dpcm",
+            "dot-per-inch": "one#{n} tačka po inču|few#{n} ppi|#{n} dpi",
             "dram": "one#{n} dram tečnosti|#{n} drama tečnosti",
             "drop": "one#{n} kap|#{n} kapi",
             "dunam": "one#{n} dunam|#{n} dunama",
@@ -166,7 +167,7 @@
             "pint-metric": "one#{n} metrička pinta|few#{n} metričke pinte|#{n} metričkih pinti",
             "pixel": "one#{n} piksel|#{n} piksela",
             "pixel-per-centimeter": "one#{n} piksel na centimetar|#{n} piksela na centimetar",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-inch": "one#{n} piksel po inču|#{n} piksela po inču",
             "point": "#{n} pt",
             "pound": "one#{n} funta|few#{n} funte|#{n} funti",
             "pound-force": "one#{n} funta sile|few#{n} funte sile|#{n} funti sile",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -246,8 +248,8 @@
             "deciliter": "#{n} dL",
             "decimeter": "#{n} dm",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} dstspn",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dessert-spoon": "#{n} des. kaš.",
+            "dessert-spoon-imperial": "#{n} imp. des. kaš.",
             "dot": "one#{n} tačka|few#{n} tačke|#{n} tačaka",
             "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
             "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
@@ -288,7 +290,7 @@
             "inch": "one#{n} inč|#{n} inča",
             "inch-ofhg": "#{n} inHg",
             "item": "one#{n} stavka|few#{n} stavke|#{n} stavki",
-            "jigger": "#{n} jigger",
+            "jigger": "one#{n} džiger|#{n} džigera",
             "joule": "#{n} J",
             "karat": "#{n} kt",
             "kelvin": "#{n} K",
@@ -367,7 +369,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
+            "pinch": "one#{n} prstohvat|#{n} prstohvata",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
diff --git a/js/data/locale/sr/Latn/XK/sysres.json b/js/data/locale/sr/Latn/XK/sysres.json
index 3cece7a1ac..479f20d617 100644
--- a/js/data/locale/sr/Latn/XK/sysres.json
+++ b/js/data/locale/sr/Latn/XK/sysres.json
@@ -1,4 +1,6 @@
 {
+    "B2": "jutro",
+    "B4": "po pod.",
     "LLL3": "mart",
     "LLL9": "sept",
     "MMM3": "mart",
diff --git a/js/data/locale/sr/Latn/XK/unitfmt.json b/js/data/locale/sr/Latn/XK/unitfmt.json
index 6e572d1f5c..7f236e2aaf 100644
--- a/js/data/locale/sr/Latn/XK/unitfmt.json
+++ b/js/data/locale/sr/Latn/XK/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "few#{n} atmosfere|#{n} atmosfera",
             "bar": "one#{n} bar|#{n} bara",
             "barrel": "one#{n} barel|#{n} barela",
+            "beaufort": "few#B {n}|#Bofor {n}",
             "bit": "one#{n} bit|few#{n} bita|#{n} bitova",
             "bit-per-second": "#{n} bitova/u sekundi",
             "british-thermal-unit": "#{n} Btu",
@@ -43,8 +44,8 @@
             "dessert-spoon": "one#{n} desertna kašičica|few#{n} desertne kašičice|#{n} desertnih kašičica",
             "dessert-spoon-imperial": "one#{n} imperijska desertna kašičica|few#{n} imperijske desertne kašičice|#{n} imperijskih desertnih kašičica",
             "dot": "one#{n} tačka|few#{n} tačke|#{n} tačaka",
-            "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "one#{n} tačka po centimetru|few#{n} ppcm|#{n} dpcm",
+            "dot-per-inch": "one#{n} tačka po inču|few#{n} ppi|#{n} dpi",
             "dram": "one#{n} dram tečnosti|#{n} drama tečnosti",
             "drop": "one#{n} kap|#{n} kapi",
             "dunam": "one#{n} dunam|#{n} dunama",
@@ -166,7 +167,7 @@
             "pint-metric": "one#{n} metrička pinta|few#{n} metričke pinte|#{n} metričkih pinti",
             "pixel": "one#{n} piksel|#{n} piksela",
             "pixel-per-centimeter": "one#{n} piksel na centimetar|#{n} piksela na centimetar",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-inch": "one#{n} piksel po inču|#{n} piksela po inču",
             "point": "#{n} pt",
             "pound": "one#{n} funta|few#{n} funte|#{n} funti",
             "pound-force": "one#{n} funta sile|few#{n} funte sile|#{n} funti sile",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -246,8 +248,8 @@
             "deciliter": "#{n} dL",
             "decimeter": "#{n} dm",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} dstspn",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dessert-spoon": "#{n} des. kaš.",
+            "dessert-spoon-imperial": "#{n} imp. des. kaš.",
             "dot": "one#{n} tačka|few#{n} tačke|#{n} tačaka",
             "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
             "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
@@ -288,7 +290,7 @@
             "inch": "one#{n} inč|#{n} inča",
             "inch-ofhg": "#{n} inHg",
             "item": "one#{n} stavka|few#{n} stavke|#{n} stavki",
-            "jigger": "#{n} jigger",
+            "jigger": "one#{n} džiger|#{n} džigera",
             "joule": "#{n} J",
             "karat": "#{n} kt",
             "kelvin": "#{n} K",
@@ -367,7 +369,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
+            "pinch": "one#{n} prstohvat|#{n} prstohvata",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
diff --git a/js/data/locale/sr/Latn/unitfmt.json b/js/data/locale/sr/Latn/unitfmt.json
index 6e572d1f5c..7f236e2aaf 100644
--- a/js/data/locale/sr/Latn/unitfmt.json
+++ b/js/data/locale/sr/Latn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "few#{n} atmosfere|#{n} atmosfera",
             "bar": "one#{n} bar|#{n} bara",
             "barrel": "one#{n} barel|#{n} barela",
+            "beaufort": "few#B {n}|#Bofor {n}",
             "bit": "one#{n} bit|few#{n} bita|#{n} bitova",
             "bit-per-second": "#{n} bitova/u sekundi",
             "british-thermal-unit": "#{n} Btu",
@@ -43,8 +44,8 @@
             "dessert-spoon": "one#{n} desertna kašičica|few#{n} desertne kašičice|#{n} desertnih kašičica",
             "dessert-spoon-imperial": "one#{n} imperijska desertna kašičica|few#{n} imperijske desertne kašičice|#{n} imperijskih desertnih kašičica",
             "dot": "one#{n} tačka|few#{n} tačke|#{n} tačaka",
-            "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "one#{n} tačka po centimetru|few#{n} ppcm|#{n} dpcm",
+            "dot-per-inch": "one#{n} tačka po inču|few#{n} ppi|#{n} dpi",
             "dram": "one#{n} dram tečnosti|#{n} drama tečnosti",
             "drop": "one#{n} kap|#{n} kapi",
             "dunam": "one#{n} dunam|#{n} dunama",
@@ -166,7 +167,7 @@
             "pint-metric": "one#{n} metrička pinta|few#{n} metričke pinte|#{n} metričkih pinti",
             "pixel": "one#{n} piksel|#{n} piksela",
             "pixel-per-centimeter": "one#{n} piksel na centimetar|#{n} piksela na centimetar",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-inch": "one#{n} piksel po inču|#{n} piksela po inču",
             "point": "#{n} pt",
             "pound": "one#{n} funta|few#{n} funte|#{n} funti",
             "pound-force": "one#{n} funta sile|few#{n} funte sile|#{n} funti sile",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -246,8 +248,8 @@
             "deciliter": "#{n} dL",
             "decimeter": "#{n} dm",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} dstspn",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dessert-spoon": "#{n} des. kaš.",
+            "dessert-spoon-imperial": "#{n} imp. des. kaš.",
             "dot": "one#{n} tačka|few#{n} tačke|#{n} tačaka",
             "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
             "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
@@ -288,7 +290,7 @@
             "inch": "one#{n} inč|#{n} inča",
             "inch-ofhg": "#{n} inHg",
             "item": "one#{n} stavka|few#{n} stavke|#{n} stavki",
-            "jigger": "#{n} jigger",
+            "jigger": "one#{n} džiger|#{n} džigera",
             "joule": "#{n} J",
             "karat": "#{n} kt",
             "kelvin": "#{n} K",
@@ -367,7 +369,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
+            "pinch": "one#{n} prstohvat|#{n} prstohvata",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
diff --git a/js/data/locale/sr/sysres.json b/js/data/locale/sr/sysres.json
index 307cac090a..f2149b5d06 100644
--- a/js/data/locale/sr/sysres.json
+++ b/js/data/locale/sr/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#за {num} сек.|few#за {num} сек.|#за {num} сек.",
     "#in {num}w": "one#за {num} нед.|few#за {num} нед.|#за {num} нед.",
     "#in {num}y": "one#за {num} год.|few#за {num} год.|#за {num} год.",
-    "#{num} ms": "one#{num} ms|few#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} д|few#{num} д|#{num} д",
     "#{num}d ago": "one#пре {num} д.|few#пре {num} д.|#пре {num} д.",
     "#{num}h": "one#{num} ч|few#{num} ч|#{num} ч",
@@ -153,10 +153,10 @@
     "NN9": "се",
     "durationLongDays": "one#{num} дан|few#{num} дана|#{num} дана",
     "durationMediumHours": "one#{num} ч|few#{num} ч|#{num} ч",
-    "durationMediumMillis": "one#{num} ms|few#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} н|few#{num} н|#{num} н",
     "durationMediumYears": "one#{num} г|few#{num} г|#{num} г",
-    "durationShortMillis": "one#{num} ms|few#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} м|few#{num} м|#{num} м",
     "durationShortMonths": "one#{num} м|few#{num} м|#{num} м",
     "finalSeparatorFull": " и ",
diff --git a/js/data/locale/sr/unitfmt.json b/js/data/locale/sr/unitfmt.json
index 4a29102c76..6767a182b7 100644
--- a/js/data/locale/sr/unitfmt.json
+++ b/js/data/locale/sr/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "few#{n} атмосфере|#{n} атмосфера",
             "bar": "one#{n} бар|#{n} бара",
             "barrel": "one#{n} барел|#{n} барела",
+            "beaufort": "few#Б {n}|#Бофор {n}",
             "bit": "one#{n} бит|few#{n} бита|#{n} битова",
             "bit-per-second": "#{n} битова/у секунди",
             "british-thermal-unit": "#{n} Btu",
@@ -43,8 +44,8 @@
             "dessert-spoon": "one#{n} десертна кашичица|few#{n} десертне кашичице|#{n} десертних кашичица",
             "dessert-spoon-imperial": "one#{n} империјска десертна кашичица|few#{n} империјске десертне кашичице|#{n} империјских десертних кашичица",
             "dot": "one#{n} тачка|few#{n} тачке|#{n} тачака",
-            "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "one#{n} тачка по центиметру|few#{n} ppcm|#{n} dpcm",
+            "dot-per-inch": "one#{n} тачка по инчу|few#{n} ppi|#{n} dpi",
             "dram": "one#{n} драм течности|#{n} драма течности",
             "drop": "one#{n} кап|#{n} капи",
             "dunam": "one#{n} дунам|#{n} дунама",
@@ -166,7 +167,7 @@
             "pint-metric": "one#{n} метричка пинта|few#{n} метричке пинте|#{n} метричких пинти",
             "pixel": "one#{n} пиксел|#{n} пиксела",
             "pixel-per-centimeter": "one#{n} пиксел на центиметар|#{n} пиксела на центиметар",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-inch": "one#{n} пиксел по инчу|#{n} пиксела по инчу",
             "point": "#{n} pt",
             "pound": "one#{n} фунта|few#{n} фунте|#{n} фунти",
             "pound-force": "one#{n} фунта силе|few#{n} фунте силе|#{n} фунти силе",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#Б {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/с",
             "british-thermal-unit": "#{n} Btu",
@@ -246,8 +248,8 @@
             "deciliter": "#{n} dL",
             "decimeter": "#{n} dm",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} dstspn",
-            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dessert-spoon": "#{n} дес. каш.",
+            "dessert-spoon-imperial": "#{n} имп. дес. каш.",
             "dot": "one#{n} тачка|few#{n} тачке|#{n} тачака",
             "dot-per-centimeter": "one#{n} ppcm|few#{n} ppcm|#{n} dpcm",
             "dot-per-inch": "one#{n} ppi|few#{n} ppi|#{n} dpi",
@@ -288,7 +290,7 @@
             "inch": "one#{n} инч|#{n} инча",
             "inch-ofhg": "#{n} inHg",
             "item": "one#{n} ставка|few#{n} ставке|#{n} ставки",
-            "jigger": "#{n} jigger",
+            "jigger": "one#{n} џигер|#{n} џигера",
             "joule": "#{n} J",
             "karat": "#{n} kt",
             "kelvin": "#{n} K",
@@ -367,7 +369,7 @@
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
             "picometer": "#{n} pm",
-            "pinch": "#{n} pinch",
+            "pinch": "one#{n} прстохват|#{n} прстохвата",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
             "pixel": "#{n} px",
diff --git a/js/data/locale/ss/unitfmt.json b/js/data/locale/ss/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ss/unitfmt.json
+++ b/js/data/locale/ss/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ssy/unitfmt.json b/js/data/locale/ssy/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ssy/unitfmt.json
+++ b/js/data/locale/ssy/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/st/unitfmt.json b/js/data/locale/st/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/st/unitfmt.json
+++ b/js/data/locale/st/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/su/unitfmt.json b/js/data/locale/su/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/su/unitfmt.json
+++ b/js/data/locale/su/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/sv/AX/ctrynames.json b/js/data/locale/sv/AX/ctrynames.json
index 3b1f6e5058..df8cefebb3 100644
--- a/js/data/locale/sv/AX/ctrynames.json
+++ b/js/data/locale/sv/AX/ctrynames.json
@@ -22,6 +22,7 @@
     "Bahrain": "BH",
     "Bangladesh": "BD",
     "Barbados": "BB",
+    "Belarus": "BY",
     "Belgien": "BE",
     "Belize": "BZ",
     "Benin": "BJ",
@@ -51,7 +52,6 @@
     "Costa Rica": "CR",
     "Curaçao": "CW",
     "Cypern": "CY",
-    "Côte d’Ivoire": "CI",
     "Danmark": "DK",
     "Diego Garcia": "DG",
     "Djibouti": "DJ",
@@ -61,6 +61,7 @@
     "Egypten": "EG",
     "Ekvatorialguinea": "GQ",
     "El Salvador": "SV",
+    "Elfenbenskusten": "CI",
     "Eritrea": "ER",
     "Estland": "EE",
     "Eswatini": "SZ",
@@ -278,7 +279,6 @@
     "Vatikanstaten": "VA",
     "Venezuela": "VE",
     "Vietnam": "VN",
-    "Vitryssland": "BY",
     "världen": "001",
     "Västafrika": "011",
     "Västasien": "145",
diff --git a/js/data/locale/sv/AX/ctryreverse.json b/js/data/locale/sv/AX/ctryreverse.json
index a9b8cdfa1a..4b047729f9 100644
--- a/js/data/locale/sv/AX/ctryreverse.json
+++ b/js/data/locale/sv/AX/ctryreverse.json
@@ -66,7 +66,7 @@
     "BT": "Bhutan",
     "BV": "Bouvetön",
     "BW": "Botswana",
-    "BY": "Vitryssland",
+    "BY": "Belarus",
     "BZ": "Belize",
     "CA": "Kanada",
     "CC": "Kokosöarna",
@@ -74,7 +74,7 @@
     "CF": "Centralafrikanska republiken",
     "CG": "Kongo-Brazzaville",
     "CH": "Schweiz",
-    "CI": "Côte d’Ivoire",
+    "CI": "Elfenbenskusten",
     "CK": "Cooköarna",
     "CL": "Chile",
     "CM": "Kamerun",
diff --git a/js/data/locale/sv/FI/ctrynames.json b/js/data/locale/sv/FI/ctrynames.json
index 3b1f6e5058..df8cefebb3 100644
--- a/js/data/locale/sv/FI/ctrynames.json
+++ b/js/data/locale/sv/FI/ctrynames.json
@@ -22,6 +22,7 @@
     "Bahrain": "BH",
     "Bangladesh": "BD",
     "Barbados": "BB",
+    "Belarus": "BY",
     "Belgien": "BE",
     "Belize": "BZ",
     "Benin": "BJ",
@@ -51,7 +52,6 @@
     "Costa Rica": "CR",
     "Curaçao": "CW",
     "Cypern": "CY",
-    "Côte d’Ivoire": "CI",
     "Danmark": "DK",
     "Diego Garcia": "DG",
     "Djibouti": "DJ",
@@ -61,6 +61,7 @@
     "Egypten": "EG",
     "Ekvatorialguinea": "GQ",
     "El Salvador": "SV",
+    "Elfenbenskusten": "CI",
     "Eritrea": "ER",
     "Estland": "EE",
     "Eswatini": "SZ",
@@ -278,7 +279,6 @@
     "Vatikanstaten": "VA",
     "Venezuela": "VE",
     "Vietnam": "VN",
-    "Vitryssland": "BY",
     "världen": "001",
     "Västafrika": "011",
     "Västasien": "145",
diff --git a/js/data/locale/sv/FI/ctryreverse.json b/js/data/locale/sv/FI/ctryreverse.json
index a9b8cdfa1a..4b047729f9 100644
--- a/js/data/locale/sv/FI/ctryreverse.json
+++ b/js/data/locale/sv/FI/ctryreverse.json
@@ -66,7 +66,7 @@
     "BT": "Bhutan",
     "BV": "Bouvetön",
     "BW": "Botswana",
-    "BY": "Vitryssland",
+    "BY": "Belarus",
     "BZ": "Belize",
     "CA": "Kanada",
     "CC": "Kokosöarna",
@@ -74,7 +74,7 @@
     "CF": "Centralafrikanska republiken",
     "CG": "Kongo-Brazzaville",
     "CH": "Schweiz",
-    "CI": "Côte d’Ivoire",
+    "CI": "Elfenbenskusten",
     "CK": "Cooköarna",
     "CL": "Chile",
     "CM": "Kamerun",
diff --git a/js/data/locale/sv/ctrynames.json b/js/data/locale/sv/ctrynames.json
index 3b1f6e5058..df8cefebb3 100644
--- a/js/data/locale/sv/ctrynames.json
+++ b/js/data/locale/sv/ctrynames.json
@@ -22,6 +22,7 @@
     "Bahrain": "BH",
     "Bangladesh": "BD",
     "Barbados": "BB",
+    "Belarus": "BY",
     "Belgien": "BE",
     "Belize": "BZ",
     "Benin": "BJ",
@@ -51,7 +52,6 @@
     "Costa Rica": "CR",
     "Curaçao": "CW",
     "Cypern": "CY",
-    "Côte d’Ivoire": "CI",
     "Danmark": "DK",
     "Diego Garcia": "DG",
     "Djibouti": "DJ",
@@ -61,6 +61,7 @@
     "Egypten": "EG",
     "Ekvatorialguinea": "GQ",
     "El Salvador": "SV",
+    "Elfenbenskusten": "CI",
     "Eritrea": "ER",
     "Estland": "EE",
     "Eswatini": "SZ",
@@ -278,7 +279,6 @@
     "Vatikanstaten": "VA",
     "Venezuela": "VE",
     "Vietnam": "VN",
-    "Vitryssland": "BY",
     "världen": "001",
     "Västafrika": "011",
     "Västasien": "145",
diff --git a/js/data/locale/sv/ctryreverse.json b/js/data/locale/sv/ctryreverse.json
index a9b8cdfa1a..4b047729f9 100644
--- a/js/data/locale/sv/ctryreverse.json
+++ b/js/data/locale/sv/ctryreverse.json
@@ -66,7 +66,7 @@
     "BT": "Bhutan",
     "BV": "Bouvetön",
     "BW": "Botswana",
-    "BY": "Vitryssland",
+    "BY": "Belarus",
     "BZ": "Belize",
     "CA": "Kanada",
     "CC": "Kokosöarna",
@@ -74,7 +74,7 @@
     "CF": "Centralafrikanska republiken",
     "CG": "Kongo-Brazzaville",
     "CH": "Schweiz",
-    "CI": "Côte d’Ivoire",
+    "CI": "Elfenbenskusten",
     "CK": "Cooköarna",
     "CL": "Chile",
     "CM": "Kamerun",
diff --git a/js/data/locale/sv/sysres.json b/js/data/locale/sv/sysres.json
index 83c217f57f..e06b9c395c 100644
--- a/js/data/locale/sv/sysres.json
+++ b/js/data/locale/sv/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#om {num} sek|#om {num} sek",
     "#in {num}w": "one#om {num} v.|#om {num} v.",
     "#in {num}y": "one#om {num} år|#om {num} år",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num}d|#{num}d",
     "#{num}d ago": "one#för {num} d sedan|#för {num} d sedan",
     "#{num}h": "one#{num}h|#{num}h",
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#för {num} minut sedan|#för {num} minuter sedan",
     "1#1 minute ago|#{num} minutes ago": "one#för {num} minut sedan|#för {num} minuter sedan",
     "1#1 minute|#{num} minutes": "one#{num} minut|#{num} minuter",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "one#för {num} månad sedan|#för {num} månader sedan",
     "1#1 month ago|#{num} months ago": "one#för {num} månad sedan|#för {num} månader sedan",
@@ -41,7 +41,7 @@
     "1#1 sec ago|#{num} sec ago": "one#för {num} sekund sedan|#för {num} sekunder sedan",
     "1#1 second ago|#{num} seconds ago": "one#för {num} sekund sedan|#för {num} sekunder sedan",
     "1#1 second|#{num} seconds": "one#{num} sekund|#{num} sekunder",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
     "1#1 se|#{num} sec": "one#{num}s|#{num}s",
     "1#1 week ago|#{num} weeks ago": "one#för {num} vecka sedan|#för {num} veckor sedan",
     "1#1 week|#{num} weeks": "one#{num} vecka|#{num} veckor",
@@ -148,7 +148,7 @@
     "NN9": "se",
     "a0": "fm",
     "a1": "em",
-    "durationLongDays": "one#{num} d|#{num} d",
+    "durationLongDays": "#{num} d",
     "durationMediumHours": "one#{num}h|#{num}h",
     "durationMediumMillis": "one#{num}ms|#{num}ms",
     "durationMediumWeeks": "one#{num}v|#{num}v",
diff --git a/js/data/locale/sv/unitfmt.json b/js/data/locale/sv/unitfmt.json
index 0c9ab1b755..f1d888b070 100644
--- a/js/data/locale/sv/unitfmt.json
+++ b/js/data/locale/sv/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} atmosfär|#{n} atmosfärer",
             "bar": "#{n} bar",
             "barrel": "#{n} fat",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit per sekund",
             "british-thermal-unit": "one#{n} British thermal unit|#{n} British thermal units",
@@ -43,7 +44,7 @@
             "degree": "one#{n} grad|#{n} grader",
             "dessert-spoon": "one#{n} dessertsked|#{n} dessertskedar",
             "dessert-spoon-imperial": "#{n} brittiska dessertskedar",
-            "dot": "one#{n} px|#{n} punkter",
+            "dot": "one#{n} punkt|#{n} punkter",
             "dot-per-centimeter": "one#{n} punkt per centimeter|#{n} punkter per centimeter",
             "dot-per-inch": "one#{n} punkt per tum|#{n} punkter per tum",
             "dram": "#{n} dram",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} fat",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -249,9 +251,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dsk",
             "dessert-spoon-imperial": "one#br. dsk|#{n} br. dsk",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} d/cm",
-            "dot-per-inch": "#{n} d/tum",
+            "dot": "#{n} p",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} fl. dram",
             "drop": "#{n} droppe",
             "dunam": "#{n} dunam",
@@ -263,7 +265,6 @@
             "fathom": "one#{n} famn|#{n} famnar",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} br. fl oz",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} fot",
             "foot-per-second": "#{n} fot/s",
             "furlong": "#{n} en.pfrld",
diff --git a/js/data/locale/sw/KE/ctrynames.json b/js/data/locale/sw/KE/ctrynames.json
index 813ec4b806..73c8fdc589 100644
--- a/js/data/locale/sw/KE/ctrynames.json
+++ b/js/data/locale/sw/KE/ctrynames.json
@@ -62,6 +62,7 @@
     "Ekwado": "EC",
     "Elsalvado": "SV",
     "Eneo la Oceania": "QO",
+    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eneo Lisilojulikana": "ZZ",
     "Eritrea": "ER",
     "Estonia": "EE",
@@ -85,7 +86,6 @@
     "Gwadelupe": "GP",
     "Gwatemala": "GT",
     "Haiti": "HT",
-    "Himaya ya Uingereza katika Bahari Hindi": "IO",
     "Himaya za Kusini za Kifaranza": "TF",
     "Himaya za Palestina": "PS",
     "Honduras": "HN",
diff --git a/js/data/locale/sw/KE/ctryreverse.json b/js/data/locale/sw/KE/ctryreverse.json
index 78dd0dcb9e..eb10ca7aea 100644
--- a/js/data/locale/sw/KE/ctryreverse.json
+++ b/js/data/locale/sw/KE/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Kisiwa cha Man",
     "IN": "India",
-    "IO": "Himaya ya Uingereza katika Bahari Hindi",
+    "IO": "Eneo la Uingereza katika Bahari Hindi",
     "IQ": "Iraki",
     "IR": "Iran",
     "IS": "Aisilandi",
diff --git a/js/data/locale/sw/KE/unitfmt.json b/js/data/locale/sw/KE/unitfmt.json
index c0beff9a4f..86698d92d0 100644
--- a/js/data/locale/sw/KE/unitfmt.json
+++ b/js/data/locale/sw/KE/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#kanieneo {n}",
             "bar": "#baa {n}",
             "barrel": "one#pipa {n}|#mapipa {n}",
+            "beaufort": "#B {n}",
             "bit": "#biti {n}",
             "bit-per-second": "#biti {n} kwa kila sekunde",
             "british-thermal-unit": "one#kipimo {n} cha joto cha Uingereza|#vipimo {n} vya joto vya Uingereza",
@@ -216,6 +217,7 @@
             "atmosphere": "#atm {n}",
             "bar": "#baa {n}",
             "barrel": "one#pipa {n}|#mapipa {n}",
+            "beaufort": "#B {n}",
             "bit": "#biti {n}",
             "bit-per-second": "#biti {n} kwa kila sekunde",
             "british-thermal-unit": "#Btu {n}",
@@ -344,7 +346,7 @@
             "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
             "milliliter": "#mililita {n}",
             "millimeter": "#milimita {n}",
-            "millimeter-ofhg": "one#mmHg {n}|#mm Hg {n}",
+            "millimeter-ofhg": "#mm Hg {n}",
             "millimole-per-liter": "one#mmol {n}/lita|#mmol {n}/L",
             "millisecond": "#ms {n}",
             "milliwatt": "#miliwati {n}",
@@ -359,7 +361,7 @@
             "ohm": "#{n} Ω",
             "ounce": "#aunsi {n}",
             "ounce-troy": "#tola aunsi {n}",
-            "parsec": "one#pc {n}|#kila sekunde {n}",
+            "parsec": "#kila sekunde {n}",
             "pascal": "#Pa {n}",
             "percent": "#asilimia {n}",
             "permille": "#{n} kwa elfu",
@@ -370,7 +372,7 @@
             "pinch": "one#mfinyo {n} kwa vidole|#mifinyo {n} kwa vidole",
             "pint": "#painti {n}",
             "pint-metric": "#mpt {n}",
-            "pixel": "#pikseli {n}",
+            "pixel": "one#pikseli {n}|#px {n}",
             "pixel-per-centimeter": "#ppcm {n}",
             "pixel-per-inch": "#ppi {n}",
             "point": "#pointi {n}",
diff --git a/js/data/locale/sw/unitfmt.json b/js/data/locale/sw/unitfmt.json
index bfffbf1400..4f73bf761d 100644
--- a/js/data/locale/sw/unitfmt.json
+++ b/js/data/locale/sw/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#kanieneo {n}",
             "bar": "#bari {n}",
             "barrel": "one#pipa {n}|#mapipa {n}",
+            "beaufort": "#B {n}",
             "bit": "#biti {n}",
             "bit-per-second": "#biti {n} kwa kila sekunde",
             "british-thermal-unit": "one#kipimo {n} cha joto cha Uingereza|#vipimo {n} vya joto vya Uingereza",
@@ -216,6 +217,7 @@
             "atmosphere": "#atm {n}",
             "bar": "#bari {n}",
             "barrel": "one#pipa {n}|#mapipa {n}",
+            "beaufort": "#B {n}",
             "bit": "#biti {n}",
             "bit-per-second": "#biti {n} kwa kila sekunde",
             "british-thermal-unit": "#Btu {n}",
diff --git a/js/data/locale/syr/SY/ctrynames.json b/js/data/locale/syr/SY/ctrynames.json
index 60d5eafadb..2e8453414e 100644
--- a/js/data/locale/syr/SY/ctrynames.json
+++ b/js/data/locale/syr/SY/ctrynames.json
@@ -1,5 +1,6 @@
 {
     "Ascension Island": "AC",
+    "British Indian Ocean Territory": "IO",
     "Clipperton Island": "CP",
     "Diego Garcia": "DG",
     "French Polynesia": "PF",
@@ -268,7 +269,6 @@
     "ܩܝܢܝܐ": "KE",
     "ܩܝܪܓܝܙܣܬܐܢ": "KG",
     "ܩܠܝܡܐ ܕܐܘܪܘ": "EZ",
-    "ܩܠܝܡܐ ܕܒܪܝܛܢܝܐ ܓܘ ܐܘܩܝܢܘܣ ܗܢܕܘܝܐ": "IO",
     "ܩܠܝܡ̈ܐ ܕܦܪܢܣܐ ܬܝܡܢܝܬܐ": "TF",
     "ܩܪܘܐܛܝܐ": "HR",
     "ܪܘܐܢܕܐ": "RW",
diff --git a/js/data/locale/syr/SY/ctryreverse.json b/js/data/locale/syr/SY/ctryreverse.json
index 712cb173fa..4cf0ba51b0 100644
--- a/js/data/locale/syr/SY/ctryreverse.json
+++ b/js/data/locale/syr/SY/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ܐܝܣܪܐܝܠ",
     "IM": "ܓܙܪܬܐ ܕܡܐܢ",
     "IN": "ܗܢܕܘ",
-    "IO": "ܩܠܝܡܐ ܕܒܪܝܛܢܝܐ ܓܘ ܐܘܩܝܢܘܣ ܗܢܕܘܝܐ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ܥܝܪܩ",
     "IR": "ܐܝܪܐܢ",
     "IS": "ܐܝܣܠܢܕ",
diff --git a/js/data/locale/syr/ctrynames.json b/js/data/locale/syr/ctrynames.json
index 60d5eafadb..2e8453414e 100644
--- a/js/data/locale/syr/ctrynames.json
+++ b/js/data/locale/syr/ctrynames.json
@@ -1,5 +1,6 @@
 {
     "Ascension Island": "AC",
+    "British Indian Ocean Territory": "IO",
     "Clipperton Island": "CP",
     "Diego Garcia": "DG",
     "French Polynesia": "PF",
@@ -268,7 +269,6 @@
     "ܩܝܢܝܐ": "KE",
     "ܩܝܪܓܝܙܣܬܐܢ": "KG",
     "ܩܠܝܡܐ ܕܐܘܪܘ": "EZ",
-    "ܩܠܝܡܐ ܕܒܪܝܛܢܝܐ ܓܘ ܐܘܩܝܢܘܣ ܗܢܕܘܝܐ": "IO",
     "ܩܠܝܡ̈ܐ ܕܦܪܢܣܐ ܬܝܡܢܝܬܐ": "TF",
     "ܩܪܘܐܛܝܐ": "HR",
     "ܪܘܐܢܕܐ": "RW",
diff --git a/js/data/locale/syr/ctryreverse.json b/js/data/locale/syr/ctryreverse.json
index 712cb173fa..4cf0ba51b0 100644
--- a/js/data/locale/syr/ctryreverse.json
+++ b/js/data/locale/syr/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ܐܝܣܪܐܝܠ",
     "IM": "ܓܙܪܬܐ ܕܡܐܢ",
     "IN": "ܗܢܕܘ",
-    "IO": "ܩܠܝܡܐ ܕܒܪܝܛܢܝܐ ܓܘ ܐܘܩܝܢܘܣ ܗܢܕܘܝܐ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ܥܝܪܩ",
     "IR": "ܐܝܪܐܢ",
     "IS": "ܐܝܣܠܢܕ",
diff --git a/js/data/locale/syr/dateformats.json b/js/data/locale/syr/dateformats.json
index 70eaba6035..8bc8de24fb 100644
--- a/js/data/locale/syr/dateformats.json
+++ b/js/data/locale/syr/dateformats.json
@@ -5,37 +5,37 @@
                 "f": "d",
                 "l": "d",
                 "m": "d",
-                "s": "dd"
+                "s": "d"
             },
             "dm": {
-                "f": "‏d MMMM",
-                "l": "MMMM d",
-                "m": "MMM d",
-                "s": "‏MM-dd"
+                "f": "‏d ܒMMMM",
+                "l": "‏d ܒMMMM",
+                "m": "‏d ܒMMM",
+                "s": "‏d-MM"
             },
             "dmw": {
-                "f": "EEEE، ‏d MMMM",
-                "l": "EEE، MMMM d",
-                "m": "EE، MMM d",
-                "s": "E، ‏MM-dd"
+                "f": "EEEE، ‏d ܒMMMM",
+                "l": "EEE، ‏d ܒMMMM",
+                "m": "EE، ‏d ܒMMM",
+                "s": "E، ‏d-MM"
             },
             "dmwy": {
-                "f": "EEEE، d MMMM yyyy",
-                "l": "EEE، yyyy MMMM d",
-                "m": "EE، yyyy MMM d",
-                "s": "E، yyyy-MM-dd"
+                "f": "EEEE، d ܒMMMM yyyy",
+                "l": "EEE، d ܒMMMM yyyy",
+                "m": "EE، d ܒMMM yyyy",
+                "s": "E، d-MM-yyyy"
             },
             "dmy": {
-                "f": "‏d MMMM yyyy",
-                "l": "‏yyyy MMMM d",
-                "m": "‏yyyy MMM d",
-                "s": "‏yyyy-MM-dd"
+                "f": "‏d ܒMMMM yyyy",
+                "l": "‏d ܒMMMM yyyy",
+                "m": "‏d ܒMMM yyyy",
+                "s": "‏d-MM-yyyy"
             },
             "dw": {
                 "f": "EEEE، d",
                 "l": "EEE، d",
                 "m": "EE، d",
-                "s": "E، dd"
+                "s": "E، d"
             },
             "e": {
                 "f": "cccc",
@@ -55,62 +55,66 @@
                 "s": "MM"
             },
             "my": {
-                "l": "‏yyyy MMMM",
-                "m": "‏yyyy MMM",
-                "s": "‏yyyy-MM"
+                "l": "MMMM yyyy",
+                "m": "MMM yyyy",
+                "s": "‏MM-yyyy"
             },
             "y": {
                 "s": "yyyy"
             }
         },
-        "order": "{date}, {time}",
+        "order": {
+            "f": "{date} ܒܫܥܬܐ {time}",
+            "l": "{date} ܒܫܥܬܐ {time}",
+            "m": "{date}، {time}",
+            "s": "{date}، {time}"
+        },
         "range": {
             "c00": {
-                "f": "‏{sd} {sm} {sy}, {st} – {et}",
-                "l": "‏{sy} {sm} {sd}, {st} – {et}",
-                "m": "‏{sy} {sm} {sd}, {st} – {et}",
-                "s": "‏{sy}-{sm}-{sd}, {st} – {et}"
+                "f": "‏{sd} ܒ{sm} {sy} ܒܫܥܬܐ {st} – {et}",
+                "l": "‏{sd} ܒ{sm} {sy} ܒܫܥܬܐ {st} – {et}",
+                "m": "‏{sd} ܒ{sm} {sy}، {st} – {et}",
+                "s": "‏{sd}-{sm}-{sy}، {st} – {et}"
             },
             "c01": {
-                "f": "‏{sd} {sm} {sy}, {st} – ‏{ed} {em} {ey}, {et}",
-                "l": "‏{sy} {sm} {sd}, {st} – ‏{ey} {em} {ed}, {et}",
-                "m": "‏{sy} {sm} {sd}, {st} – ‏{ey} {em} {ed}, {et}",
-                "s": "‏{sy}-{sm}-{sd}, {st} – ‏{ey}-{em}-{ed}, {et}"
+                "f": "‏{sd} ܒ{sm} {sy} ܒܫܥܬܐ {st} – ‏{ed} ܒ{em} {ey} ܒܫܥܬܐ {et}",
+                "l": "‏{sd} ܒ{sm} {sy} ܒܫܥܬܐ {st} – ‏{ed} ܒ{em} {ey} ܒܫܥܬܐ {et}",
+                "m": "‏{sd} ܒ{sm} {sy}، {st} – ‏{ed} ܒ{em} {ey}، {et}",
+                "s": "‏{sd}-{sm}-{sy}، {st} – ‏{ed}-{em}-{ey}، {et}"
             },
             "c02": {
-                "f": "‏{sd} {sm} {sy}, {st} – ‏{ed} {em} {ey}, {et}",
-                "l": "‏{sy} {sm} {sd}, {st} – ‏{ey} {em} {ed}, {et}",
-                "m": "‏{sy} {sm} {sd}, {st} – ‏{ey} {em} {ed}, {et}",
-                "s": "‏{sy}-{sm}-{sd}, {st} – ‏{ey}-{em}-{ed}, {et}"
+                "f": "‏{sd} ܒ{sm} {sy} ܒܫܥܬܐ {st} – ‏{ed} ܒ{em} {ey} ܒܫܥܬܐ {et}",
+                "l": "‏{sd} ܒ{sm} {sy} ܒܫܥܬܐ {st} – ‏{ed} ܒ{em} {ey} ܒܫܥܬܐ {et}",
+                "m": "‏{sd} ܒ{sm} {sy}، {st} – ‏{ed} ܒ{em} {ey}، {et}",
+                "s": "‏{sd}-{sm}-{sy}، {st} – ‏{ed}-{em}-{ey}، {et}"
             },
             "c03": {
-                "f": "‏{sd} {sm} {sy}, {st} – ‏{ed} {em} {ey}, {et}",
-                "l": "‏{sy} {sm} {sd}, {st} – ‏{ey} {em} {ed}, {et}",
-                "m": "‏{sy} {sm} {sd}, {st} – ‏{ey} {em} {ed}, {et}",
-                "s": "‏{sy}-{sm}-{sd}, {st} – ‏{ey}-{em}-{ed}, {et}"
+                "f": "‏{sd} ܒ{sm} {sy} ܒܫܥܬܐ {st} – ‏{ed} ܒ{em} {ey} ܒܫܥܬܐ {et}",
+                "l": "‏{sd} ܒ{sm} {sy} ܒܫܥܬܐ {st} – ‏{ed} ܒ{em} {ey} ܒܫܥܬܐ {et}",
+                "m": "‏{sd} ܒ{sm} {sy}، {st} – ‏{ed} ܒ{em} {ey}، {et}",
+                "s": "‏{sd}-{sm}-{sy}، {st} – ‏{ed}-{em}-{ey}، {et}"
             },
             "c10": {
-                "f": "‏{sd} – ‏{ed} {em} {ey}",
-                "l": "‏{sy} {sm} {sd} – {ed}",
-                "m": "‏{sy} {sm} {sd} – {ed}",
-                "s": "‏{sy}-{sm}-{sd} – {ed}"
+                "f": "‏{sd} – ‏{ed} ܒ{em} {ey}",
+                "l": "‏{sd} – ‏{ed} ܒ{em} {ey}",
+                "m": "‏{sd} – ‏{ed} ܒ{em} {ey}",
+                "s": "‏{sd} – ‏{ed}-{em}-{ey}"
             },
             "c11": {
-                "f": "‏{sd} {sm} – ‏{ed} {em} {ey}",
-                "l": "‏{sy} {sm} {sd} – ‏{em} {ed}",
-                "m": "‏{sy} {sm} {sd} – ‏{ey} {em} {ed}",
-                "s": "‏{sy}-{sm}-{sd} – ‏{ey}-{em}-{ed}"
+                "f": "‏{sd} ܒ{sm} – ‏{ed} ܒ{em} {ey}",
+                "l": "‏{sd} ܒ{sm} – ‏{ed} ܒ{em} {ey}",
+                "m": "‏{sd} ܒ{sm} – ‏{ed} ܒ{em} {ey}",
+                "s": "‏{sd}-{sm} – ‏{ed}-{em}-{ey}"
             },
             "c12": {
-                "f": "‏{sd} {sm} {sy} – ‏{ed} {em} {ey}",
-                "l": "‏{sy} {sm} {sd} – ‏{ey} {em} {ed}",
-                "m": "‏{sy} {sm} {sd} – ‏{ey} {em} {ed}",
-                "s": "‏{sy}-{sm}-{sd} – ‏{ey}-{em}-{ed}"
+                "f": "‏{sd} ܒ{sm} {sy} – ‏{ed} ܒ{em} {ey}",
+                "l": "‏{sd} ܒ{sm} {sy} – ‏{ed} ܒ{em} {ey}",
+                "m": "‏{sd} ܒ{sm} {sy} – ‏{ed} ܒ{em} {ey}",
+                "s": "‏{sd}-{sm}-{sy} – ‏{ed}-{em}-{ey}"
             },
             "c20": {
-                "l": "‏{sy} {sm} – ‏{ey} {em}",
-                "m": "‏{sy} {sm} – ‏{ey} {em}",
-                "s": "‏{sy}-{sm} – ‏{ey}-{em}"
+                "m": "{sm} {sy} – {em} {ey}",
+                "s": "‏{sm}-{sy} – ‏{em}-{ey}"
             },
             "c30": {
                 "f": "‏{sy} – {ey}",
diff --git a/js/data/locale/syr/list.json b/js/data/locale/syr/list.json
index 4567eb0429..0f57aa9695 100644
--- a/js/data/locale/syr/list.json
+++ b/js/data/locale/syr/list.json
@@ -1,56 +1,80 @@
 {
     "or": {
         "full": {
-            "2": "{0} ܝܐ {1}",
-            "end": "{0}، ܝܐ {1}"
+            "2": "{0} ܐܘ {1}",
+            "end": "{0} ܐܘ {1}",
+            "middle": "{0} ܐܘ {1}",
+            "start": "{0} ܐܘ {1}"
         },
         "long": {
-            "2": "{0} ܝܐ {1}",
-            "end": "{0}، ܝܐ {1}"
+            "2": "{0} ܐܘ {1}",
+            "end": "{0} ܐܘ {1}",
+            "middle": "{0} ܐܘ {1}",
+            "start": "{0} ܐܘ {1}"
         },
         "medium": {
-            "2": "{0} ܝܐ {1}",
-            "end": "{0}، ܝܐ {1}"
+            "2": "{0} ܐܘ {1}",
+            "end": "{0} ܐܘ {1}",
+            "middle": "{0} ܐܘ {1}",
+            "start": "{0} ܐܘ {1}"
         },
         "short": {
-            "2": "{0} ܝܐ {1}",
-            "end": "{0}، ܝܐ {1}"
+            "2": "{0} ܐܘ {1}",
+            "end": "{0} ܐܘ {1}",
+            "middle": "{0} ܐܘ {1}",
+            "start": "{0} ܐܘ {1}"
         }
     },
     "standard": {
         "full": {
             "2": "{0} ܘ{1}",
-            "end": "{0}، ܘ{1}"
+            "end": "{0} ܘ{1}",
+            "middle": "{0} ܘ{1}",
+            "start": "{0} ܘ{1}"
         },
         "long": {
             "2": "{0} ܘ{1}",
-            "end": "{0}، ܘ{1}"
+            "end": "{0} ܘ{1}",
+            "middle": "{0} ܘ{1}",
+            "start": "{0} ܘ{1}"
         },
         "medium": {
             "2": "{0} ܘ{1}",
-            "end": "{0}، ܘ{1}"
+            "end": "{0} ܘ{1}",
+            "middle": "{0} ܘ{1}",
+            "start": "{0} ܘ{1}"
         },
         "short": {
             "2": "{0} ܘ{1}",
-            "end": "{0}، ܘ{1}"
+            "end": "{0} ܘ{1}",
+            "middle": "{0} ܘ{1}",
+            "start": "{0} ܘ{1}"
         }
     },
     "unit": {
         "full": {
             "2": "{0} ܘ{1}",
-            "end": "{0}، ܘ{1}"
+            "end": "{0} ܘ{1}",
+            "middle": "{0} ܘ{1}",
+            "start": "{0} ܘ{1}"
         },
         "long": {
             "2": "{0} ܘ{1}",
-            "end": "{0}، ܘ{1}"
+            "end": "{0} ܘ{1}",
+            "middle": "{0} ܘ{1}",
+            "start": "{0} ܘ{1}"
         },
         "medium": {
             "2": "{0} ܘ{1}",
-            "end": "{0}، ܘ{1}"
+            "end": "{0} ܘ{1}",
+            "middle": "{0} ܘ{1}",
+            "start": "{0} ܘ{1}"
         },
         "short": {
             "2": "{0} ܘ{1}",
-            "end": "{0}، ܘ{1}"
+            "end": "{0} ܘ{1}",
+            "middle": "{0} ܘ{1}",
+            "start": "{0} ܘ{1}"
         }
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/syr/sysres.json b/js/data/locale/syr/sysres.json
index 0a56d047b4..b3cd63d317 100644
--- a/js/data/locale/syr/sysres.json
+++ b/js/data/locale/syr/sysres.json
@@ -1,75 +1,75 @@
 {
-    "#in {num}d": "one#‏ܒ{num} ܝܘܡܐ|#‏ܒ{num} ܝܘܡܢ̈ܐ",
-    "#in {num}h": "one#‏ܒ{num} ܫܥܬܐ|#‏ܒ{num} ܫܥ̈ܐ",
-    "#in {num}mi": "one#‏ܒ{num} ܩܛܝܢܬܐ|#‏ܒ{num} ܩܛܝ̈ܢܬܐ",
-    "#in {num}mo": "one#‏ܒ{num} ܝܪܚܐ|#‏ܒ{num} ܝܪ̈ܚܐ",
-    "#in {num}s": "one#‏ܒ{num} ܪܦܦܐ|#‏ܒ{num} ܪ̈ܦܦܐ",
-    "#in {num}w": "one#‏ܒ{num} ܫܒܘܥܐ|#‏ܒ{num} ܫܒ̈ܘܥܐ",
-    "#in {num}y": "one#‏ܒ{num} ܫܢܝ̈ܐ|#‏ܒ{num} ܫܢܝ̈ܐ",
-    "#{num} ms": "one#{num} ܡܝܠܝ ܪ|#{num} ܡܝܠܝ ܪ",
-    "#{num}d": "one#{num} ܝ|#{num} ܝ",
-    "#{num}d ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܝܘܡܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܘܡܢ̈ܐ",
-    "#{num}h": "one#{num} ܫܥ|#{num} ܫܥ",
-    "#{num}h ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܫܥܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܥ̈ܐ",
-    "#{num}mi ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܩܛܝܢܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܩܛܝ̈ܢܐ",
-    "#{num}mo ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܝܪܚܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܖ̈ܚܐ",
-    "#{num}s": "one#{num} ܪ|#{num} ܪ",
-    "#{num}s ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܪܦܦܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܖ̈ܦܦܐ",
-    "#{num}w": "one#{num} ܫ|#{num} ܫ",
-    "#{num}w ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܫܒܘܥܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܒ̈ܘܥܐ",
+    "#in {num}d": "one#‏ܒܚܕ ܝܘܡܐ|#‏ܒ{num} ܝܘܡܢ̈ܐ",
+    "#in {num}h": "one#‏ܒܚܕܐ ܫܥܬܐ|#‏ܒ{num} ܫܥ̈ܐ",
+    "#in {num}mi": "one#‏ܒܚܕܐ ܩܛܝܢܬܐ|#‏ܒ{num} ܩܛܝ̈ܢܐ",
+    "#in {num}mo": "one#‏ܒܚܕ ܝܪܚܐ|#‏ܒ{num} ܝܪ̈ܚܐ",
+    "#in {num}s": "one#‏ܒܚܕ ܪܦܦܐ|#‏ܒ{num} ܪ̈ܦܦܐ",
+    "#in {num}w": "one#‏ܒܚܕ ܫܒܘܥܐ|#‏ܒ{num} ܫܒ̈ܘܥܐ",
+    "#in {num}y": "one#‏ܒܚܕܐ ܫܢܬܐ|#‏ܒ{num} ܫܢܝ̈ܐ",
+    "#{num} ms": "one#{num} ܡܝܠܝܪܦܦܐ|#{num} ܡܝܠܝܪ̈ܦܦܐ",
+    "#{num}d": "one#ܚܕ ܝܘܡܐ|#{num} ܝܘܡܢ̈ܐ",
+    "#{num}d ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܝܘܡܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܘܡܢ̈ܐ",
+    "#{num}h": "one#{num} ܫܥܬܐ|#{num} ܫ̈ܥܐ",
+    "#{num}h ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕܐ ܫܥܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܥ̈ܐ",
+    "#{num}mi ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕܐ ܩܛܝܢܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܩܛܝ̈ܢܐ",
+    "#{num}mo ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܝܪܚܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܖ̈ܚܐ",
+    "#{num}s": "one#{num} ܪܦܦܐ|#{num} ܖ̈ܦܦܐ",
+    "#{num}s ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܪܦܦܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܖ̈ܦܦܐ",
+    "#{num}w": "one#{num} ܫܒܘܥܐ|#{num} ܫܒ̈ܘܥܐ",
+    "#{num}w ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܫܒܘܥܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܒ̈ܘܥܐ",
     "#{num}y": "one#{num} ܫܢܬܐ|#{num} ܫ̈ܢܐ",
-    "#{num}y ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܫܢܝ̈ܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܢܝ̈ܐ",
-    "1#1 day ago|#{num} days ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܝܘܡܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܘܡܢ̈ܐ",
-    "1#1 day|#{num} days": "one#ܝܘܡܐ|#{num} ܝܘ̈ܡܬܐ",
-    "1#1 dy ago|#{num} dys ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܝܘܡܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܘܡܢ̈ܐ",
-    "1#1 dy|#{num} dys": "one#{num} ܝ|#{num} ܝ",
-    "1#1 hour ago|#{num} hours ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܫܥܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܥ̈ܐ",
-    "1#1 hour|#{num} hours": "one#ܫܥܬܐ|#{num} ܫ̈ܥܐ",
-    "1#1 hr ago|#{num} hrs ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܫܥܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܥ̈ܐ",
-    "1#1 hr|#{num} hrs": "one#{num} ܫܥ|#{num} ܫܥ",
+    "#{num}y ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕܐ ܫܢܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܢܝ̈ܐ",
+    "1#1 day ago|#{num} days ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܝܘܡܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܘܡܢ̈ܐ",
+    "1#1 day|#{num} days": "one#ܚܕ ܝܘܡܐ|#{num} ܝܘܡܢ̈ܐ",
+    "1#1 dy ago|#{num} dys ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܝܘܡܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܘܡܢ̈ܐ",
+    "1#1 dy|#{num} dys": "one#ܚܕ ܝܘܡܐ|#{num} ܝܘܡܢ̈ܐ",
+    "1#1 hour ago|#{num} hours ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕܐ ܫܥܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܥ̈ܐ",
+    "1#1 hour|#{num} hours": "one#{num} ܫܥܬܐ|#{num} ܫ̈ܥܐ",
+    "1#1 hr ago|#{num} hrs ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕܐ ܫܥܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܥ̈ܐ",
+    "1#1 hr|#{num} hrs": "one#{num} ܫܥܬܐ|#{num} ܫ̈ܥܐ",
     "1#1 millisecond|#{num} milliseconds": "one#{num} ܡܝܠܝܪܦܦܐ|#{num} ܡܝܠܝܪ̈ܦܦܐ",
-    "1#1 min ago|#{num} min ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܩܛܝܢܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܩܛܝ̈ܢܐ",
-    "1#1 minute ago|#{num} minutes ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܩܛܝܢܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܩܛܝ̈ܢܐ",
-    "1#1 minute|#{num} minutes": "one#ܩܛܝܢܐ|#{num} ܩܛܝܢ̈ܬܐ",
-    "1#1 min|#{num} min": "one#{num} ܩ|#{num} ܩ",
-    "1#1 mi|#{num} min": "one#{num} ܩ|#{num} ܩ",
-    "1#1 mon ago|#{num} mons ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܝܪܚܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܪ̈ܚܐ",
-    "1#1 month ago|#{num} months ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܝܪܚܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܪ̈ܚܐ",
+    "1#1 min ago|#{num} min ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕܐ ܩܛܝܢܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܩܛܝ̈ܢܐ",
+    "1#1 minute ago|#{num} minutes ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕܐ ܩܛܝܢܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܩܛܝ̈ܢܐ",
+    "1#1 minute|#{num} minutes": "one#ܩܛܝܢܐ|#{num} ܩܛܝܢ̈ܐ",
+    "1#1 min|#{num} min": "one#{num} ܩܛܝܢܐ|#{num} ܩܛܝܢ̈ܐ",
+    "1#1 mi|#{num} min": "one#{num} ܩܛܝܢܐ|#{num} ܩܛܝܢ̈ܐ",
+    "1#1 mon ago|#{num} mons ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܝܪܚܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܪ̈ܚܐ",
+    "1#1 month ago|#{num} months ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܝܪܚܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܝܪ̈ܚܐ",
     "1#1 month|#{num} months": "one#ܝܪܚܐ|#{num} ܝܪ̈ܚܐ",
     "1#1 mon|#{num} mons": "one#ܝܪܚܐ|#{num} ܝܪ̈ܚܐ",
     "1#1 mo|#{num} mos": "one#{num} ܝܪܚܐ|#{num} ܝܪ̈ܚܐ",
-    "1#1 sec ago|#{num} sec ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܪܦܦܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܖ̈ܦܦܐ",
-    "1#1 second ago|#{num} seconds ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܪܦܦܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܖ̈ܦܦܐ",
-    "1#1 second|#{num} seconds": "one#ܪܦܦܐ|#{num} ܪ̈ܦܦܐ",
-    "1#1 sec|#{num} sec": "one#{num} ܪ|#{num} ܪ",
-    "1#1 se|#{num} sec": "one#{num} ܪ|#{num} ܪ",
-    "1#1 week ago|#{num} weeks ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܫܒܘܥܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܒ̈ܘܥܐ",
-    "1#1 week|#{num} weeks": "one#ܫܒ݂ܘܥܐ|#{num} ܫܒ݂̈ܘܥܐ",
-    "1#1 wk ago|#{num} wks ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܫܒܘܥܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܒ̈ܘܥܐ",
-    "1#1 wk|#{num} wks": "one#ܫܒ݂ܘܥܐ|#{num} ܫܒ݂̈ܘܥܐ",
-    "1#1 year ago|#{num} years ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܫܢܝ̈ܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܢܝ̈ܐ",
+    "1#1 sec ago|#{num} sec ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܪܦܦܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܖ̈ܦܦܐ",
+    "1#1 second ago|#{num} seconds ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܪܦܦܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܖ̈ܦܦܐ",
+    "1#1 second|#{num} seconds": "one#{num} ܪܦܦܐ|#{num} ܪ̈ܦܦܐ",
+    "1#1 sec|#{num} sec": "one#{num} ܪܦܦܐ|#{num} ܖ̈ܦܦܐ",
+    "1#1 se|#{num} sec": "one#{num} ܪܦܦܐ|#{num} ܖ̈ܦܦܐ",
+    "1#1 week ago|#{num} weeks ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܫܒܘܥܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܒ̈ܘܥܐ",
+    "1#1 week|#{num} weeks": "one#{num} ܫܒܘܥܐ|#{num} ܫܒ̈ܘܥܐ",
+    "1#1 wk ago|#{num} wks ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕ ܫܒܘܥܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܒ̈ܘܥܐ",
+    "1#1 wk|#{num} wks": "one#{num} ܫܒܘܥܐ|#{num} ܫܒ̈ܘܥܐ",
+    "1#1 year ago|#{num} years ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕܐ ܫܢܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܢܝ̈ܐ",
     "1#1 year|#{num} years": "one#ܫܢܬܐ|#{num} ܫ̈ܢܐ",
-    "1#1 yr ago|#{num} yrs ago": "one#‏ܡ̣ܢ ܩܕܡ {num} ܫܢܝ̈ܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܢܝ̈ܐ",
+    "1#1 yr ago|#{num} yrs ago": "one#‏ܡ̣ܢ ܩܕܡ ܚܕܐ ܫܢܬܐ|#‏ܡ̣ܢ ܩܕܡ {num} ܫܢܝ̈ܐ",
     "1#1 yr|#{num} yrs": "one#ܫܢܬܐ|#{num} ܫ̈ܢܐ",
-    "1#in 1 day|#in {num} days": "one#‏ܒ{num} ܝܘܡܐ|#‏ܒ{num} ܝܘܡܢ̈ܐ",
-    "1#in 1 dy|#in {num} dys": "one#‏ܒ{num} ܝܘܡܐ|#‏ܒ{num} ܝܘܡܢ̈ܐ",
-    "1#in 1 hour|#in {num} hours": "one#‏ܒ{num} ܫܥܬܐ|#‏ܒ{num} ܫܥ̈ܐ",
-    "1#in 1 hr|#in {num} hrs": "one#‏ܒ{num} ܫܥܬܐ|#‏ܒ{num} ܫܥ̈ܐ",
-    "1#in 1 minute|#in {num} minutes": "one#‏ܒ{num} ܩܛܝܢܬܐ|#‏ܒ{num} ܩܛܝ̈ܢܬܐ",
-    "1#in 1 min|#in {num} min": "one#‏ܒ{num} ܩܛܝܢܬܐ|#‏ܒ{num} ܩܛܝ̈ܢܬܐ",
-    "1#in 1 month|#in {num} months": "one#‏ܒ{num} ܝܪܚܐ|#‏ܒ{num} ܝܪ̈ܚܐ",
-    "1#in 1 mon|#in {num} mons": "one#‏ܒ{num} ܝܪܚܐ|#‏ܒ{num} ܝܪ̈ܚܐ",
-    "1#in 1 second|#in {num} seconds": "one#‏ܒ{num} ܪܦܦܐ|#‏ܒ{num} ܪ̈ܦܦܐ",
-    "1#in 1 sec|#in {num} sec": "one#‏ܒ{num} ܪܦܦܐ|#‏ܒ{num} ܪ̈ܦܦܐ",
-    "1#in 1 week|#in {num} weeks": "one#‏ܒ{num} ܫܒܘܥܐ|#‏ܒ{num} ܫܒ̈ܘܥܐ",
-    "1#in 1 wk|#in {num} wks": "one#‏ܒ{num} ܫܒܘܥܐ|#‏ܒ{num} ܫܒ̈ܘܥܐ",
-    "1#in 1 year|#in {num} years": "one#‏ܒ{num} ܫܢܝ̈ܐ|#‏ܒ{num} ܫܢܝ̈ܐ",
-    "1#in 1 yr|#in {num} yrs": "one#‏ܒ{num} ܫܢܝ̈ܐ|#‏ܒ{num} ܫܢܝ̈ܐ",
-    "E0": "ܐ",
-    "E1": "ܒ",
-    "E2": "ܓ",
-    "E3": "ܕ",
-    "E4": "ܗ",
+    "1#in 1 day|#in {num} days": "one#‏ܒܚܕ ܝܘܡܐ|#‏ܒ{num} ܝܘܡܢ̈ܐ",
+    "1#in 1 dy|#in {num} dys": "one#‏ܒܚܕ ܝܘܡܐ|#‏ܒ{num} ܝܘܡܢ̈ܐ",
+    "1#in 1 hour|#in {num} hours": "one#‏ܒܚܕܐ ܫܥܬܐ|#‏ܒ{num} ܫܥ̈ܐ",
+    "1#in 1 hr|#in {num} hrs": "one#‏ܒܚܕܐ ܫܥܬܐ|#‏ܒ{num} ܫܥ̈ܐ",
+    "1#in 1 minute|#in {num} minutes": "one#‏ܒܚܕܐ ܩܛܝܢܬܐ|#‏ܒ{num} ܩܛܝ̈ܢܐ",
+    "1#in 1 min|#in {num} min": "one#‏ܒܚܕܐ ܩܛܝܢܬܐ|#‏ܒ{num} ܩܛܝ̈ܢܐ",
+    "1#in 1 month|#in {num} months": "one#‏ܒܚܕ ܝܪܚܐ|#‏ܒ{num} ܝܪ̈ܚܐ",
+    "1#in 1 mon|#in {num} mons": "one#‏ܒܚܕ ܝܪܚܐ|#‏ܒ{num} ܝܪ̈ܚܐ",
+    "1#in 1 second|#in {num} seconds": "one#‏ܒܚܕ ܪܦܦܐ|#‏ܒ{num} ܪ̈ܦܦܐ",
+    "1#in 1 sec|#in {num} sec": "one#‏ܒܚܕ ܪܦܦܐ|#‏ܒ{num} ܪ̈ܦܦܐ",
+    "1#in 1 week|#in {num} weeks": "one#‏ܒܚܕ ܫܒܘܥܐ|#‏ܒ{num} ܫܒ̈ܘܥܐ",
+    "1#in 1 wk|#in {num} wks": "one#‏ܒܚܕ ܫܒܘܥܐ|#‏ܒ{num} ܫܒ̈ܘܥܐ",
+    "1#in 1 year|#in {num} years": "one#‏ܒܚܕܐ ܫܢܬܐ|#‏ܒ{num} ܫܢܝ̈ܐ",
+    "1#in 1 yr|#in {num} yrs": "one#‏ܒܚܕܐ ܫܢܬܐ|#‏ܒ{num} ܫܢܝ̈ܐ",
+    "E0": "ܚ",
+    "E1": "ܬ",
+    "E2": "ܬ",
+    "E3": "ܐ",
+    "E4": "ܚ",
     "E5": "ܥ",
     "E6": "ܫ",
     "EE0": "ܚܕ",
@@ -79,12 +79,12 @@
     "EE4": "ܚܡܫ",
     "EE5": "ܥܪܘ",
     "EE6": "ܫܒܬܐ",
-    "EEE0": "ܚܕܒܫܒܐ",
-    "EEE1": "ܬܪܝܢܒܫܒܐ",
-    "EEE2": "ܬܠܬܒܫܒܐ",
-    "EEE3": "ܐܪܒܥܒܫܒܐ",
-    "EEE4": "ܚܡܫܒܫܒܐ",
-    "EEE5": "ܥܪܘܒܬܐ",
+    "EEE0": "ܚܕ",
+    "EEE1": "ܬܪܝܢ",
+    "EEE2": "ܬܠܬ",
+    "EEE3": "ܐܪܒܥ",
+    "EEE4": "ܚܡܫ",
+    "EEE5": "ܥܪܘ",
     "EEE6": "ܫܒܬܐ",
     "EEEE0": "ܚܕܒܫܒܐ",
     "EEEE1": "ܬܪܝܢܒܫܒܐ",
@@ -93,20 +93,20 @@
     "EEEE4": "ܚܡܫܒܫܒܐ",
     "EEEE5": "ܥܪܘܒܬܐ",
     "EEEE6": "ܫܒܬܐ",
-    "G-1": "܏ܩܕܚ",
-    "G1": "܏ܕܚ",
-    "L1": "ܐ",
-    "L10": "ܝ",
-    "L11": "ܝܐ",
-    "L12": "ܝܒ",
-    "L2": "ܒ",
-    "L3": "ܓ",
-    "L4": "ܕ",
-    "L5": "ܗ",
-    "L6": "ܘ",
-    "L7": "ܙ",
-    "L8": "ܚ",
-    "L9": "ܛ",
+    "G-1": "܏ܩܕܚ‌",
+    "G1": "܏ܕܚ‌",
+    "L1": "ܟ",
+    "L10": "ܬ",
+    "L11": "ܬ",
+    "L12": "ܟ",
+    "L2": "ܫ",
+    "L3": "ܐ",
+    "L4": "ܢ",
+    "L5": "ܐ",
+    "L6": "ܬ",
+    "L7": "ܚ",
+    "L8": "ܐ",
+    "L9": "ܐ",
     "LL1": "ܟܢ",
     "LL10": "ܬܫ",
     "LL11": "ܬܫ",
@@ -119,10 +119,10 @@
     "LL7": "ܬܡ",
     "LL8": "ܐܒ",
     "LL9": "ܐܝ",
-    "LLL1": "ܟܢ܊ ܒ",
-    "LLL10": "ܬܫ܊ ܐ",
-    "LLL11": "ܬܫ܊ ܒ",
-    "LLL12": "ܟܢ܊ ܐ",
+    "LLL1": "ܟܢܘܢ ܒ",
+    "LLL10": "ܬܫܪܝܢ ܐ",
+    "LLL11": "ܬܫܪܝܢ ܒ",
+    "LLL12": "ܟܢܘܢ ܐ",
     "LLL2": "ܫܒܛ",
     "LLL3": "ܐܕܪ",
     "LLL4": "ܢܝܣܢ",
@@ -133,7 +133,7 @@
     "LLL9": "ܐܝܠܘܠ",
     "LLLL1": "ܟܢܘܢ ܐܚܪܝܐ",
     "LLLL10": "ܬܫܪܝܢ ܩܕܡܝܐ",
-    "LLLL11": "ܬܫܪܝܼܢ ܐܚܪܝܐ",
+    "LLLL11": "ܬܫܪܝܢ ܐܚܪܝܐ",
     "LLLL12": "ܟܢܘܢ ܩܕܡܝܐ",
     "LLLL2": "ܫܒܛ",
     "LLLL3": "ܐܕܪ",
@@ -143,10 +143,10 @@
     "LLLL7": "ܬܡܘܙ",
     "LLLL8": "ܐܒ",
     "LLLL9": "ܐܝܠܘܠ",
-    "MMM1": "ܟܢ܊ ܒ",
-    "MMM10": "ܬܫ܊ ܐ",
-    "MMM11": "ܬܫ܊ ܒ",
-    "MMM12": "ܟܢ܊ ܐ",
+    "MMM1": "ܟܢܘܢ ܒ",
+    "MMM10": "ܬܫܪܝܢ ܐ",
+    "MMM11": "ܬܫܪܝܢ ܒ",
+    "MMM12": "ܟܢܘܢ ܐ",
     "MMM2": "ܫܒܛ",
     "MMM3": "ܐܕܪ",
     "MMM4": "ܢܝܣܢ",
@@ -191,8 +191,8 @@
     "NN7": "ܬܡ",
     "NN8": "ܐܒ",
     "NN9": "ܐܝ",
-    "a0": "ܩܛ",
-    "a1": "ܒܛ",
+    "a0": "܏ܩܛ‌",
+    "a1": "܏ܒܛ‌",
     "c0": "ܐ",
     "c1": "ܒ",
     "c2": "ܓ",
@@ -221,18 +221,20 @@
     "cccc4": "ܚܡܫܒܫܒܐ",
     "cccc5": "ܥܪܘܒܬܐ",
     "cccc6": "ܫܒܬܐ",
-    "durationLongDays": "one#ܝܘܡܐ|#{num} ܝܘ̈ܡܬܐ",
-    "durationMediumHours": "one#{num} ܫܥ|#{num} ܫܥ",
-    "durationMediumMillis": "one#{num} ܡܝܠܝ ܪ|#{num} ܡܝܠܝ ܪ",
-    "durationMediumWeeks": "one#{num} ܫ|#{num} ܫ",
+    "durationLongDays": "one#ܚܕ ܝܘܡܐ|#{num} ܝܘܡܢ̈ܐ",
+    "durationMediumHours": "one#{num} ܫܥܬܐ|#{num} ܫ̈ܥܐ",
+    "durationMediumMillis": "one#{num} ܡܝܠܝܪܦܦܐ|#{num} ܡܝܠܝܪ̈ܦܦܐ",
+    "durationMediumWeeks": "one#{num} ܫܒܘܥܐ|#{num} ܫܒ̈ܘܥܐ",
     "durationMediumYears": "one#{num} ܫܢܬܐ|#{num} ܫ̈ܢܐ",
-    "durationShortMillis": "one#{num} ܡܝܠܝ ܪ|#{num} ܡܝܠܝ ܪ",
-    "durationShortMinutes": "one#{num} ܩ|#{num} ܩ",
+    "durationShortMillis": "one#{num} ܡܝܠܝܪܦܦܐ|#{num} ܡܝܠܝܪ̈ܦܦܐ",
+    "durationShortMinutes": "one#{num} ܩܛܝܢܐ|#{num} ܩܛܝܢ̈ܐ",
     "durationShortMonths": "one#{num} ܝܪܚܐ|#{num} ܝܪ̈ܚܐ",
-    "finalSeparatorFull": "، ܘ",
-    "finalSeparatorLong": "، ܘ",
-    "finalSeparatorMedium": "، ܘ",
-    "finalSeparatorShort": "، ܘ",
-    "separatorMedium": ", ",
-    "separatorShort": ", "
+    "finalSeparatorFull": " ܘ",
+    "finalSeparatorLong": " ܘ",
+    "finalSeparatorMedium": " ܘ",
+    "finalSeparatorShort": " ܘ",
+    "separatorFull": " ܘ",
+    "separatorLong": " ܘ",
+    "separatorMedium": " ܘ",
+    "separatorShort": " ܘ"
 }
\ No newline at end of file
diff --git a/js/data/locale/syr/unitfmt.json b/js/data/locale/syr/unitfmt.json
index a9793c9bee..a5f9afb850 100644
--- a/js/data/locale/syr/unitfmt.json
+++ b/js/data/locale/syr/unitfmt.json
@@ -3,20 +3,21 @@
         "long": {
             "acre": "one#{n} ܦܕܢܐ|#{n} ܦ̈ܕܢܐ",
             "acre-foot": "one#{n} ܐܩܠܐ-ܦܕܢܐ|#{n} ܐܩܠ̈ܐ-ܦܕܢܐ",
-            "ampere": "#{n} A",
+            "ampere": "#{n} ܐܡܦܝܪ",
             "arc-minute": "one#ܩܛܝܢܐ ܩܫܬܢܝܐ|#{n} ܩܛܝ̈ܢܬܐ ܩܫܬܢܝܬܐ",
             "arc-second": "one#{n} ܪ̈ܦܦܐ ܩܫܬܢܝܐ|#{n} ܪ̈ܦܦܐ ܩܫܬܢ̈ܝܐ",
             "astronomical-unit": "#{n} ܡܫܘܚܬܐ ܪܩܝܥܝܬܐ",
-            "atmosphere": "#{n} atm",
-            "bar": "#{n} bar",
+            "atmosphere": "one#{n} ܟܒܘܫܐ ܪܩܝܥܐ|#{n} ܟܒܘܫ̈ܐ ܪ̈ܩܝܥܐ",
+            "bar": "#{n} ܒܐܪ",
             "barrel": "#{n} bbl",
-            "bit": "#{n} bit",
-            "bit-per-second": "#{n} bit ܒܪܦܦܐ",
+            "beaufort": "#B {n}",
+            "bit": "#{n} ܒܬ",
+            "bit-per-second": "#{n} ܒܬ ܒܪܦܦܐ",
             "british-thermal-unit": "#{n} Btu",
             "bushel": "#{n} bu",
-            "byte": "#{n} byte",
-            "byte-per-hour": "#{n} byte ܒܫܥܬܐ",
-            "byte-per-second": "#{n} byte ܒܪܦܦܐ",
+            "byte": "#{n} ܒܐܝܬ",
+            "byte-per-hour": "#{n} ܒܐܝܬ ܒܫܥܬܐ",
+            "byte-per-second": "#{n} ܒܐܝܬ ܒܪܦܦܐ",
             "calorie": "#{n} cal",
             "candela": "#{n} ܢܗܝܪܐ",
             "carat": "one#{n} ܩܪܛܐ|#{n} ܩܪ̈ܛܐ",
@@ -35,18 +36,18 @@
             "cup": "#{n} c",
             "cup-metric": "#{n} mc",
             "dalton": "#{n} ܕܐܠܬܘܢ",
-            "day": "one#ܝܘܡܐ|#{n} ܝܘ̈ܡܬܐ",
+            "day": "one#ܚܕ ܝܘܡܐ|#{n} ܝܘܡܢ̈ܐ",
             "decade": "one#ܥܣܝܪܘܬܐ|#{n} ܥܣܝܪ̈ܘܬܐ",
             "deciliter": "one#{n} ܕܝܣܝܠܝܬܪܐ|#{n} ܕܝܣܝܠܝܬܪ̈ܐ",
             "decimeter": "one#{n} ܕܝܣܝܡܝܬܪܐ|#{n} ܕܝܣܝܡܝܬܪ̈ܐ",
-            "degree": "one#ܕܪܓ݂ܐ|#{n} ܕܪ̈ܓ݂ܐ",
+            "degree": "one#ܕܪܓܐ|#{n} ܕܖ̈ܓܐ",
             "dessert-spoon": "one#{n} ܬܪܘܕܐ ܚܠܝܐ|#{n} ܬܪ̈ܘܕܐ ܚܠܝ̈ܐ",
             "dessert-spoon-imperial": "one#{n} ܬܪܘܕܐ ܚܠܝܐ ܐܡܦܪܬܘܪܝܐ|#{n} ܬܪ̈ܘܕܐ ܚܠܝ̈ܐ ܐܡܦܪܬܘܪܝܐ",
             "dram": "one#{n} ܕܪܟܡܐ ܪܕܘܝܐ|#{n} ܕܪ̈ܟܡܐ ܪ̈ܕܘܝܐ",
-            "drop": "one#{n} ܛܘܦܬܐ|#{n} ܛܘܦ̈ܐ",
+            "drop": "one#{n} ܛܘܦܬܐ|#{n} ܛܘܦ̈ܢܐ",
             "dunam": "#{n} dunam",
             "earth-mass": "#{n} ܥܘܫܢܐ ܐܪܥܝܐ",
-            "earth-radius": "#{n} ܥܘܒܐ ܦܫܝܬܐ ܐܪܥܝܐ",
+            "earth-radius": "one#ܚܕ ܥܘܒܐ ܦܫܝܛܐ ܐܪܥܝܐ|#{n} ܥܘܒ̈ܐ ܦܫܝ̈ܛܐ ܐܖ̈ܥܝܐ",
             "electronvolt": "#{n} eV",
             "em": "#{n} em",
             "fahrenheit": "one#{n} ܕܪܓܐ ܦܐܗܪܢܗܥܝܬ|#{n} ܕܪ̈ܓܐ ܦܐܗܪܢܗܥܝܬ",
@@ -55,95 +56,95 @@
             "fluid-ounce-imperial": "one#{n} ܐܘܢܩܝܐ ܪܕܘܝܐ ܐܡܦܪܬܘܪܝܐ|#{n} ܐܘܢܩ̈ܝܐ ܪ̈ܕܘܝܐ ܐܡܦܪܬܘܪܝܐ",
             "foot": "one#{n} ܐܩܠܐ|#{n} ܐܩܠ̈ܐ",
             "foot-per-second": "#{n} ܐܩܠ̈ܐ ܒܪܦܦܐ",
-            "furlong": "one#{n} ܦܘܪܠܢܓ|#{n} ܦܘܪ̈ܠܢܓ",
+            "furlong": "one#{n} ܦܘܪܠܢܓ|#{n} ܦܘܪ̈ܠܢܓܐ",
             "g-force": "#{n} ܚܝܠܐ ܢܬܘܦܘܬܐ",
             "gallon": "one#{n} ܓܠܘܢܐ|#{n} ܓܠܘܢ̈ܐ",
             "gallon-imperial": "one#{n} ܓܠܘܢܐ ܐܡܦܪܬܘܪܝܐ|#{n} ܓܠܘܢ̈ܐ ܐܡܦܪܬܘܪܝܐ",
             "generic": "#{n}°",
-            "gigabit": "#{n} Gb",
-            "gigabit-per-second": "#{n} Gb ܒܪܦܦܐ",
-            "gigabyte": "#{n} GB",
-            "gigabyte-per-hour": "#{n} GB ܒܫܥܬܐ",
-            "gigabyte-per-second": "#{n} GB ܒܪܦܦܐ",
+            "gigabit": "#{n} ܓܝܓܐܒܬ",
+            "gigabit-per-second": "#{n} ܓܝܓܐܒܬ ܒܪܦܦܐ",
+            "gigabyte": "#{n} ܓܝܓܐܒܐܝܬ",
+            "gigabyte-per-hour": "#{n} ܓܝܓܐܒܐܝܬ ܒܫܥܬܐ",
+            "gigabyte-per-second": "#{n} ܓܝܓܐܒܐܝܬ ܒܪܦܦܐ",
             "gigahertz": "#{n} GHz",
-            "gigawatt": "#{n} GW",
-            "grain": "one#{n} ܦܪܕܐ|#{n} ܦܪ̈ܕܐ",
+            "gigawatt": "#{n} ܓܝܓܐܘܐܬ",
+            "grain": "#{n} grain",
             "gram": "one#ܓܪܡܐ|#{n} ܓܪ̈ܡܐ",
-            "hectare": "#{n} ܗܟܬܪ",
+            "hectare": "one#{n} ܗܟܬܪ|#{n} ܗܟܬܖ̈ܐ",
             "hectoliter": "one#{n} ܗܟܬܘܠܝܬܪܐ|#{n} ܗܟܬܘܠܝܬܪ̈ܐ",
             "hectopascal": "#{n} ܗܟܬܘܦܣܟ̈ܠܐ",
             "hertz": "#{n} Hz",
-            "horsepower": "#{n} hp",
-            "hour": "one#ܫܥܬܐ|#{n} ܫ̈ܥܐ",
-            "inch": "one#ܚܕܐ ܐܢܟ|#{n} ܐܢܟ̈ܐ",
+            "horsepower": "#{n} ܣܘܣܝܐ",
+            "hour": "one#{n} ܫܥܬܐ|#{n} ܫ̈ܥܐ",
+            "inch": "one#{n} ܐܢܟ|#{n} ܐܢܟ̈ܐ",
             "inch-ofhg": "#{n} inHg",
             "item": "one#ܚܕ ܡܠܘܐܐ|#{n} ܡܠܘܐ̈ܐ",
             "jigger": "#{n} jigger",
             "joule": "#{n} J",
             "karat": "one#ܩܪܛܐ|#{n} ܩܪ̈ܛܐ",
             "kelvin": "one#{n} ܕܪܓܐ ܟܠܒܝܢ|#{n} ܕܪ̈ܓܐ ܟܠܒܝܢ",
-            "kilobit": "#{n} kb",
-            "kilobit-per-second": "#{n} kb ܒܪܦܦܐ",
-            "kilobyte": "#{n} kB",
-            "kilobyte-per-hour": "#{n} kB ܒܫܥܬܐ",
-            "kilobyte-per-second": "#{n} kB ܒܪܦܦܐ",
+            "kilobit": "#{n} ܟܝܠܘܒܬ",
+            "kilobit-per-second": "#{n} ܟܝܠܘܒܬ ܒܪܦܦܐ",
+            "kilobyte": "#{n} ܟܝܠܘܒܐܝܬ",
+            "kilobyte-per-hour": "#{n} ܟܝܠܘܒܐܝܬ ܒܫܥܬܐ",
+            "kilobyte-per-second": "#{n} ܟܝܠܘܒܐܝܬ ܒܪܦܦܐ",
             "kilocalorie": "#{n} kcal",
             "kilogram": "one#{n} ܟܝܠܘܓܪܡܐ|#{n} ܟܝܠܘܓܪ̈ܡܐ",
             "kilohertz": "#{n} kHz",
             "kilojoule": "#{n} kJ",
-            "kilometer": "one#{n} ܟܝܠܘܡܝܬܪܐ|#{n} ܟܝܠܘܡܝܬܪ̈ܐ",
+            "kilometer": "one#ܚܕ ܟܝܠܘܡܝܬܪܐ|#{n} ܟܝܠܘܡܝܬܪ̈ܐ",
             "kilometer-per-hour": "one#{n} ܟܝܠܘܡܝܬܪܐ ܒܫܥܬܐ|#{n} ܟܝܠܘܡܝܬܪ̈ܐ ܒܫܥܬܐ",
             "kilometer-per-liter": "#{n} ܟܝܠܘܡܝܬܪ̈ܐ/ܠܝܬܪܐ",
             "kilometer-per-second": "#{n} ܟܝܠܘܡܝܬܪ̈ܐ ܒܪܦܦܐ",
             "kilopascal": "#{n} ܟܝܠܘܦܣܟܠ",
-            "kilowatt": "#{n} kW",
+            "kilowatt": "#{n} ܟܝܠܘܘܐܬ",
             "kilowatt-hour": "#{n} kWh",
-            "kilowatt-hour-per-100-kilometer": "one#{n} ܟܝܠܘܘܐܬ-ܫܥܬܐ ܒ 100 ܟܝܠܘܡܝܬܪ̈ܐ|#{n} ܟܝܠܘܘܐܬ-ܫܥ̈ܐ ܒ 100 ܟܝܠܘܡܝܬܪ̈ܐ",
+            "kilowatt-hour-per-100-kilometer": "one#{n} ܟܝܠܘܘܐܬ-ܫܥܬܐ ܒܡܐܐ ܟܝܠܘܡܝܬܪܐ|#{n} ܟܝܠܘܘܐܬ-ܫܥ̈ܐ ܒܡܐܐ ܟܝܠܘܡܝܬܪ̈ܐ",
             "knot": "one#{n} ܩܛܪܐ|#{n} ܩܛܪ̈ܐ",
             "light-year": "one#{n} ܫܢܬܐ ܕܢܘܗܪܐ|#{n} ܫ̈ܢܐ ܕܢܘܗܪܐ",
             "liter": "one#{n} ܠܝܬܪܐ|#{n} ܠܝܬܪ̈ܐ",
-            "liter-per-100-kilometer": "one#{n} ܠܝܬܪܐ ܒ 100 ܟܝܠܘܡܝܬܪ̈ܐ|#{n} ܠܝܬܪ̈ܐ ܒ 100 ܟܝܠܘܡܝܬܪ̈ܐ",
+            "liter-per-100-kilometer": "one#{n} ܠܝܬܪ̈ܐ ܒܡܐܐ ܟܝܠܘܡܝܬܪܐ|#{n} ܠܝܬܪ̈ܐ ܒܡܐܐ ܟܝܠܘܡܝܬܪ̈ܐ",
             "liter-per-kilometer": "one#{n} ܠܝܬܪܐ ܒܟܝܠܘܡܝܬܪܐ|#{n} ܠܝܬܪ̈ܐ ܒܟܝܠܘܡܝܬܪܐ",
             "lumen": "#{n} ܠܘܡܝܢ",
-            "lux": "#{n} ܠܘܩܣ",
-            "megabit": "#{n} Mb",
-            "megabit-per-second": "#{n} Mb ܒܪܦܦܐ",
-            "megabyte": "#{n} MB",
-            "megabyte-per-hour": "#{n} MB ܒܫܥܬܐ",
-            "megabyte-per-second": "#{n} MB ܒܪܦܦܐ",
+            "lux": "#{n} lux",
+            "megabit": "#{n} ܡܝܓܐܒܬ",
+            "megabit-per-second": "#{n} ܡܝܓܐܒܬ ܒܪܦܦܐ",
+            "megabyte": "#{n} ܡܝܓܐܒܐܝܬ",
+            "megabyte-per-hour": "#{n} ܡܝܓܐܒܐܝܬ ܒܫܥܬܐ",
+            "megabyte-per-second": "#{n} ܡܝܓܐܒܐܝܬ ܒܪܦܦܐ",
             "megahertz": "#{n} MHz",
             "megaliter": "one#{n} ܡܝܓܐܠܝܬܪܐ|#{n} ܡܝܓܐܠܝܬܪ̈ܐ",
             "megapascal": "#{n} ܡܝܓܐܦܣܟܠ",
             "megapixel": "one#{n} ܡܝܓܐܦܝܟܣܠܐ|#{n} ܡܝܓܐܦܝ̈ܟܣܠܐ",
-            "megawatt": "#{n} MW",
+            "megawatt": "#{n} ܡܝܓܐܘܐܬ",
             "meter": "one#ܡܝܬܪܐ|#{n} ܡܝܬܪ̈ܐ",
             "meter-per-second": "one#{n} ܡܝܬܪܐ ܒܪܦܦܐ|#{n} ܡܝܬܪ̈ܐ ܒܪܦܦܐ",
             "meter-per-square-second": "one#{n} ܡܝܬܪܐ ܒܪܦܦܐ ܡܪܒܥܐ|#{n} ܡܝܬܪ̈ܐ ܒܪܦܦܐ ܡܪܒܥܐ",
             "microgram": "one#{n} ܡܝܟܪܘܓܪܡܐ|#{n} ܡܝܟܪܘܓܪ̈ܡܐ",
-            "micrometer": "one#{n} ܡܟܡ|#{n}ܡܟܡ",
+            "micrometer": "one#{n} ܡܝܟܪܘܡܝܬܪܐ|#{n} ܡܝܟܪܘܡܝܬܪ̈ܐ",
             "microsecond": "one#{n} ܡܝܟܪܘܪܦܦܐ|#{n} ܡܝܟܪܘܪ̈ܦܦܐ",
             "mile": "one#{n} ܡܝܠܐ|#{n} ܡܝܠ̈ܐ",
             "mile-per-gallon": "one#{n} ܡܝܠܐ ܒܓܠܘܢܐ|#{n} ܡܝܠ̈ܐ ܒܓܠܘܢܐ",
             "mile-per-gallon-imperial": "one#{n} ܡܝܠܐ ܒܓܠܘܢܐ ܐܡܦܪܬܘܪܝܐ|#{n} ܡܝܠ̈ܐ ܒܓܠܘܢܐ ܐܡܦܪܬܘܪܝܐ",
             "mile-per-hour": "one#{n} ܡܝܠܐ ܒܫܥܬܐ|#{n} ܡܝܠ̈ܐ ܒܫܥܬܐ",
             "mile-per-second": "#{n} ܡܝܠ̈ܐ ܒܪܦܦܐ",
-            "mile-scandinavian": "#{n} ܡܝ̈ܠܐ-ܐܣܟܢܕܝܢܒܝܝܢ",
-            "milliampere": "#{n} mA",
-            "millibar": "#{n} mbar",
+            "mile-scandinavian": "one#{n} ܡܝܠܐ ܐܣܟܢܕܝܢܒܝܝܢ|#{n} ܡܝܠ̈ܐ ܐܣܟܢܕܝܢܒܝܝܢ",
+            "milliampere": "#{n} ܡ ܐܡܦܝܪ",
+            "millibar": "#{n} ܡܝܠܝܒܐܪ",
             "milligram": "one#{n} ܡܝܠܝܓܪܡܐ|#{n} ܡܝܠܝܓܪ̈ܡܐ",
             "milligram-ofglucose-per-deciliter": "one#{n} ܡܝܠܝܓܪܡܐ ܒܕܝܣܝܠܝܬܪ|#{n} ܡܝܠܝܓܪ̈ܡܐ ܒܕܝܣܝܠܝܬܪܐ",
             "milliliter": "one#{n} ܡܝܠܝܠܝܬܪܐ|#{n} ܡܝܠܝܠܝܬܪ̈ܐ",
             "millimeter": "one#{n} ܡܝܠܝܡܝܬܪܐ|#{n} ܡܝܠܝܡܝܬܪ̈ܐ",
-            "millimeter-ofhg": "#{n} mm Hg",
+            "millimeter-ofhg": "one#{n} ܡܝܠܝܡܝܬܪܐ ܕܙܝܘܓܐ|#{n} ܡܝܠܝܡܝܬܪ̈ܐ ܕܙܝܘܓܐ",
             "millimole-per-liter": "#{n} ܡܝܠܝܡܘܠ ܒܠܝܬܪܐ",
             "millisecond": "one#{n} ܡܝܠܝܪܦܦܐ|#{n} ܡܝܠܝܪ̈ܦܦܐ",
-            "milliwatt": "#{n} mW",
-            "minute": "one#ܩܛܝܢܐ|#{n} ܩܛܝܢ̈ܬܐ",
+            "milliwatt": "#{n} ܡܝܠܝܘܐܬ",
+            "minute": "one#ܩܛܝܢܐ|#{n} ܩܛܝܢ̈ܐ",
             "mole": "#{n} ܡܘܠ",
             "month": "one#ܝܪܚܐ|#{n} ܝܪ̈ܚܐ",
             "nanometer": "one#{n} ܢܐܢܘܡܝܬܪܐ|#{n} ܢܐܢܘܡܝܬܪ̈ܐ",
             "nanosecond": "one#{n} ܢܐܢܘܪܦܦܐ|#{n} ܢܐܢܘܪ̈ܦܦܐ",
-            "nautical-mile": "one#{n} ܡܝܠܐ ܝܡܝܐ|#{n} ܡܝ̈ܠܐ ܝܡܝ̈ܐ",
+            "nautical-mile": "one#{n} ܡܝܠܐ ܝܡܝܐ|#{n} ܡܝܠ̈ܐ ܝܡܝ̈ܐ",
             "newton": "#{n} ܢܝܘܬܢ",
             "newton-meter": "one#{n} ܢܝܘܬܢ-ܡܝܬܪܐ|#{n} ܢܝܘܬܢ-ܡܝܬܪ̈ܐ",
             "ohm": "#{n} Ω",
@@ -151,11 +152,11 @@
             "ounce-troy": "#{n} oz t",
             "parsec": "one#{n} ܦܪܣܚܐ|#{n} ܦܪ̈ܣܚܐ",
             "pascal": "#{n} ܦܣܟ̈ܠܐ",
-            "percent": "#{n} ܒܡܐܐ",
+            "percent": "#{n}%",
             "permille": "#{n} ܒܐܠܦܐ",
             "permillion": "one#{n} ܡܢܬܐ ܒܡܠܝܘܢ|#{n} ܡܢܘ̈ܬܐ ܒܡܠܝܘܢ",
             "permyriad": "#{n}‱",
-            "petabyte": "#{n} PB",
+            "petabyte": "#{n} ܦܝܬܐܒܐܝܬ",
             "picometer": "one#{n} ܦܝܟܘܡܝܬܪܐ|#{n} ܦܝܟܘܡܝܬܪ̈ܐ",
             "pinch": "#{n} pinch",
             "pint": "#{n} pt",
@@ -172,236 +173,237 @@
             "quart-imperial": "one#{n} ܪܘܒܥܐ ܓܠܘܢܐ ܐܡܦܪܬܘܪܝܐ|#{n} ܪ̈ܘܒܥܐ ܓܠܘܢ̈ܐ ܐܡܦܪܬܘܪܝܐ",
             "quarter": "one#ܪܘܒܥܐ|#{n} ܪ̈ܘܒܥܐ",
             "radian": "#{n} ܪܐܕܝܐܢ",
-            "revolution": "one#{n} ܚܘܕܪܐ|#{n} ܚܘܕܖ̈ܐ",
-            "second": "one#ܪܦܦܐ|#{n} ܪ̈ܦܦܐ",
+            "revolution": "one#{n} ܚܘܕܪܐ|#{n} ܚܘܕܖ̈ܢܐ",
+            "second": "one#{n} ܪܦܦܐ|#{n} ܪ̈ܦܦܐ",
             "short-ton": "one#{n} ܬܘܢܐ|#{n} ܬܘܢ̈ܐ",
             "solar-luminosity": "#{n} L☉",
             "solar-mass": "#{n} ܥܘܫܢܐ ܫܡܫܝܐ",
-            "solar-radius": "#{n} ܥܘܒܐ ܦܫܝܬܐ ܫܡܫܝܐ",
+            "solar-radius": "#{n} ☉R",
             "square-centimeter": "one#{n} ܣܢܬܝܡܝܬܪܐ ܡܪܒܥܐ|#{n} ܣܢܬܝܡܝܬܪ̈ܐ ܡܪܒܥܐ",
             "square-foot": "one#{n} ܐܩܠܐ ܡܪܒܥܐ|#{n} ܐܩܠ̈ܐ ܡܪܒܥܐ",
             "square-inch": "one#{n} ܐܢܟ ܡܪܒܥܐ|#{n} ܐܢܟ̈ܐ ܡܪܒܥܐ",
             "square-kilometer": "one#{n} ܟܝܠܘܡܝܬܪܐ ܡܪܒܥܐ|#{n} ܟܝܠܘܡܝܬܪ̈ܐ ܡܪܒܥܐ",
             "square-meter": "one#{n} ܡܝܬܪܐ ܡܪܒܥܐ|#{n} ܡܝܬܪ̈ܐ ܡܪܒܥܐ",
-            "square-mile": "#{n} ܡܝܠ̈ܐ ܡܪܒܥܐ",
+            "square-mile": "one#{n} ܡܝܠܐ ܡܪܒܥܐ|#{n} ܡܝܠ̈ܐ ܡܪܒܥܐ",
             "square-yard": "one#{n} ܝܪܕܐ ܡܪܒܥܐ|#{n} ܝܪ̈ܕܐ ܡܪܒܥܐ",
             "stone": "#{n} ܣܛܘܢ",
             "tablespoon": "one#{n} ܬܪܘܕܐ ܪܒܐ|#{n} ܬܪ̈ܘܕܐ ܪ̈ܒܐ",
             "teaspoon": "one#{n} ܬܪܘܕܐ ܙܥܘܪܐ|#{n} ܬܪ̈ܘܕܐ ܙܥܘܪ̈ܐ",
-            "terabit": "#{n} Tb",
-            "terabit-per-second": "#{n} Tb ܒܪܦܦܐ",
-            "terabyte": "#{n} TB",
-            "terabyte-per-hour": "#{n} TB ܒܫܥܬܐ",
-            "terabyte-per-second": "#{n} TB ܒܪܦܦܐ",
+            "terabit": "#{n} ܬܝܪܐܒܬ",
+            "terabit-per-second": "#{n} ܬܝܪܐܒܬ ܒܪܦܦܐ",
+            "terabyte": "#{n} ܬܝܪܐܒܐܝܬ",
+            "terabyte-per-hour": "#{n} ܬܝܪܐܒܐܝܬ ܒܫܥܬܐ",
+            "terabyte-per-second": "#{n} ܬܝܪܐܒܐܝܬ ܒܪܦܦܐ",
             "therm-us": "#{n} US therm",
             "ton": "one#{n} ܬܘܢܐ|#{n} ܬܘܢ̈ܐ",
             "tonne": "one#{n} ܬܘܢ ܡܝܬܪܝܐ|#{n} ܬܘܢ̈ ܡܝܬܪ̈ܝܐ",
             "volt": "#{n} V",
-            "watt": "#{n} W",
-            "week": "one#ܫܒ݂ܘܥܐ|#{n} ܫܒ݂̈ܘܥܐ",
+            "watt": "#{n} ܘܐܬ",
+            "week": "one#{n} ܫܒܘܥܐ|#{n} ܫܒ̈ܘܥܐ",
             "yard": "#{n} ܝܪܕ̈ܐ",
             "year": "one#ܫܢܬܐ|#{n} ܫ̈ܢܐ"
         },
         "short": {
             "acre": "one#{n} ܦܕܢܐ|#{n} ܦ̈ܕܢܐ",
-            "acre-foot": "#{n} ܐܩܠ̈ܐ-ܦܕܢܐ",
+            "acre-foot": "#{n} ac ft",
             "ampere": "#{n} A",
-            "arc-minute": "one#ܩܛܝܢܐ ܩܫܬܢܝܐ|#{n} ܩܛܝ̈ܢܬܐ ܩܫܬܢܝܬܐ",
-            "arc-second": "one#ܪܦܦܐ ܩܫܬܢܝܐ|#{n} ܪ̈ܦܦܐ ܩܫܬܢ̈ܝܐ",
-            "astronomical-unit": "#{n} ܡ.ܪ.",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
-            "bit-per-second": "#{n} bit/ܪ",
+            "bit-per-second": "#{n} bit/ܪܦܦܐ",
             "british-thermal-unit": "#{n} Btu",
             "bushel": "#{n} bu",
             "byte": "#{n} byte",
-            "byte-per-hour": "#{n} byte/ܫܥ",
-            "byte-per-second": "#{n} byte/ܪ",
+            "byte-per-hour": "#{n} byte/ܫܥܬܐ",
+            "byte-per-second": "#{n} byte/ܪܦܦܐ",
             "calorie": "#{n} cal",
-            "candela": "#{n} ܢܗܝܪܐ",
-            "carat": "one#{n} ܩܪܛܐ|#{n} ܩܪ̈ܛܐ",
-            "celsius": "#{n}°ܡ",
-            "centiliter": "one#{n} ܣܢܬܝܠܝܬܪܐ|#{n} ܣܢܬܝܠܝܬܪ̈ܐ",
-            "centimeter": "#{n} ܣܡ",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n} °C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
             "century": "one#ܕܪܐ|#{n} ܕܪ̈ܐ",
             "coordinateUnit": "",
-            "cubic-centimeter": "#{n} ܣܡ³",
-            "cubic-foot": "one#{n} ܐܩܠܐ³|#{n} ܐܩܠ̈ܐ³",
-            "cubic-inch": "#{n} ܐܢ³",
-            "cubic-kilometer": "#{n} ܟܡ³",
-            "cubic-meter": "#{n} ܡ³",
-            "cubic-mile": "one#{n} ܡܝܠܐ³|#{n} ܡܝܠ̈ܐ³",
-            "cubic-yard": "one#{n} ܝܪܕܐ³|#{n} ܝܪ̈ܕܐ³",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
             "cup": "#{n} c",
             "cup-metric": "#{n} mc",
-            "dalton": "#{n} ܕܐܠܬܘܢ",
-            "day": "one#ܝܘܡܐ|#{n} ܝܘ̈ܡܬܐ",
+            "dalton": "#{n} Da",
+            "day": "one#ܚܕ ܝܘܡܐ|#{n} ܝܘܡܢ̈ܐ",
             "decade": "one#ܥܣܝܪܘܬܐ|#{n} ܥܣܝܪ̈ܘܬܐ",
-            "deciliter": "one#{n} ܕܝܣܝܠܝܬܪܐ|#{n} ܕܝܣܝܠܝܬܪ̈ܐ",
-            "decimeter": "#{n} ܕܣܡ",
-            "degree": "one#ܕܪܓ݂ܐ|#{n} ܕܪ̈ܓ݂ܐ",
-            "dessert-spoon": "one#{n} ܬܪܘܕܐ ܚܠܝܐ|#{n} ܬܪ̈ܘܕܐ ܚܠܝ̈ܐ",
-            "dessert-spoon-imperial": "one#{n} ܬܪܘܕܐ ܚܠܝܐ ܐܡܦܪܬܘܪܝܐ|#{n} ܬܪ̈ܘܕܐ ܚܠܝ̈ܐ ܐܡܦܪܬܘܪܝܐ",
-            "dram": "one#{n} ܕܪܟܡܐ ܪܕܘܝܐ|#{n} ܕܪ̈ܟܡܐ ܪ̈ܕܘܝܐ",
-            "drop": "one#{n} ܛܘܦܬܐ|#{n} ܛܘܦ̈ܐ",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
             "dunam": "#{n} dunam",
-            "earth-mass": "#{n} ܥܘܫܢܐ ܐܪܥܝܐ",
-            "earth-radius": "#{n} ܥܘܒܐ ܐܪܥܝܐ",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
             "electronvolt": "#{n} eV",
             "em": "#{n} em",
-            "fahrenheit": "#{n}°ܦ",
+            "fahrenheit": "#{n} °F",
             "fathom": "#{n} fth",
-            "fluid-ounce": "one#{n} ܐܘܢܩܝܐ ܪܕܘܝܐ|#{n} ܐܘܢܩ̈ܝܐ ܪ̈ܕܘܝܐ",
-            "fluid-ounce-imperial": "one#{n} ܐܘܢܩܝܐ ܪܕܘܝܐ ܐܡܦܪܬܘܪܝܐ|#{n} ܐܘܢܩ̈ܝܐ ܪ̈ܕܘܝܐ ܐܡܦܪܬܘܪܝܐ",
-            "foot": "#{n} ܐܩܠ̈ܐ",
-            "foot-per-second": "#{n} ܐܩܠ̈ܐ/ܪ",
-            "furlong": "one#{n} ܦܘܪܠܢܓ|#{n} ܦܘܪ̈ܠܢܓ",
-            "g-force": "#{n} ܚܝܠܐ ܢܬܘܦܘܬܐ",
-            "gallon": "one#{n} ܓܠܘܢܐ|#{n} ܓܠܘܢ̈ܐ",
-            "gallon-imperial": "one#{n} ܓܠܘܢܐ ܐܡܦܪܬܘܪܝܐ|#{n} ܓܠܘܢ̈ܐ ܐܡܦܪܬܘܪܝܐ",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/ܪܦܦܐ",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
             "generic": "#{n}°",
             "gigabit": "#{n} Gb",
-            "gigabit-per-second": "#{n} Gb/ܪ",
+            "gigabit-per-second": "#{n} Gb/ܪܦܦܐ",
             "gigabyte": "#{n} GB",
-            "gigabyte-per-hour": "#{n} GB/ܫܥ",
-            "gigabyte-per-second": "#{n} GB/ܪ",
+            "gigabyte-per-hour": "#{n} GB/ܫܥܬܐ",
+            "gigabyte-per-second": "#{n} GB/ܪܦܦܐ",
             "gigahertz": "#{n} GHz",
             "gigawatt": "#{n} GW",
-            "grain": "one#{n} ܦܪܕܐ|#{n} ܦܪ̈ܕܐ",
-            "gram": "one#ܓܪܡܐ|#{n} ܓܪ̈ܡܐ",
-            "hectare": "#{n} ܗܟܬܪ",
-            "hectoliter": "one#{n} ܗܟܬܘܠܝܬܪܐ|#{n} ܗܟܬܘܠܝܬܪ̈ܐ",
-            "hectopascal": "#{n} ܗܟܬܘܦܣܟ̈ܠܐ",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
             "hertz": "#{n} Hz",
             "horsepower": "#{n} hp",
-            "hour": "#{n} ܫܥ",
-            "inch": "one#ܚܕܐ ܐܢ܊|#{n} ܐܢ܊",
+            "hour": "one#{n} ܫܥܬܐ|#{n} ܫ̈ܥܐ",
+            "inch": "#{n} in",
             "inch-ofhg": "#{n} inHg",
             "item": "one#ܡܠܘܐܐ|#{n} ܡܠܘܐ̈ܐ",
             "jigger": "#{n} jigger",
             "joule": "#{n} J",
-            "karat": "one#ܩܪܛܐ|#{n} ܩܪ̈ܛܐ",
-            "kelvin": "#{n} ܕ ܟܠܒܝܢ",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
             "kilobit": "#{n} kb",
-            "kilobit-per-second": "#{n} kb/ܪ",
+            "kilobit-per-second": "#{n} kb/ܪܦܦܐ",
             "kilobyte": "#{n} kB",
-            "kilobyte-per-hour": "#{n} kB/ܫܥ",
-            "kilobyte-per-second": "#{n} kB/ܪ",
+            "kilobyte-per-hour": "#{n} kB/ܫܥܬܐ",
+            "kilobyte-per-second": "#{n} kB/ܪܦܦܐ",
             "kilocalorie": "#{n} kcal",
-            "kilogram": "#{n} ܟܓܡ",
+            "kilogram": "#{n} kg",
             "kilohertz": "#{n} kHz",
             "kilojoule": "#{n} kJ",
-            "kilometer": "#{n} ܟܡ",
-            "kilometer-per-hour": "#{n} ܟܡ/ܫ",
-            "kilometer-per-liter": "#{n} ܟܡ/ܠ",
-            "kilometer-per-second": "#{n} ܟܡ/ܪ",
-            "kilopascal": "#{n} ܟܝܠܘܦܣܟܠ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/ܪܦܦܐ",
+            "kilopascal": "#{n} kPa",
             "kilowatt": "#{n} kW",
             "kilowatt-hour": "#{n} kWh",
-            "kilowatt-hour-per-100-kilometer": "#{n} ܟܘܫ܊ ܒ 100 ܟܡ",
-            "knot": "one#{n} ܩܛܪܐ|#{n} ܩܛܪ̈ܐ",
-            "light-year": "one#{n} ܫܢܬܐ ܕܢܘܗܪܐ|#{n} ܫ̈ܢܐ ܕܢܘܗܪܐ",
-            "liter": "one#{n} ܠܝܬܪܐ|#{n} ܠܝܬܪ̈ܐ",
-            "liter-per-100-kilometer": "one#{n} ܠܝܬܪܐ/100 ܟܡ|#{n} ܠܝܬܪ̈ܐ/100 ܟܡ",
-            "liter-per-kilometer": "one#{n} ܠܝܬܪܐ/ܟܡ|#{n} ܠܝܬܪ̈ܐ/ܟܡ",
-            "lumen": "#{n} ܠܘܡܝܢ",
-            "lux": "#{n} ܠܘܩܣ",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
             "megabit": "#{n} Mb",
-            "megabit-per-second": "#{n} Mb/ܪ",
+            "megabit-per-second": "#{n} Mb/ܪܦܦܐ",
             "megabyte": "#{n} MB",
-            "megabyte-per-hour": "#{n} MB/ܫܥ",
-            "megabyte-per-second": "#{n} MB/ܪ",
+            "megabyte-per-hour": "#{n} MB/ܫܥܬܐ",
+            "megabyte-per-second": "#{n} MB/ܪܦܦܐ",
             "megahertz": "#{n} MHz",
-            "megaliter": "one#{n} ܡܝܓܐܠܝܬܪܐ|#{n} ܡܝܓܐܠܝܬܪ̈ܐ",
-            "megapascal": "#{n} ܡܝܓܐܦܣܟܠ",
-            "megapixel": "#{n} ܡ.ܦܝܟܣܠܐ",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
             "megawatt": "#{n} MW",
-            "meter": "one#ܡܝܬܪܐ|#{n} ܡ",
-            "meter-per-second": "#{n} ܡ/ܪ",
-            "meter-per-square-second": "#{n} ܡ/ܪ²",
-            "microgram": "#{n} ܡܟܓܡ",
-            "micrometer": "one#{n} ܡܟܡ|#{n}ܡܟܡ",
-            "microsecond": "#{n} ܡܝܟܪܘ ܪ",
-            "mile": "one#ܡܝܠܐ|#{n} ܡܝܠ̈ܐ",
-            "mile-per-gallon": "one#{n} ܡܝܠܐ ܒܓܠܘܢܐ|#{n} ܡܝܠ̈ܐ ܒܓܠܘܢܐ",
-            "mile-per-gallon-imperial": "#{n} ܡܝܠܐ/ܓܠܘܢܐ ܐܡܦܪܬܘܪܝܐ",
-            "mile-per-hour": "one#{n} ܡܝܠܐ/ܫ|#{n} ܡܝܠ̈ܐ/ܫ",
-            "mile-per-second": "#{n} ܡܝܠ̈ܐ/ܪ",
-            "mile-scandinavian": "#{n} ܡܝ̈ܠܐ-ܐܣܟܢܕܝܢܒܝܝܢ",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "one#{n} ܡܝܟܪܘܪܦܦܐ|#{n} ܡܝܟܪܘܖ̈ܦܦܐ",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/ܪܦܦܐ",
+            "mile-scandinavian": "#{n} smi",
             "milliampere": "#{n} mA",
             "millibar": "#{n} mbar",
-            "milligram": "#{n} ܡܓܡ",
-            "milligram-ofglucose-per-deciliter": "#{n} ܡܓܡ/ܕܝܣܝܠܝܬܪܐ",
-            "milliliter": "one#{n} ܡܠܬܪ܊|#{n} ܡܠܬܪ̈܊",
-            "millimeter": "#{n} ܡܡ",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
             "millimeter-ofhg": "#{n} mm Hg",
-            "millimole-per-liter": "#{n} ܡܡܘܠ܊/ܠ",
-            "millisecond": "#{n} ܡܝܠܝ ܪ",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "one#{n} ܡܝܠܝܪܦܦܐ|#{n} ܡܝܠܝܪ̈ܦܦܐ",
             "milliwatt": "#{n} mW",
-            "minute": "#{n} ܩ",
-            "mole": "#{n} ܡܘܠ",
+            "minute": "one#{n} ܩܛܝܢܐ|#{n} ܩܛܝܢ̈ܐ",
+            "mole": "#{n} mol",
             "month": "one#ܝܪܚܐ|#{n} ܝܪ̈ܚܐ",
-            "nanometer": "#{n} ܢܡ",
-            "nanosecond": "#{n} ܢܐܢܘ ܪ",
-            "nautical-mile": "one#{n} ܡܝܠܐ ܝܡܝܐ|#{n} ܡܝ̈ܠܐ ܝܡܝ̈ܐ",
-            "newton": "#{n} ܢܝܘܬܢ",
-            "newton-meter": "#{n} ܢܝܘܬܢ-ܡܝܬܪ̈ܐ",
+            "nanometer": "#{n} nm",
+            "nanosecond": "one#{n} ܢܐܢܘܪܦܦܐ|#{n} ܢܐܢܘܖ̈ܦܦܐ",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
             "ohm": "#{n} Ω",
-            "ounce": "one#{n} ܐܘܢܩܝܐ|#{n} ܐܘܢܩ̈ܝܐ",
+            "ounce": "#{n} oz",
             "ounce-troy": "#{n} oz t",
-            "parsec": "one#{n} ܦܪܣܚܐ|#{n} ܦܪ̈ܣܚܐ",
-            "pascal": "#{n} ܦܣܟ̈ܠܐ",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
             "percent": "#{n}%",
             "permille": "#{n}‰",
-            "permillion": "one#{n} ܡܢܘܬܐ/ܡܠ܊|#{n} ܡܢܘ̈ܬܐ/ܡܠ܊",
+            "permillion": "#{n} ppm",
             "permyriad": "#{n}‱",
             "petabyte": "#{n} PB",
-            "picometer": "#{n} ܦܝܟܘܡܝܬܪܐ",
+            "picometer": "#{n} pm",
             "pinch": "#{n} pinch",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
-            "pixel": "#{n} ܦܝܟܣܠܐ",
-            "pixel-per-centimeter": "#{n} ܦܝ̈ܟܣܠܐ/ܣܡ",
-            "pixel-per-inch": "#{n} ܦܝ̈ܟܣܠܐ/ܐܢ",
-            "point": "one#{n} ܢܘܩܙܐ|#{n} ܢܘܩܙ̈ܐ",
-            "pound": "one#{n} ܡܢܝܐ|#{n} ܡܢܝ̈ܐ",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
             "pound-force": "#{n} lbf",
             "pound-force-foot": "#{n} lbf⋅ft",
             "pound-force-per-square-inch": "#{n} psi",
-            "quart": "one#{n} ܪܘܒܥܐ ܓܠܘܢܐ|#{n} ܪ̈ܘܒܥܐ ܓܠܘܢ̈ܐ",
-            "quart-imperial": "one#{n} ܪܘܒܥܐ ܓܠܘܢܐ ܐܡܦܪܬܘܪܝܐ|#{n} ܪ̈ܘܒܥܐ ܓܠܘܢ̈ܐ ܐܡܦܪܬܘܪܝܐ",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
             "quarter": "one#ܪܘܒܥܐ|#{n} ܪ̈ܘܒܥܐ",
-            "radian": "#{n} ܪܐܕܝܐܢ",
-            "revolution": "#{n} ܚܘܕ",
-            "second": "#{n} ܪ",
-            "short-ton": "one#{n} ܬܘܢܐ|#{n} ܬܘܢ̈ܐ",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "one#{n} ܪܦܦܐ|#{n} ܖ̈ܦܦܐ",
+            "short-ton": "#{n} tn",
             "solar-luminosity": "#{n} L☉",
-            "solar-mass": "#{n} ܥܘܫܢܐ ܫܡܫܝܐ",
-            "solar-radius": "#{n} ܥܘܒܐ ܫܡܫܝܐ",
-            "square-centimeter": "#{n} ܣܡ²",
-            "square-foot": "one#{n} ܐܩܠܐ²|#{n} ܐܩܠ̈ܐ²",
-            "square-inch": "#{n}/ܐܢ²",
-            "square-kilometer": "#{n} ܟܡ²",
-            "square-meter": "#{n} ܡ²",
-            "square-mile": "#{n} ܡܝܠ̈ܐ²",
-            "square-yard": "one#{n} ܝܪܕܐ²|#{n} ܝܪ̈ܕܐ²",
-            "stone": "#{n} ܣܛܘܢ",
-            "tablespoon": "one#{n} ܬܪܘܕܐ ܪܒܐ|#{n} ܬܪ̈ܘܕܐ ܪ̈ܒܐ",
-            "teaspoon": "one#{n} ܬܪܘܕܐ ܙܥܘܪܐ|#{n} ܬܪ̈ܘܕܐ ܙܥܘܪ̈ܐ",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} ☉R",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
             "terabit": "#{n} Tb",
-            "terabit-per-second": "#{n} Tb/ܪ",
+            "terabit-per-second": "#{n} Tb/ܪܦܦܐ",
             "terabyte": "#{n} TB",
-            "terabyte-per-hour": "#{n} TB/ܫܥ",
-            "terabyte-per-second": "#{n} TB/ܪ",
+            "terabyte-per-hour": "#{n} TB/ܫܥܬܐ",
+            "terabyte-per-second": "#{n} TB/ܪܦܦܐ",
             "therm-us": "#{n} US therm",
-            "ton": "one#{n} ܬܘܢܐ|#{n} ܬܘܢ̈ܐ",
-            "tonne": "#{n} ܬ.ܡ",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
-            "week": "one#ܫܒ݂ܘܥܐ|#{n} ܫܒ݂̈ܘܥܐ",
-            "yard": "#{n} ܝܪܕ̈ܐ",
+            "week": "one#{n} ܫܒܘܥܐ|#{n} ܫܒ̈ܘܥܐ",
+            "yard": "#{n} yd",
             "year": "one#ܫܢܬܐ|#{n} ܫ̈ܢܐ"
         }
     }
diff --git a/js/data/locale/frr/ctrynames.json b/js/data/locale/szl/ctrynames.json
similarity index 99%
rename from js/data/locale/frr/ctrynames.json
rename to js/data/locale/szl/ctrynames.json
index 3cf0212256..5c1d927dbd 100644
--- a/js/data/locale/frr/ctrynames.json
+++ b/js/data/locale/szl/ctrynames.json
@@ -204,7 +204,7 @@
     "Peru": "PE",
     "Philippines": "PH",
     "Pitcairn Islands": "PN",
-    "Poland": "PL",
+    "Polska": "PL",
     "Polynesia": "061",
     "Portugal": "PT",
     "Pseudo-Accents": "XA",
@@ -218,6 +218,7 @@
     "Samoa": "WS",
     "San Marino": "SM",
     "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
     "Saudi Arabia": "SA",
     "Senegal": "SN",
     "Serbia": "RS",
@@ -265,7 +266,7 @@
     "Trinidad & Tobago": "TT",
     "Tristan da Cunha": "TA",
     "Tunisia": "TN",
-    "Turkey": "TR",
+    "Türkiye": "TR",
     "Turkmenistan": "TM",
     "Turks & Caicos Islands": "TC",
     "Tuvalu": "TV",
diff --git a/js/data/locale/sms/ctryreverse.json b/js/data/locale/szl/ctryreverse.json
similarity index 99%
rename from js/data/locale/sms/ctryreverse.json
rename to js/data/locale/szl/ctryreverse.json
index 1a338682b8..d03ef804b9 100644
--- a/js/data/locale/sms/ctryreverse.json
+++ b/js/data/locale/szl/ctryreverse.json
@@ -81,6 +81,7 @@
     "CN": "China",
     "CO": "Colombia",
     "CP": "Clipperton Island",
+    "CQ": "Sark",
     "CR": "Costa Rica",
     "CU": "Cuba",
     "CV": "Cape Verde",
@@ -215,7 +216,7 @@
     "PG": "Papua New Guinea",
     "PH": "Philippines",
     "PK": "Pakistan",
-    "PL": "Poland",
+    "PL": "Polska",
     "PM": "St. Pierre & Miquelon",
     "PN": "Pitcairn Islands",
     "PR": "Puerto Rico",
@@ -263,7 +264,7 @@
     "TM": "Turkmenistan",
     "TN": "Tunisia",
     "TO": "Tonga",
-    "TR": "Turkey",
+    "TR": "Türkiye",
     "TT": "Trinidad & Tobago",
     "TV": "Tuvalu",
     "TW": "Taiwan",
diff --git a/js/data/locale/szl/delimiters.jf b/js/data/locale/szl/delimiters.jf
new file mode 100644
index 0000000000..77cc24b189
--- /dev/null
+++ b/js/data/locale/szl/delimiters.jf
@@ -0,0 +1,8 @@
+{
+    "delimiter": {
+        "alternateQuotationEnd": "«",
+        "alternateQuotationStart": "»",
+        "quotationStart": "„"
+    },
+    "generated": true
+}
\ No newline at end of file
diff --git a/js/data/locale/szl/numfmt.jf b/js/data/locale/szl/numfmt.jf
new file mode 100644
index 0000000000..277420711c
--- /dev/null
+++ b/js/data/locale/szl/numfmt.jf
@@ -0,0 +1,11 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "common": "{n} {s}",
+            "commonNegative": "-{n} {s}"
+        },
+        "decimalChar": ",",
+        "groupChar": " "
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/szl/sysres.json b/js/data/locale/szl/sysres.json
index 9b8bb2b87e..33873681d9 100644
--- a/js/data/locale/szl/sysres.json
+++ b/js/data/locale/szl/sysres.json
@@ -65,66 +65,75 @@
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 year|#in {num} years": "#+{num} y",
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "EE0": "Sun",
-    "EE1": "Mon",
-    "EE2": "Tue",
-    "EE3": "Wed",
-    "EE4": "Thu",
-    "EE5": "Fri",
-    "EE6": "Sat",
-    "EEEE0": "Sun",
-    "EEEE1": "Mon",
-    "EEEE2": "Tue",
-    "EEEE3": "Wed",
-    "EEEE4": "Thu",
-    "EEEE5": "Fri",
-    "EEEE6": "Sat",
-    "MMM1": "M01",
-    "MMM10": "M10",
-    "MMM11": "M11",
-    "MMM12": "M12",
-    "MMM2": "M02",
-    "MMM3": "M03",
-    "MMM4": "M04",
-    "MMM5": "M05",
-    "MMM6": "M06",
-    "MMM7": "M07",
-    "MMM8": "M08",
-    "MMM9": "M09",
-    "MMMM1": "M01",
-    "MMMM10": "M10",
-    "MMMM11": "M11",
-    "MMMM12": "M12",
-    "MMMM2": "M02",
-    "MMMM3": "M03",
-    "MMMM4": "M04",
-    "MMMM5": "M05",
-    "MMMM6": "M06",
-    "MMMM7": "M07",
-    "MMMM8": "M08",
-    "MMMM9": "M09",
-    "N1": "M",
-    "N10": "M",
-    "N11": "M",
-    "N12": "M",
-    "N2": "M",
-    "N4": "M",
-    "N6": "M",
-    "N7": "M",
-    "N8": "M",
-    "N9": "M",
-    "NN1": "M0",
-    "NN10": "M1",
-    "NN11": "M1",
-    "NN12": "M1",
-    "NN2": "M0",
-    "NN3": "M0",
-    "NN4": "M0",
-    "NN5": "M0",
-    "NN6": "M0",
-    "NN7": "M0",
-    "NN8": "M0",
-    "NN9": "M0",
+    "EE0": "niydziela",
+    "EE1": "pyńdziałek",
+    "EE2": "wtorek",
+    "EE3": "strzoda",
+    "EE4": "sztwortek",
+    "EE5": "piōntek",
+    "EE6": "sobota",
+    "EEE0": "niydziela",
+    "EEE1": "pyńdziałek",
+    "EEE2": "wtorek",
+    "EEE3": "strzoda",
+    "EEE4": "sztwortek",
+    "EEE5": "piōntek",
+    "EEE6": "sobota",
+    "EEEE0": "niydziela",
+    "EEEE1": "pyńdziałek",
+    "EEEE2": "wtorek",
+    "EEEE3": "strzoda",
+    "EEEE4": "sztwortek",
+    "EEEE5": "piōntek",
+    "EEEE6": "sobota",
+    "MMM1": "stycznia",
+    "MMM10": "października",
+    "MMM11": "listopada",
+    "MMM12": "grudnia",
+    "MMM2": "lutego",
+    "MMM3": "marca",
+    "MMM4": "kwietnia",
+    "MMM5": "moja",
+    "MMM6": "czyrwca",
+    "MMM7": "lipca",
+    "MMM8": "siyrpnia",
+    "MMM9": "września",
+    "MMMM1": "stycznia",
+    "MMMM10": "października",
+    "MMMM11": "listopada",
+    "MMMM12": "grudnia",
+    "MMMM2": "lutego",
+    "MMMM3": "marca",
+    "MMMM4": "kwietnia",
+    "MMMM5": "moja",
+    "MMMM6": "czyrwca",
+    "MMMM7": "lipca",
+    "MMMM8": "siyrpnia",
+    "MMMM9": "września",
+    "N1": "s",
+    "N10": "p",
+    "N11": "l",
+    "N12": "g",
+    "N2": "l",
+    "N3": "m",
+    "N4": "k",
+    "N5": "m",
+    "N6": "c",
+    "N7": "l",
+    "N8": "s",
+    "N9": "w",
+    "NN1": "st",
+    "NN10": "pa",
+    "NN11": "li",
+    "NN12": "gr",
+    "NN2": "lu",
+    "NN3": "ma",
+    "NN4": "kw",
+    "NN5": "mo",
+    "NN6": "cz",
+    "NN7": "li",
+    "NN8": "si",
+    "NN9": "wr",
     "a0": "do połedniŏ",
     "a1": "po połedniu",
     "durationLongDays": "#{num} d",
diff --git a/js/data/locale/szl/unitfmt.json b/js/data/locale/szl/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/szl/unitfmt.json
+++ b/js/data/locale/szl/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ta/sysres.json b/js/data/locale/ta/sysres.json
index bb65ba31cd..63ec7d8a5d 100644
--- a/js/data/locale/ta/sysres.json
+++ b/js/data/locale/ta/sysres.json
@@ -66,7 +66,7 @@
     "1#in 1 year|#in {num} years": "one#{num} ஆண்டில்|#{num} ஆண்டுகளில்",
     "1#in 1 yr|#in {num} yrs": "one#{num} ஆண்டில்|#{num} ஆண்டுகளில்",
     "B0": "நள்ளிரவு",
-    "B1": "முற்பகல்",
+    "B1": "AM",
     "B10": "இரவு",
     "B2": "அதிகாலை",
     "B3": "காலை",
@@ -154,7 +154,6 @@
     "NN7": "ஜூ",
     "NN8": "ஆக",
     "NN9": "செ",
-    "a0": "முற்பகல்",
     "a1": "பிற்பகல்",
     "durationLongDays": "one#{num} நாள்|#{num} நாட்கள்",
     "durationMediumHours": "one#{num} ம.நே.|#{num} ம.நே.",
diff --git a/js/data/locale/ta/unitfmt.json b/js/data/locale/ta/unitfmt.json
index fa5060ef2c..dd4bf94fb4 100644
--- a/js/data/locale/ta/unitfmt.json
+++ b/js/data/locale/ta/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#வளிமண்டலம்|#{n} வளிமண்டலங்கள்",
             "bar": "one#{n} பார்|#{n} பார்கள்",
             "barrel": "one#{n} பீப்பாய்|#{n} பீப்பாய்கள்",
+            "beaufort": "#பியூஃபோர்ட் {n}",
             "bit": "one#{n} பிட்|#{n} பிட்கள்",
             "bit-per-second": "#{n} பிட்கள்/விநாடி",
             "british-thermal-unit": "one#{n} பிரிட்டிஷ் வெப்ப அலகு|#{n} பிரிட்டிஷ் வெப்ப அலகுகள்",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} பார்",
             "barrel": "#{n} பீப்.",
+            "beaufort": "#பியூ. {n}",
             "bit": "#{n} பிட்",
             "bit-per-second": "#{n} பிட்/வி.",
             "british-thermal-unit": "#{n} பி.டி.யூ",
diff --git a/js/data/locale/te/unitfmt.json b/js/data/locale/te/unitfmt.json
index d1fe48a746..c56f7f78b8 100644
--- a/js/data/locale/te/unitfmt.json
+++ b/js/data/locale/te/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "one#{n} వాతావరణం|#{n} వాతావరణాలు",
             "bar": "one#{n} బార్|#{n} బార్‌లు",
             "barrel": "#{n} బారెల్‌లు",
+            "beaufort": "#బ్యూఫోర్ట్ {n}",
             "bit": "one#{n} బిట్|#{n} బిట్‌లు",
             "bit-per-second": "#సెకనుకు {n} బిట్‌లు",
             "british-thermal-unit": "one#{n} బ్రిటీష్ థెర్మల్ యూనిట్|#{n} బ్రిటీష్ థెర్మల్ యూనిట్లు",
@@ -36,14 +37,13 @@
             "cup-metric": "one#{n} మెట్రిక్ కప్పు|#{n} మెట్రిక్ కప్పులు",
             "dalton": "one#{n} డాల్టన్|#{n} డాల్టన్‌లు",
             "day": "one#{n} రోజు|#{n} రోజులు",
-            "day-person": "one#{n} రోజు|#{n} రోజులు",
             "decade": "one#{n} దశాబ్దం|#{n} దశాబ్దాలు",
             "deciliter": "one#{n} డెసిలీటరు|#{n} డెసిలీటర్లు",
             "decimeter": "one#{n} డెసిమీటరు|#{n} డెసిమీటర్లు",
             "degree": "one#{n} డిగ్రీ|#{n} డిగ్రీలు",
             "dessert-spoon": "#{n} డెసర్ట్ స్పూన్",
             "dessert-spoon-imperial": "#{n} ఇంపీరియల్ డెసర్ట్ స్పూన్",
-            "dot": "#{n} బిందువు",
+            "dot": "one#{n} బిందువు|#{n} బిందువులు",
             "dot-per-centimeter": "one#{n} బిందువు ప్రతి సెంటిమీటరుకు|#{n} బిందువులు ప్రతి సెంటిమీటరుకు",
             "dot-per-inch": "one#{n} బిందువు ప్రతి అంగుళానికి|#{n} బిందువులు ప్రతి అంగుళానికి",
             "dram": "#{n} డ్రామ్",
@@ -213,10 +213,11 @@
             "ampere": "#{n} ఆం",
             "arc-minute": "#{n} ఆర్క్ నిమి.",
             "arc-second": "#{n} ఆర్క్ సెక.",
-            "astronomical-unit": "one#au|#{n} au",
+            "astronomical-unit": "one#ఖ. ప్ర.|#{n} ఖ. ప్ర.",
             "atmosphere": "#{n} వాతావ",
             "bar": "one#{n} బార్|#{n} బార్‌లు",
             "barrel": "#{n} బారెల్",
+            "beaufort": "#బ్యూ. {n}",
             "bit": "#{n} బి",
             "bit-per-second": "#{n} బి/సె",
             "british-thermal-unit": "#{n} Btu",
@@ -249,7 +250,7 @@
             "degree": "#{n} డి.",
             "dessert-spoon": "#{n} డె.స్పూ.",
             "dessert-spoon-imperial": "#{n} డె.స్పూ. ఇంపీరియల్",
-            "dot": "#{n} బిందువు",
+            "dot": "one#{n} బిందువు|#{n} బిందువులు",
             "dot-per-centimeter": "#{n} బి/సె.మీ.",
             "dot-per-inch": "#{n} బి/అం.",
             "dram": "#{n} డ్రామ్ ఫ్లూ.",
diff --git a/js/data/locale/teo/KE/ctrynames.json b/js/data/locale/teo/KE/ctrynames.json
index c62bacd5aa..e96f5e9992 100644
--- a/js/data/locale/teo/KE/ctrynames.json
+++ b/js/data/locale/teo/KE/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/teo/KE/ctryreverse.json b/js/data/locale/teo/KE/ctryreverse.json
index 1f0b566414..3f9c8ee110 100644
--- a/js/data/locale/teo/KE/ctryreverse.json
+++ b/js/data/locale/teo/KE/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/teo/ctrynames.json b/js/data/locale/teo/ctrynames.json
index c62bacd5aa..e96f5e9992 100644
--- a/js/data/locale/teo/ctrynames.json
+++ b/js/data/locale/teo/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/teo/ctryreverse.json b/js/data/locale/teo/ctryreverse.json
index 1f0b566414..3f9c8ee110 100644
--- a/js/data/locale/teo/ctryreverse.json
+++ b/js/data/locale/teo/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/teo/unitfmt.json b/js/data/locale/teo/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/teo/unitfmt.json
+++ b/js/data/locale/teo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/tg/delimiters.jf b/js/data/locale/tg/delimiters.jf
new file mode 100644
index 0000000000..f4477c3ee8
--- /dev/null
+++ b/js/data/locale/tg/delimiters.jf
@@ -0,0 +1,7 @@
+{
+    "delimiter": {
+        "quotationEnd": "«",
+        "quotationStart": "»"
+    },
+    "generated": true
+}
\ No newline at end of file
diff --git a/js/data/locale/tg/unitfmt.json b/js/data/locale/tg/unitfmt.json
index 3bd243dc29..28679b451a 100644
--- a/js/data/locale/tg/unitfmt.json
+++ b/js/data/locale/tg/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} каме",
             "bit-per-second": "#{n} бит дар як сония",
             "british-thermal-unit": "#{n} воҳиди англисӣ-термикӣ",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/th/unitfmt.json b/js/data/locale/th/unitfmt.json
index 1316bf048b..7475a1efb1 100644
--- a/js/data/locale/th/unitfmt.json
+++ b/js/data/locale/th/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} บรรยากาศ",
             "bar": "#{n} บาร์",
             "barrel": "#{n} บาร์เรล",
+            "beaufort": "#โบฟอร์ต {n}",
             "bit": "#{n} บิต",
             "bit-per-second": "#{n} บิต ต่อวินาที",
             "british-thermal-unit": "#{n} หน่วยความร้อนอังกฤษ",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} บรรยากาศ",
             "bar": "#{n} บาร์",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} บิต",
             "bit-per-second": "#{n} บิต/วิ",
             "british-thermal-unit": "#{n} BTU",
diff --git a/js/data/locale/ti/ER/ctrynames.json b/js/data/locale/ti/ER/ctrynames.json
index d5c0a74fc4..10f23f8e8d 100644
--- a/js/data/locale/ti/ER/ctrynames.json
+++ b/js/data/locale/ti/ER/ctrynames.json
@@ -1,5 +1,5 @@
 {
-    "Sark": "CQ",
+    "British Indian Ocean Territory": "IO",
     "ሃንጋሪ": "HU",
     "ሃይቲ": "HT",
     "ህንዲ": "IN",
@@ -67,6 +67,7 @@
     "ሲንት ማርተን": "SX",
     "ሲንጋፖር": "SG",
     "ሳሞኣ": "WS",
+    "ሳርክ": "CQ",
     "ሳን ማሪኖ": "SM",
     "ሳኦ ቶመን ፕሪንሲፐን": "ST",
     "ሴራ ልዮን": "SL",
@@ -105,7 +106,6 @@
     "ብሩነይ": "BN",
     "ብሩንዲ": "BI",
     "ብሪጣንያ": "GB",
-    "ብሪጣንያዊ ህንዳዊ ውቅያኖስ ግዝኣት": "IO",
     "ብራዚል": "BR",
     "ቦሊቭያ": "BO",
     "ቦትስዋና": "BW",
diff --git a/js/data/locale/ti/ER/ctryreverse.json b/js/data/locale/ti/ER/ctryreverse.json
index 7e99499ba9..7cde69959a 100644
--- a/js/data/locale/ti/ER/ctryreverse.json
+++ b/js/data/locale/ti/ER/ctryreverse.json
@@ -81,7 +81,7 @@
     "CN": "ቻይና",
     "CO": "ኮሎምብያ",
     "CP": "ደሴት ክሊፐርቶን",
-    "CQ": "Sark",
+    "CQ": "ሳርክ",
     "CR": "ኮስታ ሪካ",
     "CU": "ኩባ",
     "CV": "ኬፕ ቨርደ",
@@ -143,7 +143,7 @@
     "IL": "እስራኤል",
     "IM": "ኣይል ኦፍ ማን",
     "IN": "ህንዲ",
-    "IO": "ብሪጣንያዊ ህንዳዊ ውቅያኖስ ግዝኣት",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ዒራቕ",
     "IR": "ኢራን",
     "IS": "ኣይስላንድ",
diff --git a/js/data/locale/ti/ctrynames.json b/js/data/locale/ti/ctrynames.json
index d5c0a74fc4..10f23f8e8d 100644
--- a/js/data/locale/ti/ctrynames.json
+++ b/js/data/locale/ti/ctrynames.json
@@ -1,5 +1,5 @@
 {
-    "Sark": "CQ",
+    "British Indian Ocean Territory": "IO",
     "ሃንጋሪ": "HU",
     "ሃይቲ": "HT",
     "ህንዲ": "IN",
@@ -67,6 +67,7 @@
     "ሲንት ማርተን": "SX",
     "ሲንጋፖር": "SG",
     "ሳሞኣ": "WS",
+    "ሳርክ": "CQ",
     "ሳን ማሪኖ": "SM",
     "ሳኦ ቶመን ፕሪንሲፐን": "ST",
     "ሴራ ልዮን": "SL",
@@ -105,7 +106,6 @@
     "ብሩነይ": "BN",
     "ብሩንዲ": "BI",
     "ብሪጣንያ": "GB",
-    "ብሪጣንያዊ ህንዳዊ ውቅያኖስ ግዝኣት": "IO",
     "ብራዚል": "BR",
     "ቦሊቭያ": "BO",
     "ቦትስዋና": "BW",
diff --git a/js/data/locale/ti/ctryreverse.json b/js/data/locale/ti/ctryreverse.json
index 7e99499ba9..7cde69959a 100644
--- a/js/data/locale/ti/ctryreverse.json
+++ b/js/data/locale/ti/ctryreverse.json
@@ -81,7 +81,7 @@
     "CN": "ቻይና",
     "CO": "ኮሎምብያ",
     "CP": "ደሴት ክሊፐርቶን",
-    "CQ": "Sark",
+    "CQ": "ሳርክ",
     "CR": "ኮስታ ሪካ",
     "CU": "ኩባ",
     "CV": "ኬፕ ቨርደ",
@@ -143,7 +143,7 @@
     "IL": "እስራኤል",
     "IM": "ኣይል ኦፍ ማን",
     "IN": "ህንዲ",
-    "IO": "ብሪጣንያዊ ህንዳዊ ውቅያኖስ ግዝኣት",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ዒራቕ",
     "IR": "ኢራን",
     "IS": "ኣይስላንድ",
diff --git a/js/data/locale/ti/sysres.json b/js/data/locale/ti/sysres.json
index 712b9bfaf7..875df00e50 100644
--- a/js/data/locale/ti/sysres.json
+++ b/js/data/locale/ti/sysres.json
@@ -6,51 +6,51 @@
     "#in {num}s": "one#ኣብ {num} ካልኢት|#ኣብ {num} ካልኢት",
     "#in {num}w": "one#ኣብ {num} ሰሙን|#ኣብ {num} ሰሙን",
     "#in {num}y": "one#ኣብ {num} ዓ|#ኣብ {num} ዓ",
-    "#{num} ms": "one#{num} ms|#{num} ms",
-    "#{num}d": "one#{num} d|#{num} d",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
     "#{num}d ago": "one#ቅድሚ {num} መዓልቲ|#ቅድሚ {num} መዓልቲ",
-    "#{num}h": "one#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#ቅድሚ {num} ሰዓት|#ቅድሚ {num} ሰዓት",
     "#{num}mi ago": "one#ቅድሚ {num} ደቒቕ|#ቅድሚ {num} ደቒቕ",
     "#{num}mo ago": "one#ቅድሚ {num} ወርሒ|#ቅድሚ {num} ወርሒ",
-    "#{num}s": "one#{num} s|#{num} s",
+    "#{num}s": "#{num} s",
     "#{num}s ago": "one#ቅድሚ {num} ካልኢት|#ቅድሚ {num} ካልኢት",
-    "#{num}w": "one#{num} w|#{num} w",
+    "#{num}w": "#{num} w",
     "#{num}w ago": "one#ቅድሚ {num} ሰሙን|#ቅድሚ {num} ሰሙን",
-    "#{num}y": "one#{num} y|#{num} y",
+    "#{num}y": "#{num} y",
     "#{num}y ago": "one#ቅድሚ -{num} ዓ|#ቅድሚ {num} ዓ",
     "1#1 day ago|#{num} days ago": "one#ቅድሚ {num} መዓልቲ|#ኣብ {num} መዓልቲ",
-    "1#1 day|#{num} days": "one#{num} d|#{num} d",
+    "1#1 day|#{num} days": "#{num} d",
     "1#1 dy ago|#{num} dys ago": "one#ቅድሚ {num} መዓልቲ|#ኣብ {num} መዓልቲ",
-    "1#1 dy|#{num} dys": "one#{num} d|#{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
     "1#1 hour ago|#{num} hours ago": "one#ቅድሚ {num} ሰዓት|#ቅድሚ {num} ሰዓት",
-    "1#1 hour|#{num} hours": "one#{num} h|#{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
     "1#1 hr ago|#{num} hrs ago": "one#ቅድሚ {num} ሰዓት|#ቅድሚ {num} ሰዓት",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
-    "1#1 millisecond|#{num} milliseconds": "one#{num} ms|#{num} ms",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
     "1#1 min ago|#{num} min ago": "one#ቅድሚ {num} ደቒቕ|#ቅድሚ {num} ደቒቕ",
     "1#1 minute ago|#{num} minutes ago": "one#ቅድሚ {num} ደቒቕ|#ቅድሚ {num} ደቒቕ",
-    "1#1 minute|#{num} minutes": "one#{num} min|#{num} min",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "one#ቅድሚ {num} ወርሒ|#ቅድሚ {num} ወርሒ",
     "1#1 month ago|#{num} months ago": "one#ቅድሚ {num} ወርሒ|#ቅድሚ {num} ወርሒ",
-    "1#1 month|#{num} months": "one#{num} m|#{num} m",
-    "1#1 mon|#{num} mons": "one#{num} m|#{num} m",
-    "1#1 mo|#{num} mos": "one#{num} m|#{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
     "1#1 sec ago|#{num} sec ago": "one#ቅድሚ {num} ካልኢት|#ቅድሚ {num} ካልኢት",
     "1#1 second ago|#{num} seconds ago": "one#ቅድሚ {num} ካልኢት|#ቅድሚ {num} ካልኢት",
-    "1#1 second|#{num} seconds": "one#{num} s|#{num} s",
-    "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 se|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#ቅድሚ {num} ሰሙን|#ቅድሚ {num} ሰሙን",
-    "1#1 week|#{num} weeks": "one#{num} w|#{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
     "1#1 wk ago|#{num} wks ago": "one#ቅድሚ {num} ሰሙን|#ቅድሚ {num} ሰሙን",
-    "1#1 wk|#{num} wks": "one#{num} w|#{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
     "1#1 year ago|#{num} years ago": "one#ቅድሚ {num} ዓ|#ቅድሚ {num} ዓ",
-    "1#1 year|#{num} years": "one#{num} y|#{num} y",
+    "1#1 year|#{num} years": "#{num} y",
     "1#1 yr ago|#{num} yrs ago": "one#ቅድሚ {num} ዓ|#ቅድሚ {num} ዓ",
-    "1#1 yr|#{num} yrs": "one#{num} y|#{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
     "1#in 1 day|#in {num} days": "one#ኣብ {num} መዓልቲ|#ኣብ {num} መዓልቲ",
     "1#in 1 dy|#in {num} dys": "one#ኣብ {num} መዓልቲ|#ኣብ {num} መዓልቲ",
     "1#in 1 hour|#in {num} hours": "one#ኣብ {num} ሰዓት|#ኣብ {num} ሰዓት",
@@ -145,14 +145,14 @@
     "NN9": "መስ",
     "a0": "ቅ.ቀ.",
     "a1": "ድ.ቀ.",
-    "durationLongDays": "one#{num} d|#{num} d",
-    "durationMediumHours": "one#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
-    "durationMediumWeeks": "one#{num} w|#{num} w",
-    "durationMediumYears": "one#{num} y|#{num} y",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|#{num} min",
-    "durationShortMonths": "one#{num} m|#{num} m",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
     "finalSeparatorFull": "ን ን",
     "finalSeparatorLong": "፣ ",
     "finalSeparatorMedium": "፣ ",
diff --git a/js/data/locale/ti/unitfmt.json b/js/data/locale/ti/unitfmt.json
index 4afb386b30..ae0c48c8b1 100644
--- a/js/data/locale/ti/unitfmt.json
+++ b/js/data/locale/ti/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -42,9 +43,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
@@ -215,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -247,9 +246,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
diff --git a/js/data/locale/tig/unitfmt.json b/js/data/locale/tig/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/tig/unitfmt.json
+++ b/js/data/locale/tig/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/tk/sysres.json b/js/data/locale/tk/sysres.json
index 82bd740b29..cdfb16381c 100644
--- a/js/data/locale/tk/sysres.json
+++ b/js/data/locale/tk/sysres.json
@@ -31,7 +31,7 @@
     "1#1 min ago|#{num} min ago": "one#{num} minut öň|#{num} minut öň",
     "1#1 minute ago|#{num} minutes ago": "one#{num} minut öň|#{num} minut öň",
     "1#1 minute|#{num} minutes": "one#{num} minut|#{num} minut",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "1#1 mon ago|#{num} mons ago": "one#{num} aý öň|#{num} aý öň",
     "1#1 month ago|#{num} months ago": "one#{num} aý öň|#{num} aý öň",
diff --git a/js/data/locale/tk/unitfmt.json b/js/data/locale/tk/unitfmt.json
index ef8970eaf6..cb0f4b5734 100644
--- a/js/data/locale/tk/unitfmt.json
+++ b/js/data/locale/tk/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfera",
             "bar": "#{n} bar",
             "barrel": "#{n} barrel",
+            "beaufort": "#Bofort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/sekunt",
             "british-thermal-unit": "#{n} Britan ýylylyk birligi",
@@ -43,8 +44,8 @@
             "dessert-spoon": "#{n} süýji çemçesi",
             "dessert-spoon-imperial": "#{n} Imp. süýji çemçesi",
             "dot": "#{n} nokat",
-            "dot-per-centimeter": "#{n} santimetr başyna nokat",
-            "dot-per-inch": "#{n} dýuým başyna nokat",
+            "dot-per-centimeter": "#{n} nsmb",
+            "dot-per-inch": "#{n} nokat dýuým başyna",
             "dram": "#{n} dram",
             "drop": "#{n} damja",
             "dunam": "#{n} dunam",
@@ -55,8 +56,8 @@
             "fahrenheit": "#{n} Farengeýt gradusy",
             "fathom": "#{n} fatom",
             "fluid-ounce": "#{n} suwuklyk unsiýasy",
-            "fluid-ounce-imperial": "one#{n} fl oz Imp.|#{n} Imp. suwuklyk unsiýasy",
-            "foodcalorie": "#{n} kaloriýa",
+            "fluid-ounce-imperial": "one#{n} imp. suwukluk unsiýasy|#{n} imp. suwuklyk unsiýasy",
+            "foodcalorie": "#{n} Kaloriýa",
             "foot": "#{n} fut",
             "foot-per-second": "#{n} fut/sekunt",
             "furlong": "#{n} furlong",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/sek",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,8 @@
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
             "dot": "#{n} nokat",
-            "dot-per-centimeter": "#{n} smbn",
-            "dot-per-inch": "#{n} dbn",
+            "dot-per-centimeter": "#{n} nsmb",
+            "dot-per-inch": "#{n} ndb",
             "dram": "#{n} dram fl",
             "drop": "#{n} damja",
             "dunam": "#{n} dunam",
@@ -261,8 +263,8 @@
             "fahrenheit": "#{n}°F",
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} suw. uns.",
-            "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kal",
+            "fluid-ounce-imperial": "#{n} imp. suw. uns.",
+            "foodcalorie": "#{n} Kal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/sek",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/tn/unitfmt.json b/js/data/locale/tn/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/tn/unitfmt.json
+++ b/js/data/locale/tn/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/to/sysres.json b/js/data/locale/to/sysres.json
index 22e11496c9..4db7968750 100644
--- a/js/data/locale/to/sysres.json
+++ b/js/data/locale/to/sysres.json
@@ -91,16 +91,16 @@
     "G-1": "KM",
     "G1": "TS",
     "L1": "S",
-    "L10": "O",
+    "L10": "ʻO",
     "L11": "N",
     "L12": "T",
     "L2": "F",
     "L3": "M",
-    "L4": "E",
+    "L4": "ʻE",
     "L5": "M",
     "L6": "S",
     "L7": "S",
-    "L8": "A",
+    "L8": "ʻA",
     "L9": "S",
     "LL1": "Sā",
     "LL10": "ʻO",
@@ -113,7 +113,7 @@
     "LL6": "Su",
     "LL7": "Si",
     "LL8": "ʻA",
-    "LL9": "Se",
+    "LL9": "Sē",
     "LLL1": "Sān",
     "LLL10": "ʻOka",
     "LLL11": "Nōv",
@@ -125,7 +125,7 @@
     "LLL6": "Sun",
     "LLL7": "Siu",
     "LLL8": "ʻAok",
-    "LLL9": "Sep",
+    "LLL9": "Sēp",
     "LLLL1": "Sānuali",
     "LLLL10": "ʻOkatopa",
     "LLLL11": "Nōvema",
@@ -149,6 +149,7 @@
     "MMM6": "Sun",
     "MMM7": "Siu",
     "MMM8": "ʻAok",
+    "MMM9": "Sēp",
     "MMMM1": "Sānuali",
     "MMMM10": "ʻOkatopa",
     "MMMM11": "Nōvema",
@@ -160,7 +161,7 @@
     "MMMM6": "Sune",
     "MMMM7": "Siulai",
     "MMMM8": "ʻAokosi",
-    "MMMM9": "Sepitema",
+    "MMMM9": "Sēpitema",
     "N1": "S",
     "N10": "ʻ",
     "N12": "T",
@@ -178,6 +179,7 @@
     "NN6": "Su",
     "NN7": "Si",
     "NN8": "ʻA",
+    "NN9": "Sē",
     "a0": "hengihengi",
     "a1": "efiafi",
     "durationLongDays": "#ʻa ʻe {num}",
diff --git a/js/data/locale/to/unitfmt.json b/js/data/locale/to/unitfmt.json
index f082d9a00d..dbbffbf768 100644
--- a/js/data/locale/to/unitfmt.json
+++ b/js/data/locale/to/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#ʻatimosifia ʻe {n}",
             "bar": "#pā ʻe {n}",
             "barrel": "#paelo ʻe {n}",
+            "beaufort": "#B {n}",
             "bit": "#piti ʻe {n}",
             "bit-per-second": "#piti ʻe {n} ki he sekoni",
             "british-thermal-unit": "#ʻiuniti māfana fakapilitānia ʻe {n}",
@@ -43,8 +44,6 @@
             "dessert-spoon": "#sēpuni puteni ʻe {n}",
             "dessert-spoon-imperial": "#sēpuni puteni fakaʻemipaea ʻe {n}",
             "dot": "#toti ʻe {n}",
-            "dot-per-centimeter": "#toti ʻe {n} he senitimita",
-            "dot-per-inch": "#toti ʻe {n} he ʻinisi",
             "dram": "#talamu tafe ʻe {n}",
             "drop": "#tulutā ʻe {n}",
             "dunam": "#tunami ʻe {n}",
@@ -56,7 +55,6 @@
             "fathom": "#ofa ʻe {n}",
             "fluid-ounce": "#ʻaunise tafe ʻe {n}",
             "fluid-ounce-imperial": "#ʻaunise fakaʻemipaea ʻe {n}",
-            "foodcalorie": "#kaloli-kai ʻe {n}",
             "foot": "#fute ʻe {n}",
             "foot-per-second": "#fute ʻe {n} ki he sekoni",
             "furlong": "#fālongo ʻe {n}",
@@ -216,6 +214,7 @@
             "atmosphere": "#ʻati ʻe {n}",
             "bar": "#pā ʻe {n}",
             "barrel": "#paelo ʻe {n}",
+            "beaufort": "#B {n}",
             "bit": "#piti ʻe {n}",
             "bit-per-second": "#piti ʻe {n} /s",
             "british-thermal-unit": "#imfP ʻe {n}",
@@ -249,8 +248,6 @@
             "dessert-spoon": "#sēpu ʻe {n}",
             "dessert-spoon-imperial": "#sēpu-ʻem ʻe {n}",
             "dot": "#toti ʻe {n}",
-            "dot-per-centimeter": "#toti ʻe {n}/sm",
-            "dot-per-inch": "#toti ʻe {n}/in",
             "dram": "#tlmu-tf ʻe {n}",
             "drop": "#tltā ʻe {n}",
             "dunam": "#tunami ʻe {n}",
@@ -262,7 +259,6 @@
             "fathom": "#ofa ʻe {n}",
             "fluid-ounce": "#ʻau-tf ʻe {n}",
             "fluid-ounce-imperial": "#ʻau-ʻem ʻe {n}",
-            "foodcalorie": "#kal-k ʻe {n}",
             "foot": "#ft ʻe {n}",
             "foot-per-second": "#ft ʻe {n} /s",
             "furlong": "#fāl ʻe {n}",
diff --git a/js/data/locale/tok/ctrynames.json b/js/data/locale/tok/ctrynames.json
index cced94376d..65b3e70f6f 100644
--- a/js/data/locale/tok/ctrynames.json
+++ b/js/data/locale/tok/ctrynames.json
@@ -147,6 +147,8 @@
     "Liechtenstein": "LI",
     "Lithuania": "LT",
     "Luxembourg": "LU",
+    "ma ale": "001",
+    "ma Opekisan": "UZ",
     "ma Sawasi": "SZ",
     "Macao SAR China": "MO",
     "Madagascar": "MG",
@@ -280,7 +282,6 @@
     "United States": "US",
     "Unknown Region": "ZZ",
     "Uruguay": "UY",
-    "Uzbekistan": "UZ",
     "Vanuatu": "VU",
     "Vatican City": "VA",
     "Venezuela": "VE",
@@ -290,7 +291,6 @@
     "Western Asia": "145",
     "Western Europe": "155",
     "Western Sahara": "EH",
-    "world": "001",
     "Yemen": "YE",
     "Zambia": "ZM",
     "Zimbabwe": "ZW"
diff --git a/js/data/locale/tok/ctryreverse.json b/js/data/locale/tok/ctryreverse.json
index 0e1e1b9bf3..3af673f09b 100644
--- a/js/data/locale/tok/ctryreverse.json
+++ b/js/data/locale/tok/ctryreverse.json
@@ -1,5 +1,5 @@
 {
-    "001": "world",
+    "001": "ma ale",
     "002": "Africa",
     "003": "North America",
     "005": "South America",
@@ -275,7 +275,7 @@
     "UN": "United Nations",
     "US": "United States",
     "UY": "Uruguay",
-    "UZ": "Uzbekistan",
+    "UZ": "ma Opekisan",
     "VA": "Vatican City",
     "VC": "St. Vincent & Grenadines",
     "VE": "Venezuela",
diff --git a/js/data/locale/tok/numfmt.jf b/js/data/locale/tok/numfmt.jf
new file mode 100644
index 0000000000..f991c36155
--- /dev/null
+++ b/js/data/locale/tok/numfmt.jf
@@ -0,0 +1,14 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "common": "{s}{n}",
+            "commonNegative": "-{s}{n}"
+        },
+        "decimalChar": ",",
+        "groupChar": " ",
+        "negativepctFmt": "-%{n}",
+        "pctFmt": "%{n}",
+        "prigroupSize": 2
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/tok/sysres.json b/js/data/locale/tok/sysres.json
index 03ebba6582..1edba26a23 100644
--- a/js/data/locale/tok/sysres.json
+++ b/js/data/locale/tok/sysres.json
@@ -65,66 +65,77 @@
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 year|#in {num} years": "#+{num} y",
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "EE0": "Sun",
-    "EE1": "Mon",
-    "EE2": "Tue",
-    "EE3": "Wed",
-    "EE4": "Thu",
-    "EE5": "Fri",
-    "EE6": "Sat",
-    "EEEE0": "Sun",
-    "EEEE1": "Mon",
-    "EEEE2": "Tue",
-    "EEEE3": "Wed",
-    "EEEE4": "Thu",
-    "EEEE5": "Fri",
-    "EEEE6": "Sat",
-    "MMM1": "M01",
-    "MMM10": "M10",
-    "MMM11": "M11",
-    "MMM12": "M12",
-    "MMM2": "M02",
-    "MMM3": "M03",
-    "MMM4": "M04",
-    "MMM5": "M05",
-    "MMM6": "M06",
-    "MMM7": "M07",
-    "MMM8": "M08",
-    "MMM9": "M09",
-    "MMMM1": "M01",
-    "MMMM10": "M10",
-    "MMMM11": "M11",
-    "MMMM12": "M12",
-    "MMMM2": "M02",
-    "MMMM3": "M03",
-    "MMMM4": "M04",
-    "MMMM5": "M05",
-    "MMMM6": "M06",
-    "MMMM7": "M07",
-    "MMMM8": "M08",
-    "MMMM9": "M09",
-    "N1": "M",
-    "N10": "M",
-    "N11": "M",
-    "N12": "M",
-    "N2": "M",
-    "N4": "M",
-    "N6": "M",
-    "N7": "M",
-    "N8": "M",
-    "N9": "M",
-    "NN1": "M0",
-    "NN10": "M1",
-    "NN11": "M1",
-    "NN12": "M1",
-    "NN2": "M0",
-    "NN3": "M0",
-    "NN4": "M0",
-    "NN5": "M0",
-    "NN6": "M0",
-    "NN7": "M0",
-    "NN8": "M0",
-    "NN9": "M0",
+    "EE0": "suno esun #7",
+    "EE1": "suno esun #1",
+    "EE2": "suno esun #2",
+    "EE3": "suno esun #3",
+    "EE4": "suno esun #4",
+    "EE5": "suno esun #5",
+    "EE6": "suno esun #6",
+    "EEE0": "suno esun #7",
+    "EEE1": "suno esun #1",
+    "EEE2": "suno esun #2",
+    "EEE3": "suno esun #3",
+    "EEE4": "suno esun #4",
+    "EEE5": "suno esun #5",
+    "EEE6": "suno esun #6",
+    "EEEE0": "suno esun #7",
+    "EEEE1": "suno esun #1",
+    "EEEE2": "suno esun #2",
+    "EEEE3": "suno esun #3",
+    "EEEE4": "suno esun #4",
+    "EEEE5": "suno esun #5",
+    "EEEE6": "suno esun #6",
+    "MMM1": "mun #1",
+    "MMM10": "mun #10",
+    "MMM11": "mun #11",
+    "MMM12": "mun #12",
+    "MMM2": "mun #2",
+    "MMM3": "mun #3",
+    "MMM4": "mun #4",
+    "MMM5": "mun #5",
+    "MMM6": "mun #6",
+    "MMM7": "mun #7",
+    "MMM8": "mun #8",
+    "MMM9": "mun #9",
+    "MMMM1": "mun #1",
+    "MMMM10": "mun #10",
+    "MMMM11": "mun #11",
+    "MMMM12": "mun #12",
+    "MMMM2": "mun #2",
+    "MMMM3": "mun #3",
+    "MMMM4": "mun #4",
+    "MMMM5": "mun #5",
+    "MMMM6": "mun #6",
+    "MMMM7": "mun #7",
+    "MMMM8": "mun #8",
+    "MMMM9": "mun #9",
+    "N1": "m",
+    "N10": "m",
+    "N11": "m",
+    "N12": "m",
+    "N2": "m",
+    "N3": "m",
+    "N4": "m",
+    "N5": "m",
+    "N6": "m",
+    "N7": "m",
+    "N8": "m",
+    "N9": "m",
+    "NN1": "mu",
+    "NN10": "mu",
+    "NN11": "mu",
+    "NN12": "mu",
+    "NN2": "mu",
+    "NN3": "mu",
+    "NN4": "mu",
+    "NN5": "mu",
+    "NN6": "mu",
+    "NN7": "mu",
+    "NN8": "mu",
+    "NN9": "mu",
+    "a0": "pi open suno",
+    "a1": "pi pini suno",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
     "durationMediumMillis": "#{num} ms",
diff --git a/js/data/locale/tok/unitfmt.json b/js/data/locale/tok/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/tok/unitfmt.json
+++ b/js/data/locale/tok/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/tpi/unitfmt.json b/js/data/locale/tpi/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/tpi/unitfmt.json
+++ b/js/data/locale/tpi/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/tr/CY/ctrynames.json b/js/data/locale/tr/CY/ctrynames.json
index 0c473f7ae6..2fce0a0dec 100644
--- a/js/data/locale/tr/CY/ctrynames.json
+++ b/js/data/locale/tr/CY/ctrynames.json
@@ -55,7 +55,7 @@
     "Burkina Faso": "BF",
     "Burundi": "BI",
     "Butan": "BT",
-    "Cape Verde": "CV",
+    "Cabo Verde": "CV",
     "Cayman Adaları": "KY",
     "Cebelitarık": "GI",
     "Ceuta ve Melilla": "EA",
diff --git a/js/data/locale/tr/CY/ctryreverse.json b/js/data/locale/tr/CY/ctryreverse.json
index 713bb7b546..77ac925da4 100644
--- a/js/data/locale/tr/CY/ctryreverse.json
+++ b/js/data/locale/tr/CY/ctryreverse.json
@@ -84,7 +84,7 @@
     "CQ": "Sark",
     "CR": "Kosta Rika",
     "CU": "Küba",
-    "CV": "Cape Verde",
+    "CV": "Cabo Verde",
     "CW": "Curaçao",
     "CX": "Christmas Adası",
     "CY": "Kıbrıs",
diff --git a/js/data/locale/tr/ctrynames.json b/js/data/locale/tr/ctrynames.json
index 0c473f7ae6..2fce0a0dec 100644
--- a/js/data/locale/tr/ctrynames.json
+++ b/js/data/locale/tr/ctrynames.json
@@ -55,7 +55,7 @@
     "Burkina Faso": "BF",
     "Burundi": "BI",
     "Butan": "BT",
-    "Cape Verde": "CV",
+    "Cabo Verde": "CV",
     "Cayman Adaları": "KY",
     "Cebelitarık": "GI",
     "Ceuta ve Melilla": "EA",
diff --git a/js/data/locale/tr/ctryreverse.json b/js/data/locale/tr/ctryreverse.json
index 713bb7b546..77ac925da4 100644
--- a/js/data/locale/tr/ctryreverse.json
+++ b/js/data/locale/tr/ctryreverse.json
@@ -84,7 +84,7 @@
     "CQ": "Sark",
     "CR": "Kosta Rika",
     "CU": "Küba",
-    "CV": "Cape Verde",
+    "CV": "Cabo Verde",
     "CW": "Curaçao",
     "CX": "Christmas Adası",
     "CY": "Kıbrıs",
diff --git a/js/data/locale/tr/unitfmt.json b/js/data/locale/tr/unitfmt.json
index 480567c9f6..e8f3d730ee 100644
--- a/js/data/locale/tr/unitfmt.json
+++ b/js/data/locale/tr/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfer",
             "bar": "#{n} bar",
             "barrel": "#{n} varil",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/saniye",
             "british-thermal-unit": "#{n} İngiliz ısı birimi",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/sn",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +251,8 @@
             "dessert-spoon": "#{n} tat. kaşığı",
             "dessert-spoon-imperial": "#{n} İng. tat. kaşığı",
             "dot": "#{n} nokta",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} sıvı dram",
             "drop": "#{n} damla",
             "dunam": "#{n} dunam",
@@ -262,7 +264,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} sıvı ons",
             "fluid-ounce-imperial": "#{n} İng. sıvı ons",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} fit",
             "foot-per-second": "#{n} fit/sn",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/trv/unitfmt.json b/js/data/locale/trv/unitfmt.json
index 6cd7277b69..c526f42509 100644
--- a/js/data/locale/trv/unitfmt.json
+++ b/js/data/locale/trv/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/trw/unitfmt.json b/js/data/locale/trw/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/trw/unitfmt.json
+++ b/js/data/locale/trw/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ts/unitfmt.json b/js/data/locale/ts/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ts/unitfmt.json
+++ b/js/data/locale/ts/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/tt/ctrynames.json b/js/data/locale/tt/ctrynames.json
index 2e4a4b2aa3..34aab86f53 100644
--- a/js/data/locale/tt/ctrynames.json
+++ b/js/data/locale/tt/ctrynames.json
@@ -4,6 +4,7 @@
     "Ascension Island": "AC",
     "Asia": "142",
     "Australasia": "053",
+    "British Indian Ocean Territory": "IO",
     "Canary Islands": "IC",
     "Caribbean": "029",
     "Caribbean Netherlands": "BQ",
@@ -88,7 +89,6 @@
     "Ботсвана": "BW",
     "Бразилия": "BR",
     "Британия Виргин утраулары": "VG",
-    "Британиянең Һинд Океанындагы Территориясе": "IO",
     "Бруней": "BN",
     "Буве утравы": "BV",
     "Буркина-Фасо": "BF",
diff --git a/js/data/locale/tt/ctryreverse.json b/js/data/locale/tt/ctryreverse.json
index 5fc77f858e..098872dba8 100644
--- a/js/data/locale/tt/ctryreverse.json
+++ b/js/data/locale/tt/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Израиль",
     "IM": "Мэн утравы",
     "IN": "Индия",
-    "IO": "Британиянең Һинд Океанындагы Территориясе",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Гыйрак",
     "IR": "Иран",
     "IS": "Исландия",
diff --git a/js/data/locale/tt/unitfmt.json b/js/data/locale/tt/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/tt/unitfmt.json
+++ b/js/data/locale/tt/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/twq/ctrynames.json b/js/data/locale/twq/ctrynames.json
index ae02222a46..05670fea07 100644
--- a/js/data/locale/twq/ctrynames.json
+++ b/js/data/locale/twq/ctrynames.json
@@ -37,7 +37,7 @@
     "Botswaana": "BW",
     "Bouvet Island": "BV",
     "Breezil": "BR",
-    "Britiši Indu teekoo laama": "IO",
+    "British Indian Ocean Territory": "IO",
     "Britiši Virgin gungey": "VG",
     "Bruunee": "BN",
     "Bulgaari": "BG",
diff --git a/js/data/locale/twq/ctryreverse.json b/js/data/locale/twq/ctryreverse.json
index 30fdafd21a..6fbc9e69f0 100644
--- a/js/data/locale/twq/ctryreverse.json
+++ b/js/data/locale/twq/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israyel",
     "IM": "Isle of Man",
     "IN": "Indu laboo",
-    "IO": "Britiši Indu teekoo laama",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraak",
     "IR": "Iraan",
     "IS": "Ayseland",
diff --git a/js/data/locale/twq/unitfmt.json b/js/data/locale/twq/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/twq/unitfmt.json
+++ b/js/data/locale/twq/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/tyv/dateformats.json b/js/data/locale/tyv/dateformats.json
new file mode 100644
index 0000000000..97a8977cbb
--- /dev/null
+++ b/js/data/locale/tyv/dateformats.json
@@ -0,0 +1,133 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/tyv/sysres.json b/js/data/locale/tyv/sysres.json
new file mode 100644
index 0000000000..03ebba6582
--- /dev/null
+++ b/js/data/locale/tyv/sysres.json
@@ -0,0 +1,142 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "EE0": "Sun",
+    "EE1": "Mon",
+    "EE2": "Tue",
+    "EE3": "Wed",
+    "EE4": "Thu",
+    "EE5": "Fri",
+    "EE6": "Sat",
+    "EEEE0": "Sun",
+    "EEEE1": "Mon",
+    "EEEE2": "Tue",
+    "EEEE3": "Wed",
+    "EEEE4": "Thu",
+    "EEEE5": "Fri",
+    "EEEE6": "Sat",
+    "MMM1": "M01",
+    "MMM10": "M10",
+    "MMM11": "M11",
+    "MMM12": "M12",
+    "MMM2": "M02",
+    "MMM3": "M03",
+    "MMM4": "M04",
+    "MMM5": "M05",
+    "MMM6": "M06",
+    "MMM7": "M07",
+    "MMM8": "M08",
+    "MMM9": "M09",
+    "MMMM1": "M01",
+    "MMMM10": "M10",
+    "MMMM11": "M11",
+    "MMMM12": "M12",
+    "MMMM2": "M02",
+    "MMMM3": "M03",
+    "MMMM4": "M04",
+    "MMMM5": "M05",
+    "MMMM6": "M06",
+    "MMMM7": "M07",
+    "MMMM8": "M08",
+    "MMMM9": "M09",
+    "N1": "M",
+    "N10": "M",
+    "N11": "M",
+    "N12": "M",
+    "N2": "M",
+    "N4": "M",
+    "N6": "M",
+    "N7": "M",
+    "N8": "M",
+    "N9": "M",
+    "NN1": "M0",
+    "NN10": "M1",
+    "NN11": "M1",
+    "NN12": "M1",
+    "NN2": "M0",
+    "NN3": "M0",
+    "NN4": "M0",
+    "NN5": "M0",
+    "NN6": "M0",
+    "NN7": "M0",
+    "NN8": "M0",
+    "NN9": "M0",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": ", ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/tyv/unitfmt.json b/js/data/locale/tyv/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/tyv/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/tzm/ctrynames.json b/js/data/locale/tzm/ctrynames.json
index 723cab7fe7..4d75b67a90 100644
--- a/js/data/locale/tzm/ctrynames.json
+++ b/js/data/locale/tzm/ctrynames.json
@@ -6,7 +6,6 @@
     "Albanya": "AL",
     "Almanya": "DE",
     "Americas": "019",
-    "Amur n Agaraw Uhindi Ubṛiṭani": "IO",
     "Anḍurra": "AD",
     "Angula": "AO",
     "Angwilla": "AI",
@@ -32,6 +31,7 @@
     "Birmuda": "BM",
     "Bouvet Island": "BV",
     "Bṛazil": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunay": "BN",
     "Bulivya": "BO",
     "Burkina Fasu": "BF",
diff --git a/js/data/locale/tzm/ctryreverse.json b/js/data/locale/tzm/ctryreverse.json
index bcc914f110..77c33c2a46 100644
--- a/js/data/locale/tzm/ctryreverse.json
+++ b/js/data/locale/tzm/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeil",
     "IM": "Isle of Man",
     "IN": "Hind",
-    "IO": "Amur n Agaraw Uhindi Ubṛiṭani",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Ɛiraq",
     "IR": "Iran",
     "IS": "Islanḍa",
diff --git a/js/data/locale/tzm/unitfmt.json b/js/data/locale/tzm/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/tzm/unitfmt.json
+++ b/js/data/locale/tzm/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ug/ctrynames.json b/js/data/locale/ug/ctrynames.json
index e1beb0c87b..ece91317aa 100644
--- a/js/data/locale/ug/ctrynames.json
+++ b/js/data/locale/ug/ctrynames.json
@@ -26,7 +26,6 @@
     "ئەرمېنىيە": "AM",
     "ئەزەربەيجان": "AZ",
     "ئەنگلىيە ۋىرگىن ئاراللىرى": "VG",
-    "ئەنگلىيەگە قاراشلىق ھىندى ئوكيان تېررىتورىيەسى": "IO",
     "ئوتتۇرا ئاسىيا": "143",
     "ئوتتۇرا ئافرىقا": "017",
     "ئوتتۇرا ئافرىقا جۇمھۇرىيىتى": "CF",
@@ -288,6 +287,7 @@
     "يېشىل تۇمشۇق": "CV",
     "يېڭى زېلاندىيە": "NZ",
     "يېڭى كالېدونىيە": "NC",
+    "British Indian Ocean Territory": "IO",
     "Eurozone": "EZ",
     "Pseudo-Accents": "XA",
     "Pseudo-Bidi": "XB",
diff --git a/js/data/locale/ug/ctryreverse.json b/js/data/locale/ug/ctryreverse.json
index 4a99ad1084..ac2fbffa2b 100644
--- a/js/data/locale/ug/ctryreverse.json
+++ b/js/data/locale/ug/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ئىسرائىلىيە",
     "IM": "مان ئارىلى",
     "IN": "ھىندىستان",
-    "IO": "ئەنگلىيەگە قاراشلىق ھىندى ئوكيان تېررىتورىيەسى",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ئىراق",
     "IR": "ئىران",
     "IS": "ئىسلاندىيە",
diff --git a/js/data/locale/ug/unitfmt.json b/js/data/locale/ug/unitfmt.json
index 66c84cc406..af4b430bc5 100644
--- a/js/data/locale/ug/unitfmt.json
+++ b/js/data/locale/ug/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/uk/ctrynames.json b/js/data/locale/uk/ctrynames.json
index a482bc0052..04dc01087f 100644
--- a/js/data/locale/uk/ctrynames.json
+++ b/js/data/locale/uk/ctrynames.json
@@ -33,7 +33,7 @@
     "Боснія і Герцеговина": "BA",
     "Ботсвана": "BW",
     "Бразилія": "BR",
-    "Британська територія в Індійському Океані": "IO",
+    "Британська територія в Індійському океані": "IO",
     "Британські Віргінські острови": "VG",
     "Бруней": "BN",
     "Буркіна-Фасо": "BF",
diff --git a/js/data/locale/uk/ctryreverse.json b/js/data/locale/uk/ctryreverse.json
index 2f7116a41c..a58e753ca6 100644
--- a/js/data/locale/uk/ctryreverse.json
+++ b/js/data/locale/uk/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Ізраїль",
     "IM": "Острів Мен",
     "IN": "Індія",
-    "IO": "Британська територія в Індійському Океані",
+    "IO": "Британська територія в Індійському океані",
     "IQ": "Ірак",
     "IR": "Іран",
     "IS": "Ісландія",
diff --git a/js/data/locale/uk/dateformats.json b/js/data/locale/uk/dateformats.json
index 45dd39b389..20d4f606df 100644
--- a/js/data/locale/uk/dateformats.json
+++ b/js/data/locale/uk/dateformats.json
@@ -68,6 +68,12 @@
                 "m": "EE, d",
                 "s": "E, dd"
             },
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
             "l": {
                 "f": "LLLL",
                 "l": "LLLL",
diff --git a/js/data/locale/uk/sysres.json b/js/data/locale/uk/sysres.json
index 8a7e450c73..cda8474bec 100644
--- a/js/data/locale/uk/sysres.json
+++ b/js/data/locale/uk/sysres.json
@@ -9,7 +9,7 @@
     "#{num} ms": "one#{num} мс|few#{num} мс|many#{num} мс|#{num} мс",
     "#{num}d": "one#{num}д|few#{num}д|many#{num}д|#{num}д",
     "#{num}d ago": "one#{num} дн. тому|few#{num} дн. тому|many#{num} дн. тому|#{num} дн. тому",
-    "#{num}h": "one#{num} год.|few#{num} год.|many#{num} год.|#{num} год.",
+    "#{num}h": "one#{num}г|few#{num}г|many#{num}г|#{num}г",
     "#{num}h ago": "one#{num} год тому|few#{num} год тому|many#{num} год тому|#{num} год тому",
     "#{num}mi ago": "one#{num} хв тому|few#{num} хв тому|many#{num} хв тому|#{num} хв тому",
     "#{num}mo ago": "one#{num} міс. тому|few#{num} міс. тому|many#{num} міс. тому|#{num} міс. тому",
@@ -69,7 +69,7 @@
     "B1": "ночі",
     "B2": "дп",
     "B3": "ранку",
-    "B4": "пополудні",
+    "B4": "опівдні",
     "B5": "дня",
     "B6": "пп",
     "B7": "вечора",
@@ -94,13 +94,13 @@
     "EEE4": "чт",
     "EEE5": "пт",
     "EEE6": "сб",
-    "EEEE0": "неділя",
+    "EEEE0": "неділю",
     "EEEE1": "понеділок",
     "EEEE2": "вівторок",
-    "EEEE3": "середа",
+    "EEEE3": "середу",
     "EEEE4": "четвер",
-    "EEEE5": "пʼятниця",
-    "EEEE6": "субота",
+    "EEEE5": "пʼятницю",
+    "EEEE6": "суботу",
     "G-1": "до н. е.",
     "G1": "н. е.",
     "L1": "С",
@@ -127,18 +127,18 @@
     "LL7": "ли",
     "LL8": "се",
     "LL9": "ве",
-    "LLL1": "січ",
-    "LLL10": "жов",
-    "LLL11": "лис",
-    "LLL12": "гру",
-    "LLL2": "лют",
-    "LLL3": "бер",
-    "LLL4": "кві",
-    "LLL5": "тра",
-    "LLL6": "чер",
-    "LLL7": "лип",
-    "LLL8": "сер",
-    "LLL9": "вер",
+    "LLL1": "січ.",
+    "LLL10": "жовт.",
+    "LLL11": "лист.",
+    "LLL12": "груд.",
+    "LLL2": "лют.",
+    "LLL3": "бер.",
+    "LLL4": "квіт.",
+    "LLL5": "трав.",
+    "LLL6": "черв.",
+    "LLL7": "лип.",
+    "LLL8": "серп.",
+    "LLL9": "вер.",
     "LLLL1": "січень",
     "LLLL10": "жовтень",
     "LLLL11": "листопад",
@@ -201,8 +201,36 @@
     "NN9": "ве",
     "a0": "дп",
     "a1": "пп",
+    "c0": "Н",
+    "c1": "П",
+    "c2": "В",
+    "c3": "С",
+    "c4": "Ч",
+    "c5": "П",
+    "c6": "С",
+    "cc0": "нд",
+    "cc1": "пн",
+    "cc2": "вт",
+    "cc3": "ср",
+    "cc4": "чт",
+    "cc5": "пт",
+    "cc6": "сб",
+    "ccc0": "нд",
+    "ccc1": "пн",
+    "ccc2": "вт",
+    "ccc3": "ср",
+    "ccc4": "чт",
+    "ccc5": "пт",
+    "ccc6": "сб",
+    "cccc0": "неділя",
+    "cccc1": "понеділок",
+    "cccc2": "вівторок",
+    "cccc3": "середа",
+    "cccc4": "четвер",
+    "cccc5": "пʼятниця",
+    "cccc6": "субота",
     "durationLongDays": "one#{num} дн.|few#{num} дн.|many#{num} дн.|#{num} дн.",
-    "durationMediumHours": "one#{num} год.|few#{num} год.|many#{num} год.|#{num} год.",
+    "durationMediumHours": "one#{num}г|few#{num}г|many#{num}г|#{num}г",
     "durationMediumMillis": "one#{num}мс|few#{num}мс|many#{num}мс|#{num}мс",
     "durationMediumWeeks": "one#{num}т|few#{num}т|many#{num}т|#{num}т",
     "durationMediumYears": "one#{num}р|few#{num}р|many#{num}р|#{num}р",
diff --git a/js/data/locale/uk/unitfmt.json b/js/data/locale/uk/unitfmt.json
index b78af9156a..154f40e128 100644
--- a/js/data/locale/uk/unitfmt.json
+++ b/js/data/locale/uk/unitfmt.json
@@ -10,9 +10,10 @@
             "atmosphere": "one#{n} атмосфера|many#{n} атмосфер|#{n} атмосфери",
             "bar": "one#{n} бар|few#{n} бари|many#{n} барів|#{n} бара",
             "barrel": "one#{n} барель|few#{n} барелі|many#{n} барелів|#{n} бареля",
+            "beaufort": "one#{n} бал за шкалою Бофорта|few#{n} бали за шкалою Бофорта|many#{n} балів за шкалою Бофорта|#{n} бала за шкалою Бофорта",
             "bit": "one#{n} біт|few#{n} біти|many#{n} бітів|#{n} біта",
             "bit-per-second": "#{n} біта на секунду",
-            "british-thermal-unit": "one#{n} одиниця теплова британська|few#{n} одиниці теплові британські|many#{n} одиниць теплових британських|#{n} одиниці теплової британської",
+            "british-thermal-unit": "one#{n} британська теплова одиниця|few#{n} британські теплові одиниці|many#{n} британських теплових одиниць|#{n} британської теплової одиниці",
             "bushel": "one#{n} бушель|few#{n} бушелі|many#{n} бушелів|#{n} бушеля",
             "byte": "one#{n} байт|few#{n} байти|many#{n} байтів|#{n} байта",
             "byte-per-hour": "#{n} байта на годину",
@@ -32,7 +33,7 @@
             "cubic-meter": "one#{n} кубічний метр|few#{n} кубічні метри|many#{n} кубічних метрів|#{n} кубічного метра",
             "cubic-mile": "one#{n} кубічна миля|few#{n} кубічні милі|many#{n} кубічних миль|#{n} кубічної милі",
             "cubic-yard": "one#{n} кубічний ярд|few#{n} кубічні ярди|many#{n} кубічних ярдів|#{n} кубічного ярда",
-            "cup": "one#{n} склянка|many#{n} склянок|#{n} склянки",
+            "cup": "one#{n} чашка|many#{n} чашок|#{n} чашки",
             "cup-metric": "one#{n} метрична чашка|few#{n} метричні чашки|many#{n} метричних чашок|#{n} метричної чашки",
             "dalton": "one#{n} дальтон|few#{n} дальтони|many#{n} дальтонів|#{n} дальтона",
             "day": "one#{n} день|few#{n} дні|many#{n} днів|#{n} дня",
@@ -55,7 +56,7 @@
             "em": "one#{n} типографський ем|few#{n} типографські еми|many#{n} типографських емів|#{n} типографського ема",
             "fahrenheit": "one#{n} градус Фаренгейта|few#{n} градуси Фаренгейта|many#{n} градусів Фаренгейта|#{n} градуса Фаренгейта",
             "fathom": "one#{n} фатом|few#{n} фатоми|many#{n} фатомів|#{n} фатома",
-            "fluid-ounce": "one#{n} рідка унція|few#{n} рідкі унції|many#{n} рідких унцій|#{n} рідкої унції",
+            "fluid-ounce": "one#{n} рідинна унція|few#{n} рідинні унції|many#{n} рідинних унцій|#{n} рідинної унції",
             "fluid-ounce-imperial": "one#{n} англійська рідинна унція|few#{n} англійські рідинні унції|many#{n} англійських рідинних унцій|#{n} англійської рідинної унції",
             "foodcalorie": "one#{n} кілокалорія|many#{n} кілокалорій|#{n} кілокалорії",
             "foot": "one#{n} фут|few#{n} фути|many#{n} футів|#{n} фута",
@@ -97,7 +98,7 @@
             "kilohertz": "one#{n} кілогерц|few#{n} кілогерци|many#{n} кілогерців|#{n} кілогерца",
             "kilojoule": "one#{n} кілоджоуль|few#{n} кілоджоулі|many#{n} кілоджоулів|#{n} кілоджоуля",
             "kilometer": "one#{n} кілометр|few#{n} кілометри|many#{n} кілометрів|#{n} кілометра",
-            "kilometer-per-hour": "one#{n} кілометр на годину|few#{n} кілометри на годину|many#{n} кілометрів на годину|#{n} кілометра на годину",
+            "kilometer-per-hour": "one#{n} кілометр за годину|few#{n} кілометри за годину|many#{n} кілометрів за годину|#{n} кілометра за годину",
             "kilometer-per-liter": "#{n} кілометра на літр",
             "kilometer-per-second": "#{n} кілометра на секунду",
             "kilopascal": "one#{n} кілопаскаль|few#{n} кілопаскалі|many#{n} кілопаскалів|#{n} кілопаскаля",
@@ -209,7 +210,7 @@
         },
         "short": {
             "acre": "one#{n} акр|few#{n} акри|many#{n} акрів|#{n} акра",
-            "acre-foot": "one#{n} акр-фут|few#{n} акр-фути|many#{n} акр-футів|#{n} акр-фута",
+            "acre-foot": "#{n} акр-фт",
             "ampere": "#{n} А",
             "arc-minute": "#{n} кут. мін.",
             "arc-second": "#{n} кут. сек.",
@@ -217,9 +218,10 @@
             "atmosphere": "#{n} атм",
             "bar": "#{n} бар",
             "barrel": "#{n} брл",
+            "beaufort": "one#{n} бал Бофорта|few#{n} бали Бофорта|many#{n} балів Бофорта|#{n} бала Бофорта",
             "bit": "#{n} б",
             "bit-per-second": "#{n} б/с",
-            "british-thermal-unit": "#{n} Отб",
+            "british-thermal-unit": "#{n} БТО",
             "bushel": "#{n} буш.",
             "byte": "#{n} Б",
             "byte-per-hour": "#{n} Б/год",
@@ -233,25 +235,25 @@
             "century": "#{n} ст.",
             "coordinateUnit": "",
             "cubic-centimeter": "#{n} см³",
-            "cubic-foot": "one#{n} фут³|few#{n} фути³|many#{n} футів³|#{n} фута³",
+            "cubic-foot": "one#{n} фут³|#{n} фт³",
             "cubic-inch": "one#{n} дюйм³|few#{n} дюйми³|many#{n} дюймів³|#{n} дюйма³",
             "cubic-kilometer": "#{n} км³",
             "cubic-meter": "#{n} м³",
             "cubic-mile": "one#{n} миля³|many#{n} миль³|#{n} милі³",
             "cubic-yard": "one#{n} ярд³|few#{n} ярди³|many#{n} ярдів³|#{n} ярда³",
-            "cup": "#{n} скл.",
+            "cup": "#{n} чаш.",
             "cup-metric": "one#{n} метр. чашка|many#{n} метр. чашок|#{n} метр. чашки",
             "dalton": "#{n} Да",
             "day": "#{n} дн.",
-            "decade": "many#{n} 10-річ|#{n} 10-річчя",
+            "decade": "one#{n} 10-річчя|few#{n} 10-річчя|#{n} 10-річ",
             "deciliter": "#{n} дл",
             "decimeter": "#{n} дм",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} дес. л.",
+            "dessert-spoon": "one#{n} дес. ложка|many#{n} дес. ложок|#{n} дес. ложки",
             "dessert-spoon-imperial": "one#{n} англ. дес. ложка|many#{n} англ. дес. ложок|#{n} англ. дес. ложки",
             "dot": "#{n} тчк",
-            "dot-per-centimeter": "one#{n} точка на см|few#{n} точки на см|many#{n} точок на см|#{n} dpcm",
-            "dot-per-inch": "one#{n} ppi|few#{n} ppi|many#{n} ppi|#{n} dpi",
+            "dot-per-centimeter": "one#{n} точка на см|many#{n} точок на см|#{n} точки на см",
+            "dot-per-inch": "#{n} тчк/дюйм",
             "dram": "one#{n} рід. драхма|many#{n} рід. драхм|#{n} рід. драхми",
             "drop": "one#{n} крапля|many#{n} крапель|#{n} краплі",
             "dunam": "one#{n} дунам|few#{n} дунами|many#{n} дунамів|#{n} дунама",
@@ -263,10 +265,9 @@
             "fathom": "#{n} фтм",
             "fluid-ounce": "one#{n} рід. унція|many#{n} рід. унцій|#{n} рід. унції",
             "fluid-ounce-imperial": "one#{n} англ. рід. унція|many#{n} англ. рід. унцій|#{n} англ. рід. унції",
-            "foodcalorie": "#{n} ккал",
             "foot": "#{n} фт",
             "foot-per-second": "#{n} фт/с",
-            "furlong": "#{n} fur",
+            "furlong": "#{n} фрл",
             "g-force": "#{n} g",
             "gallon": "#{n} гал.",
             "gallon-imperial": "one#{n} англ. галон|few#{n} англ. галони|many#{n} англ. галонів|#{n} англ. галона",
@@ -310,7 +311,7 @@
             "kilowatt": "#{n} кВт",
             "kilowatt-hour": "#{n} кВт⋅год",
             "kilowatt-hour-per-100-kilometer": "#{n} кВт⋅год/100 км",
-            "knot": "#{n} kn",
+            "knot": "#{n} вуз.",
             "light-year": "#{n} св. р.",
             "liter": "#{n} л",
             "liter-per-100-kilometer": "#{n} л/100 км",
@@ -325,7 +326,7 @@
             "megahertz": "#{n} МГц",
             "megaliter": "#{n} Мл",
             "megapascal": "#{n} МПа",
-            "megapixel": "#{n} Мп",
+            "megapixel": "#{n} Мпкс",
             "megawatt": "#{n} МВт",
             "meter": "#{n} м",
             "meter-per-second": "#{n} м/с",
@@ -372,10 +373,10 @@
             "pint": "one#{n} пінта|many#{n} пінт|#{n} пінти",
             "pint-metric": "one#{n} метр. пінта|many#{n} метр. пінт|#{n} метр. пінти",
             "pixel": "#{n} пкс",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel-per-centimeter": "#{n} пкс/см",
+            "pixel-per-inch": "#{n} пкс/“",
             "point": "#{n} пт",
-            "pound": "one#{n} фунт|few#{n} фунти|many#{n} фунтів|#{n} фунта",
+            "pound": "#{n} фнт",
             "pound-force": "#{n} фнтс",
             "pound-force-foot": "#{n} фнт-фт",
             "pound-force-per-square-inch": "one#{n} фунт/дюйм²|few#{n} фунти/дюйм²|many#{n} фунтів/дюйм²|#{n} фунта/дюйм²",
@@ -398,7 +399,7 @@
             "square-yard": "one#{n} ярд²|few#{n} ярди²|many#{n} ярдів²|#{n} ярда²",
             "stone": "#{n} стн",
             "tablespoon": "one#{n} ст. ложка|many#{n} ст. ложок|#{n} ст. ложки",
-            "teaspoon": "#{n} ч. л.",
+            "teaspoon": "one#{n} ч. ложка|many#{n} ч. ложок|#{n} ч. ложки",
             "terabit": "#{n} Тб",
             "terabit-per-second": "#{n} Тб/с",
             "terabyte": "#{n} ТБ",
diff --git a/js/data/locale/es/BO/clock.jf b/js/data/locale/und/419/clock.jf
similarity index 56%
rename from js/data/locale/es/BO/clock.jf
rename to js/data/locale/und/419/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/es/BO/clock.jf
+++ b/js/data/locale/und/419/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/AR/clock.jf b/js/data/locale/und/AR/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/AR/clock.jf
+++ b/js/data/locale/und/AR/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/BO/clock.jf b/js/data/locale/und/BO/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/BO/clock.jf
+++ b/js/data/locale/und/BO/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/CL/clock.jf b/js/data/locale/und/CL/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/CL/clock.jf
+++ b/js/data/locale/und/CL/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/CR/clock.jf b/js/data/locale/und/CR/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/CR/clock.jf
+++ b/js/data/locale/und/CR/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/CU/clock.jf b/js/data/locale/und/CU/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/CU/clock.jf
+++ b/js/data/locale/und/CU/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/CU/currency.jf b/js/data/locale/und/CU/currency.jf
index 0a89f92f39..2b87867e65 100644
--- a/js/data/locale/und/CU/currency.jf
+++ b/js/data/locale/und/CU/currency.jf
@@ -1,3 +1,3 @@
 {
-    "currency": "CUC"
+    "currency": "CUP"
 }
\ No newline at end of file
diff --git a/js/data/locale/und/EC/clock.jf b/js/data/locale/und/EC/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/EC/clock.jf
+++ b/js/data/locale/und/EC/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/GT/clock.jf b/js/data/locale/und/GT/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/GT/clock.jf
+++ b/js/data/locale/und/GT/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/HN/clock.jf b/js/data/locale/und/HN/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/HN/clock.jf
+++ b/js/data/locale/und/HN/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/MX/clock.jf b/js/data/locale/und/MX/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/MX/clock.jf
+++ b/js/data/locale/und/MX/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/NI/clock.jf b/js/data/locale/und/NI/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/NI/clock.jf
+++ b/js/data/locale/und/NI/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/PE/clock.jf b/js/data/locale/und/PE/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/PE/clock.jf
+++ b/js/data/locale/und/PE/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/PY/clock.jf b/js/data/locale/und/PY/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/PY/clock.jf
+++ b/js/data/locale/und/PY/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/SV/clock.jf b/js/data/locale/und/SV/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/SV/clock.jf
+++ b/js/data/locale/und/SV/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/und/UY/clock.jf b/js/data/locale/und/UY/clock.jf
index 5399494fdb..a0a394490f 100644
--- a/js/data/locale/und/UY/clock.jf
+++ b/js/data/locale/und/UY/clock.jf
@@ -1,4 +1,4 @@
 {
-    "clock": "24",
+    "clock": "12",
     "generated": true
 }
\ No newline at end of file
diff --git a/js/data/locale/unitfmt.json b/js/data/locale/unitfmt.json
index 81e2086607..a563d69770 100644
--- a/js/data/locale/unitfmt.json
+++ b/js/data/locale/unitfmt.json
@@ -11,6 +11,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
@@ -233,6 +234,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} b/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ur/IN/ctrynames.json b/js/data/locale/ur/IN/ctrynames.json
index 981f6a9ad2..e1b50fc802 100644
--- a/js/data/locale/ur/IN/ctrynames.json
+++ b/js/data/locale/ur/IN/ctrynames.json
@@ -40,7 +40,7 @@
     "بارباڈوس": "BB",
     "بحرین": "BH",
     "برازیل": "BR",
-    "برطانوی بحرہند خطہ": "IO",
+    "برطانوی بحر ہند کا علاقہ": "IO",
     "برطانوی جزائر ورجن": "VG",
     "برکینا فاسو": "BF",
     "برمودا": "BM",
diff --git a/js/data/locale/ur/IN/ctryreverse.json b/js/data/locale/ur/IN/ctryreverse.json
index f0c54d33ee..031b79a3ef 100644
--- a/js/data/locale/ur/IN/ctryreverse.json
+++ b/js/data/locale/ur/IN/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "اسرائیل",
     "IM": "آئل آف مین",
     "IN": "بھارت",
-    "IO": "برطانوی بحرہند خطہ",
+    "IO": "برطانوی بحر ہند کا علاقہ",
     "IQ": "عراق",
     "IR": "ایران",
     "IS": "آئس لینڈ",
diff --git a/js/data/locale/ur/IN/unitfmt.json b/js/data/locale/ur/IN/unitfmt.json
index f64f652a99..871c412b90 100644
--- a/js/data/locale/ur/IN/unitfmt.json
+++ b/js/data/locale/ur/IN/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} ماحول",
             "bar": "one#{n} بار|#{n} بارز",
             "barrel": "one#{n} بیرل|#{n} بیرلز",
+            "beaufort": "#{n} بیوفورٹ",
             "bit": "one#{n} بٹ|#{n} بٹس",
             "bit-per-second": "#{n} بٹس فی سیکنڈ",
             "british-thermal-unit": "one#{n} برطانوی تھرمل اکائی|#{n} برطانوی تھرمل اکائیاں",
@@ -36,7 +37,7 @@
             "cup-metric": "#{n} میٹرک کپ",
             "dalton": "one#{n} ڈالٹن|#{n} ڈالٹنز",
             "day": "#{n} دن",
-            "day-person": "#{n} دن",
+            "day-person": "",
             "decade": "one#{n} دہائی|#{n} دہائیاں",
             "deciliter": "#{n} ڈیسی لیٹر",
             "decimeter": "#{n} ڈیسی میٹر",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} بار|#{n} بارز",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit فی سیکنڈ",
             "british-thermal-unit": "#{n} Btu",
@@ -344,7 +346,7 @@
             "milligram": "#{n} mg",
             "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
             "milliliter": "#{n} mL",
-            "millimeter": "#{n} ملیمیٹر",
+            "millimeter": "one#{n} ملی میٹر|#{n} ملیمیٹر",
             "millimeter-ofhg": "#{n} mm Hg",
             "millimole-per-liter": "#{n} mmol/L",
             "millisecond": "#{n} ملی سیکنڈ",
diff --git a/js/data/locale/ur/unitfmt.json b/js/data/locale/ur/unitfmt.json
index fd08e41c83..4d4804c664 100644
--- a/js/data/locale/ur/unitfmt.json
+++ b/js/data/locale/ur/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} ماحول",
             "bar": "one#{n} بار|#{n} بارز",
             "barrel": "one#{n} بیرل|#{n} بیرلز",
+            "beaufort": "#{n} بیوفورٹ",
             "bit": "one#{n} بٹ|#{n} بٹس",
             "bit-per-second": "#{n} بٹس فی سیکنڈ",
             "british-thermal-unit": "one#{n} برطانوی تھرمل اکائی|#{n} برطانوی تھرمل اکائیاں",
@@ -36,7 +37,7 @@
             "cup-metric": "#{n} میٹرک کپ",
             "dalton": "one#{n} ڈالٹن|#{n} ڈالٹنز",
             "day": "#{n} دن",
-            "day-person": "#{n} دن",
+            "day-person": "",
             "decade": "one#{n} دہائی|#{n} دہائیاں",
             "deciliter": "#{n} ڈیسی لیٹر",
             "decimeter": "#{n} ڈیسی میٹر",
@@ -217,6 +218,7 @@
             "atmosphere": "#{n} atm",
             "bar": "one#{n} بار|#{n} بارز",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit فی سیکنڈ",
             "british-thermal-unit": "#{n} Btu",
@@ -344,7 +346,7 @@
             "milligram": "#{n} mg",
             "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
             "milliliter": "#{n} mL",
-            "millimeter": "#{n} ملیمیٹر",
+            "millimeter": "one#{n} ملی میٹر|#{n} ملیمیٹر",
             "millimeter-ofhg": "#{n} mm Hg",
             "millimole-per-liter": "#{n} mmol/L",
             "millisecond": "#{n} ملی سیکنڈ",
diff --git a/js/data/locale/uz/Arab/sysres.json b/js/data/locale/uz/Arab/sysres.json
index f4a55e4669..51c2d88fca 100644
--- a/js/data/locale/uz/Arab/sysres.json
+++ b/js/data/locale/uz/Arab/sysres.json
@@ -6,7 +6,6 @@
     "#in {num}s": "#+{num} s",
     "#in {num}w": "#+{num} w",
     "#in {num}y": "#+{num} y",
-    "#{num} ms": "#{num} ms",
     "#{num}d": "#{num} d",
     "#{num}d ago": "#-{num} d",
     "#{num}h": "#{num} h",
@@ -224,10 +223,8 @@
     "cccc6": "شنبه",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
-    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "#{num} w",
     "durationMediumYears": "#{num} y",
-    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "#{num} min",
     "durationShortMonths": "#{num} m",
     "finalSeparatorFull": ", ",
diff --git a/js/data/locale/uz/Arab/unitfmt.json b/js/data/locale/uz/Arab/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/uz/Arab/unitfmt.json
+++ b/js/data/locale/uz/Arab/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/uz/Cyrl/ctrynames.json b/js/data/locale/uz/Cyrl/ctrynames.json
index fb29204d26..a6d0bbdfaf 100644
--- a/js/data/locale/uz/Cyrl/ctrynames.json
+++ b/js/data/locale/uz/Cyrl/ctrynames.json
@@ -1,5 +1,6 @@
 {
     "Birlashgan Millatlar Tashkiloti": "UN",
+    "Britaniyaning Hind okeanidagi hududi": "IO",
     "Qalbaki Bidi": "XB",
     "Qalbaki urg‘u": "XA",
     "Sahro janubidagi Afrika": "202",
@@ -42,7 +43,6 @@
     "Ботсванна": "BW",
     "Бразилия": "BR",
     "Британия Виргин ороллари": "VG",
-    "Британиянинг Ҳинд океанидаги ҳудуди": "IO",
     "Бруней": "BN",
     "Буве ороли": "BV",
     "Буркина-Фасо": "BF",
diff --git a/js/data/locale/uz/Cyrl/ctryreverse.json b/js/data/locale/uz/Cyrl/ctryreverse.json
index 3509716782..4e024b85d1 100644
--- a/js/data/locale/uz/Cyrl/ctryreverse.json
+++ b/js/data/locale/uz/Cyrl/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Исроил",
     "IM": "Мэн ороли",
     "IN": "Ҳиндистон",
-    "IO": "Британиянинг Ҳинд океанидаги ҳудуди",
+    "IO": "Britaniyaning Hind okeanidagi hududi",
     "IQ": "Ироқ",
     "IR": "Эрон",
     "IS": "Исландия",
diff --git a/js/data/locale/uz/Cyrl/unitfmt.json b/js/data/locale/uz/Cyrl/unitfmt.json
index 6f6582800a..2ce6119d5c 100644
--- a/js/data/locale/uz/Cyrl/unitfmt.json
+++ b/js/data/locale/uz/Cyrl/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/uz/sysres.json b/js/data/locale/uz/sysres.json
index 1b5d4cef3e..3ae38464c0 100644
--- a/js/data/locale/uz/sysres.json
+++ b/js/data/locale/uz/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#‏{num} soniyadan keyin|#‏{num} soniyadan keyin",
     "#in {num}w": "one#‏{num} haftadan keyin|#‏{num} haftadan keyin",
     "#in {num}y": "one#‏{num} yildan keyin|#‏{num} yildan keyin",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} kun|#{num} kun",
     "#{num}d ago": "one#‏{num} kun oldin|#‏{num} kun oldin",
     "#{num}h": "one#{num} soat|#{num} soat",
@@ -202,10 +202,10 @@
     "a1": "TK",
     "durationLongDays": "one#{num} kun|#{num} kun",
     "durationMediumHours": "one#{num} soat|#{num} soat",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} hafta|#{num} hafta",
     "durationMediumYears": "one#{num} yil|#{num} yil",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} daq.|#{num} daq.",
     "durationShortMonths": "one#{num} oy|#{num} oy",
     "finalSeparatorFull": " ",
diff --git a/js/data/locale/uz/unitfmt.json b/js/data/locale/uz/unitfmt.json
index d22e5bb2a9..5f87cdb82d 100644
--- a/js/data/locale/uz/unitfmt.json
+++ b/js/data/locale/uz/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atmosfera",
             "bar": "#{n} bar",
             "barrel": "#{n} barrel",
+            "beaufort": "#Bofort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/soniya",
             "british-thermal-unit": "#{n} Britaniya issiqlik birligi",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} barrel",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
diff --git a/js/data/locale/vai/Latn/ctrynames.json b/js/data/locale/vai/Latn/ctrynames.json
index 155c2160ba..6cefdf231f 100644
--- a/js/data/locale/vai/Latn/ctrynames.json
+++ b/js/data/locale/vai/Latn/ctrynames.json
@@ -38,6 +38,7 @@
     "Bhurundi": "BI",
     "Bhurunɛĩ": "BN",
     "Bhutaŋ": "BT",
+    "British Indian Ocean Territory": "IO",
     "Caribbean": "029",
     "Central America": "013",
     "Central Asia": "143",
@@ -93,7 +94,6 @@
     "Jamba Kuwa Lumaã": "GL",
     "Japaŋ": "JP",
     "Jengéesi Bhɛɛ Lɔ Musu Tiŋŋɛ": "VG",
-    "Jengéesi Gbawoe Índiya Kɔiyɛ Lɔ": "IO",
     "Jibhurata": "GI",
     "Jibhuti": "DJ",
     "Jɔɔdaŋ": "JO",
diff --git a/js/data/locale/vai/Latn/ctryreverse.json b/js/data/locale/vai/Latn/ctryreverse.json
index bf6b42512c..60aaffd6a1 100644
--- a/js/data/locale/vai/Latn/ctryreverse.json
+++ b/js/data/locale/vai/Latn/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Bhanísiláila",
     "IM": "ꕮꘋ ꔳꘋꗣ",
     "IN": "Índiya",
-    "IO": "Jengéesi Gbawoe Índiya Kɔiyɛ Lɔ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Iraŋ",
     "IS": "Áisi Lumaã",
diff --git a/js/data/locale/vai/Vaii/ctrynames.json b/js/data/locale/vai/Vaii/ctrynames.json
index c98e5fc7d3..7bd71e6db8 100644
--- a/js/data/locale/vai/Vaii/ctrynames.json
+++ b/js/data/locale/vai/Vaii/ctrynames.json
@@ -3,6 +3,7 @@
     "Americas": "019",
     "Asia": "142",
     "Australasia": "053",
+    "British Indian Ocean Territory": "IO",
     "Caribbean": "029",
     "Central America": "013",
     "Central Asia": "143",
@@ -49,7 +50,6 @@
     "ꔓꗠꖻ": "RE",
     "ꔖꗼꔷ": "SC",
     "ꔚꔷ": "CL",
-    "ꔛꔟꔻ ꔤꔺꕩ ꗛꔤꘂ ꕗꕴꔀ ꕮ": "IO",
     "ꔛꔟꔻ ꗩꗡ ꗏ ꖷꖬ ꔳꘋꗣ": "VG",
     "ꔛꗨꗢ": "JP",
     "ꔝꘈꘋ": "YE",
diff --git a/js/data/locale/vai/Vaii/ctryreverse.json b/js/data/locale/vai/Vaii/ctryreverse.json
index 1f5018b09d..5b4f221127 100644
--- a/js/data/locale/vai/Vaii/ctryreverse.json
+++ b/js/data/locale/vai/Vaii/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ꕑꕇꔻꕞꔤꕞ",
     "IM": "ꕮꘋ ꔳꘋꗣ",
     "IN": "ꔤꔺꕩ",
-    "IO": "ꔛꔟꔻ ꔤꔺꕩ ꗛꔤꘂ ꕗꕴꔀ ꕮ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ꔤꕟꕃ",
     "IR": "ꔤꕟꘋ",
     "IS": "ꕉꔤꔻ ꖨꕮꕊ",
diff --git a/js/data/locale/vai/ctrynames.json b/js/data/locale/vai/ctrynames.json
index c98e5fc7d3..7bd71e6db8 100644
--- a/js/data/locale/vai/ctrynames.json
+++ b/js/data/locale/vai/ctrynames.json
@@ -3,6 +3,7 @@
     "Americas": "019",
     "Asia": "142",
     "Australasia": "053",
+    "British Indian Ocean Territory": "IO",
     "Caribbean": "029",
     "Central America": "013",
     "Central Asia": "143",
@@ -49,7 +50,6 @@
     "ꔓꗠꖻ": "RE",
     "ꔖꗼꔷ": "SC",
     "ꔚꔷ": "CL",
-    "ꔛꔟꔻ ꔤꔺꕩ ꗛꔤꘂ ꕗꕴꔀ ꕮ": "IO",
     "ꔛꔟꔻ ꗩꗡ ꗏ ꖷꖬ ꔳꘋꗣ": "VG",
     "ꔛꗨꗢ": "JP",
     "ꔝꘈꘋ": "YE",
diff --git a/js/data/locale/vai/ctryreverse.json b/js/data/locale/vai/ctryreverse.json
index 1f5018b09d..5b4f221127 100644
--- a/js/data/locale/vai/ctryreverse.json
+++ b/js/data/locale/vai/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ꕑꕇꔻꕞꔤꕞ",
     "IM": "ꕮꘋ ꔳꘋꗣ",
     "IN": "ꔤꔺꕩ",
-    "IO": "ꔛꔟꔻ ꔤꔺꕩ ꗛꔤꘂ ꕗꕴꔀ ꕮ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ꔤꕟꕃ",
     "IR": "ꔤꕟꘋ",
     "IS": "ꕉꔤꔻ ꖨꕮꕊ",
diff --git a/js/data/locale/vai/unitfmt.json b/js/data/locale/vai/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/vai/unitfmt.json
+++ b/js/data/locale/vai/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/ve/unitfmt.json b/js/data/locale/ve/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/ve/unitfmt.json
+++ b/js/data/locale/ve/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/vec/ctrynames.json b/js/data/locale/vec/ctrynames.json
new file mode 100644
index 0000000000..a42022775b
--- /dev/null
+++ b/js/data/locale/vec/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "Afghanistan": "AF",
+    "Àfrega": "002",
+    "Àfrega meridionale": "018",
+    "Àfrega orientale": "014",
+    "Àfrega osidentale": "011",
+    "Àfrega sentrale": "017",
+    "Àfrega setentrionale": "015",
+    "Àfrega subsahariana": "202",
+    "Albania": "AL",
+    "Aljerìa": "DZ",
+    "Andora": "AD",
+    "Angola": "AO",
+    "Anguila": "AI",
+    "Antàrtide": "AQ",
+    "Antigua e Barbuda": "AG",
+    "Arabia Saudìa": "SA",
+    "Arjentina": "AR",
+    "Armenia": "AM",
+    "Aruba": "AW",
+    "Australazia": "053",
+    "Australia": "AU",
+    "Àustria": "AT",
+    "Azerbaijan": "AZ",
+    "Azia": "142",
+    "Azia de’l sudest": "035",
+    "Azia meridionale": "034",
+    "Azia orientale": "030",
+    "Azia osidentale": "145",
+    "Azia sentrale": "143",
+    "Bahamas": "BS",
+    "Bangladesh": "BD",
+    "Barbados": "BB",
+    "Barein": "BH",
+    "Belize": "BZ",
+    "Beljo": "BE",
+    "Belorusia": "BY",
+    "Benin": "BJ",
+    "Bermuda": "BM",
+    "Bolivia": "BO",
+    "Botzwana": "BW",
+    "Boznia e Erzegòvina": "BA",
+    "Brazile": "BR",
+    "Brunéi": "BN",
+    "Bulgarìa": "BG",
+    "Burkina Fazo": "BF",
+    "Burundi": "BI",
+    "Butan": "BT",
+    "Càmerun": "CM",
+    "Cànada": "CA",
+    "Canboja": "KH",
+    "Cao Verdo": "CV",
+    "Caràibi": "029",
+    "Catar": "QA",
+    "Cechia": "CZ",
+    "Ceuta e Melila": "EA",
+    "Ciad": "TD",
+    "Cile": "CL",
+    "Colonbia": "CO",
+    "Corèa de’l nord": "KP",
+    "Corèa de’l sud": "KR",
+    "Costa d’Avorio": "CI",
+    "Costa Rica": "CR",
+    "Croasia": "HR",
+    "Cuba": "CU",
+    "Curaçao": "CW",
+    "Danimarca": "DK",
+    "Diego Garcia": "DG",
+    "Doménega": "DM",
+    "Ècuador": "EC",
+    "Ejito": "EG",
+    "El Salvador": "SV",
+    "Emirài Àrabi Unìi": "AE",
+    "Eritrèa": "ER",
+    "Estonia": "EE",
+    "Esuatini": "SZ",
+    "Etiopia": "ET",
+    "Europa": "150",
+    "Europa meridionale": "039",
+    "Europa orientale": "151",
+    "Europa osidentale": "155",
+    "Europa setentrionale": "154",
+    "Eurozona": "EZ",
+    "Fiji": "FJ",
+    "Filipine": "PH",
+    "Finlanda": "FI",
+    "Fransa": "FR",
+    "Gabon": "GA",
+    "Gana": "GH",
+    "Ganbia": "GM",
+    "Georgia de’l sud e Sandwich de’l sud": "GS",
+    "Gibiltera": "GI",
+    "Granada": "GD",
+    "Grecia": "GR",
+    "Groenlanda": "GL",
+    "Guadalupa": "GP",
+    "Guam": "GU",
+    "Guatemala": "GT",
+    "Guernsey": "GG",
+    "Guinèa": "GN",
+    "Guinèa Bisào": "GW",
+    "Guinèa Ecuatoriale": "GQ",
+    "Guyana": "GY",
+    "Guyana franseze": "GF",
+    "Haiti": "HT",
+    "Honduras": "HN",
+    "India": "IN",
+    "Indonezia": "ID",
+    "Irac": "IQ",
+    "Iran": "IR",
+    "Irlanda": "IE",
+    "Italia": "IT",
+    "Izlanda": "IS",
+    "Ìzola Asension": "AC",
+    "Ìzola Buvet": "BV",
+    "Ìzola de Clipperton": "CP",
+    "Ìzola de Man": "IM",
+    "Ìzola de Nadale": "CX",
+    "Ìzola Norfolk": "NF",
+    "Ìzola Reunion": "RE",
+    "Ìzola S. Èlena": "SH",
+    "Ìzole Aland": "AX",
+    "Ìzole Caiman": "KY",
+    "Ìzole Canarie": "IC",
+    "Ìzole Cocos (Keeling)": "CC",
+    "Ìzole Comore": "KM",
+    "Ìzole Cook": "CK",
+    "Ìzole Fàroe": "FO",
+    "Ìzole Heard e McDonald": "HM",
+    "Ìzole Maiote": "YT",
+    "Ìzole Malvine": "FK",
+    "Ìzole Mariane setentrionali": "MP",
+    "Ìzole Marshall": "MH",
+    "Ìzole Maurisio": "MU",
+    "Ìzołe perifèreghe meregane": "UM",
+    "Ìzole Pitcairn": "PN",
+    "Ìzole Salomon": "SB",
+    "Ìzole Seisel": "SC",
+    "Ìzole Vèrjini britàneghe": "VG",
+    "Ìzole Vèrjini meregane": "VI",
+    "Izraele": "IL",
+    "Jamàega": "JM",
+    "Japon": "JP",
+    "Jeorja": "GE",
+    "Jermania": "DE",
+    "Jersey": "JE",
+    "Jibuti": "DJ",
+    "Jordania": "JO",
+    "Kazakistan": "KZ",
+    "Kenya": "KE",
+    "Kirghizistan": "KG",
+    "Kiribati": "KI",
+    "Kòsovo": "XK",
+    "Kuwait": "KW",
+    "Laos": "LA",
+    "Letonia": "LV",
+    "Lezoto": "LS",
+    "Lìbano": "LB",
+    "Liberia": "LR",
+    "Libia": "LY",
+    "Liechtenstein": "LI",
+    "Lituania": "LT",
+    "Lusenburgo": "LU",
+    "Madagascar": "MG",
+    "Malawi": "MW",
+    "Maldive": "MV",
+    "Malezia": "MY",
+    "Mali": "ML",
+    "Malta": "MT",
+    "Maroco": "MA",
+    "Martiniga": "MQ",
+    "Masedonia de’l nord": "MK",
+    "Mauritania": "MR",
+    "Melanezia": "054",
+    "Mèrega de’l nord": "003",
+    "Mèrega de’l sud": "005",
+    "Mèrega Latina": "419",
+    "Mèrega sentrale": "013",
+    "Mèrega setentrionale": "021",
+    "Mèreghe": "019",
+    "Mèsego": "MX",
+    "Micronezia": "FM",
+    "Moldavia": "MD",
+    "Mònaco": "MC",
+    "mondo": "001",
+    "Mongolia": "MN",
+    "Montenegro": "ME",
+    "Montserat": "MS",
+    "Mozanbigo": "MZ",
+    "Myanmar (Birmania)": "MM",
+    "Namibia": "NA",
+    "Nasion Unìe": "UN",
+    "Nauru": "NR",
+    "Nepal": "NP",
+    "Nicaragua": "NI",
+    "Niger": "NE",
+    "Nigeria": "NG",
+    "Niue": "NU",
+    "Norveja": "NO",
+    "Nova Caledonia": "NC",
+    "Nova Zelanda": "NZ",
+    "Oman": "OM",
+    "Ongarìa": "HU",
+    "Oseania": "009",
+    "Oseania perifèrega": "QO",
+    "Paezi Basi": "NL",
+    "Paezi Basi caraìbeghi": "BQ",
+    "Pakistan": "PK",
+    "Palàu": "PW",
+    "Pànama": "PA",
+    "Papua Nova Guinèa": "PG",
+    "Paraguài": "PY",
+    "Perù": "PE",
+    "Polinezia": "061",
+    "Polinezia franseze": "PF",
+    "Polonia": "PL",
+    "Portogalo": "PT",
+    "Portorico": "PR",
+    "Pseudo asenti": "XA",
+    "Pseudo bidi": "XB",
+    "RAS de Hong Kong": "HK",
+    "RAS de Macào": "MO",
+    "Regno Unìo": "GB",
+    "Rejon desconosùa": "ZZ",
+    "Rejon microneziana": "057",
+    "Repùblega de’l Congo": "CG",
+    "Repùblega Democràtega de’l Congo": "CD",
+    "Repùblega Domenegana": "DO",
+    "Repùblega Sentrafregana": "CF",
+    "Romania": "RO",
+    "Ruanda": "RW",
+    "Rusia": "RU",
+    "S. Bartolomèo": "BL",
+    "S. Cristofer e Nevis": "KN",
+    "S. Lusìa": "LC",
+    "S. Martin (Fransa)": "MF",
+    "S. Martin (Paezi Basi)": "SX",
+    "S. Piero e Michelon": "PM",
+    "S. Tomazo e Prìnsipe": "ST",
+    "S. Vincenso e Granadine": "VC",
+    "Sahara Osidentale": "EH",
+    "Samòa": "WS",
+    "Samòa meregane": "AS",
+    "San Marin": "SM",
+    "Sarc": "CQ",
+    "Sènegal": "SN",
+    "Serbia": "RS",
+    "Siera Leon": "SL",
+    "Sina": "CN",
+    "Singapore": "SG",
+    "Sipro": "CY",
+    "Siria": "SY",
+    "Somalia": "SO",
+    "Spagna": "ES",
+    "Sri Lanka": "LK",
+    "Stadi Unìi": "US",
+    "Sud Sudan": "SS",
+    "Sudàfrega": "ZA",
+    "Sudan": "SD",
+    "Suriname": "SR",
+    "Tailandia": "TH",
+    "Taiwan": "TW",
+    "Tajikistan": "TJ",
+    "Tanzania": "TZ",
+    "Teritori fransezi de’l sud": "TF",
+    "Teritori palestinezi": "PS",
+    "Teritorio britànego de l’Osèano Indian": "IO",
+    "Timor Est": "TL",
+    "Togo": "TG",
+    "Tokelàu": "TK",
+    "Tonga": "TO",
+    "Trinidà e Tabaco": "TT",
+    "Tristan de Cugna": "TA",
+    "Tunizìa": "TN",
+    "Turchia": "TR",
+    "Turkmenistan": "TM",
+    "Turks e Caicos": "TC",
+    "Tuvalu": "TV",
+    "Ucraina": "UA",
+    "Uganda": "UG",
+    "Union europèa": "EU",
+    "Uruguài": "UY",
+    "Uzbekistan": "UZ",
+    "Vanuatu": "VU",
+    "Vategan": "VA",
+    "Venesuela": "VE",
+    "Vietnam": "VN",
+    "Wallis e Futuna": "WF",
+    "Yemen": "YE",
+    "Zanbia": "ZM",
+    "Zinbawe": "ZW",
+    "Zlovachia": "SK",
+    "Zlovenia": "SI",
+    "Zvàlbard e Jan Mayen": "SJ",
+    "Zvesia": "SE",
+    "Zvìsara": "CH"
+}
\ No newline at end of file
diff --git a/js/data/locale/vec/ctryreverse.json b/js/data/locale/vec/ctryreverse.json
new file mode 100644
index 0000000000..7afb964327
--- /dev/null
+++ b/js/data/locale/vec/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "mondo",
+    "002": "Àfrega",
+    "003": "Mèrega de’l nord",
+    "005": "Mèrega de’l sud",
+    "009": "Oseania",
+    "011": "Àfrega osidentale",
+    "013": "Mèrega sentrale",
+    "014": "Àfrega orientale",
+    "015": "Àfrega setentrionale",
+    "017": "Àfrega sentrale",
+    "018": "Àfrega meridionale",
+    "019": "Mèreghe",
+    "021": "Mèrega setentrionale",
+    "029": "Caràibi",
+    "030": "Azia orientale",
+    "034": "Azia meridionale",
+    "035": "Azia de’l sudest",
+    "039": "Europa meridionale",
+    "053": "Australazia",
+    "054": "Melanezia",
+    "057": "Rejon microneziana",
+    "061": "Polinezia",
+    "142": "Azia",
+    "143": "Azia sentrale",
+    "145": "Azia osidentale",
+    "150": "Europa",
+    "151": "Europa orientale",
+    "154": "Europa setentrionale",
+    "155": "Europa osidentale",
+    "202": "Àfrega subsahariana",
+    "419": "Mèrega Latina",
+    "AC": "Ìzola Asension",
+    "AD": "Andora",
+    "AE": "Emirài Àrabi Unìi",
+    "AF": "Afghanistan",
+    "AG": "Antigua e Barbuda",
+    "AI": "Anguila",
+    "AL": "Albania",
+    "AM": "Armenia",
+    "AO": "Angola",
+    "AQ": "Antàrtide",
+    "AR": "Arjentina",
+    "AS": "Samòa meregane",
+    "AT": "Àustria",
+    "AU": "Australia",
+    "AW": "Aruba",
+    "AX": "Ìzole Aland",
+    "AZ": "Azerbaijan",
+    "BA": "Boznia e Erzegòvina",
+    "BB": "Barbados",
+    "BD": "Bangladesh",
+    "BE": "Beljo",
+    "BF": "Burkina Fazo",
+    "BG": "Bulgarìa",
+    "BH": "Barein",
+    "BI": "Burundi",
+    "BJ": "Benin",
+    "BL": "S. Bartolomèo",
+    "BM": "Bermuda",
+    "BN": "Brunéi",
+    "BO": "Bolivia",
+    "BQ": "Paezi Basi caraìbeghi",
+    "BR": "Brazile",
+    "BS": "Bahamas",
+    "BT": "Butan",
+    "BV": "Ìzola Buvet",
+    "BW": "Botzwana",
+    "BY": "Belorusia",
+    "BZ": "Belize",
+    "CA": "Cànada",
+    "CC": "Ìzole Cocos (Keeling)",
+    "CD": "Repùblega Democràtega de’l Congo",
+    "CF": "Repùblega Sentrafregana",
+    "CG": "Repùblega de’l Congo",
+    "CH": "Zvìsara",
+    "CI": "Costa d’Avorio",
+    "CK": "Ìzole Cook",
+    "CL": "Cile",
+    "CM": "Càmerun",
+    "CN": "Sina",
+    "CO": "Colonbia",
+    "CP": "Ìzola de Clipperton",
+    "CQ": "Sarc",
+    "CR": "Costa Rica",
+    "CU": "Cuba",
+    "CV": "Cao Verdo",
+    "CW": "Curaçao",
+    "CX": "Ìzola de Nadale",
+    "CY": "Sipro",
+    "CZ": "Cechia",
+    "DE": "Jermania",
+    "DG": "Diego Garcia",
+    "DJ": "Jibuti",
+    "DK": "Danimarca",
+    "DM": "Doménega",
+    "DO": "Repùblega Domenegana",
+    "DZ": "Aljerìa",
+    "EA": "Ceuta e Melila",
+    "EC": "Ècuador",
+    "EE": "Estonia",
+    "EG": "Ejito",
+    "EH": "Sahara Osidentale",
+    "ER": "Eritrèa",
+    "ES": "Spagna",
+    "ET": "Etiopia",
+    "EU": "Union europèa",
+    "EZ": "Eurozona",
+    "FI": "Finlanda",
+    "FJ": "Fiji",
+    "FK": "Ìzole Malvine",
+    "FM": "Micronezia",
+    "FO": "Ìzole Fàroe",
+    "FR": "Fransa",
+    "GA": "Gabon",
+    "GB": "Regno Unìo",
+    "GD": "Granada",
+    "GE": "Jeorja",
+    "GF": "Guyana franseze",
+    "GG": "Guernsey",
+    "GH": "Gana",
+    "GI": "Gibiltera",
+    "GL": "Groenlanda",
+    "GM": "Ganbia",
+    "GN": "Guinèa",
+    "GP": "Guadalupa",
+    "GQ": "Guinèa Ecuatoriale",
+    "GR": "Grecia",
+    "GS": "Georgia de’l sud e Sandwich de’l sud",
+    "GT": "Guatemala",
+    "GU": "Guam",
+    "GW": "Guinèa Bisào",
+    "GY": "Guyana",
+    "HK": "RAS de Hong Kong",
+    "HM": "Ìzole Heard e McDonald",
+    "HN": "Honduras",
+    "HR": "Croasia",
+    "HT": "Haiti",
+    "HU": "Ongarìa",
+    "IC": "Ìzole Canarie",
+    "ID": "Indonezia",
+    "IE": "Irlanda",
+    "IL": "Izraele",
+    "IM": "Ìzola de Man",
+    "IN": "India",
+    "IO": "Teritorio britànego de l’Osèano Indian",
+    "IQ": "Irac",
+    "IR": "Iran",
+    "IS": "Izlanda",
+    "IT": "Italia",
+    "JE": "Jersey",
+    "JM": "Jamàega",
+    "JO": "Jordania",
+    "JP": "Japon",
+    "KE": "Kenya",
+    "KG": "Kirghizistan",
+    "KH": "Canboja",
+    "KI": "Kiribati",
+    "KM": "Ìzole Comore",
+    "KN": "S. Cristofer e Nevis",
+    "KP": "Corèa de’l nord",
+    "KR": "Corèa de’l sud",
+    "KW": "Kuwait",
+    "KY": "Ìzole Caiman",
+    "KZ": "Kazakistan",
+    "LA": "Laos",
+    "LB": "Lìbano",
+    "LC": "S. Lusìa",
+    "LI": "Liechtenstein",
+    "LK": "Sri Lanka",
+    "LR": "Liberia",
+    "LS": "Lezoto",
+    "LT": "Lituania",
+    "LU": "Lusenburgo",
+    "LV": "Letonia",
+    "LY": "Libia",
+    "MA": "Maroco",
+    "MC": "Mònaco",
+    "MD": "Moldavia",
+    "ME": "Montenegro",
+    "MF": "S. Martin (Fransa)",
+    "MG": "Madagascar",
+    "MH": "Ìzole Marshall",
+    "MK": "Masedonia de’l nord",
+    "ML": "Mali",
+    "MM": "Myanmar (Birmania)",
+    "MN": "Mongolia",
+    "MO": "RAS de Macào",
+    "MP": "Ìzole Mariane setentrionali",
+    "MQ": "Martiniga",
+    "MR": "Mauritania",
+    "MS": "Montserat",
+    "MT": "Malta",
+    "MU": "Ìzole Maurisio",
+    "MV": "Maldive",
+    "MW": "Malawi",
+    "MX": "Mèsego",
+    "MY": "Malezia",
+    "MZ": "Mozanbigo",
+    "NA": "Namibia",
+    "NC": "Nova Caledonia",
+    "NE": "Niger",
+    "NF": "Ìzola Norfolk",
+    "NG": "Nigeria",
+    "NI": "Nicaragua",
+    "NL": "Paezi Basi",
+    "NO": "Norveja",
+    "NP": "Nepal",
+    "NR": "Nauru",
+    "NU": "Niue",
+    "NZ": "Nova Zelanda",
+    "OM": "Oman",
+    "PA": "Pànama",
+    "PE": "Perù",
+    "PF": "Polinezia franseze",
+    "PG": "Papua Nova Guinèa",
+    "PH": "Filipine",
+    "PK": "Pakistan",
+    "PL": "Polonia",
+    "PM": "S. Piero e Michelon",
+    "PN": "Ìzole Pitcairn",
+    "PR": "Portorico",
+    "PS": "Teritori palestinezi",
+    "PT": "Portogalo",
+    "PW": "Palàu",
+    "PY": "Paraguài",
+    "QA": "Catar",
+    "QO": "Oseania perifèrega",
+    "RE": "Ìzola Reunion",
+    "RO": "Romania",
+    "RS": "Serbia",
+    "RU": "Rusia",
+    "RW": "Ruanda",
+    "SA": "Arabia Saudìa",
+    "SB": "Ìzole Salomon",
+    "SC": "Ìzole Seisel",
+    "SD": "Sudan",
+    "SE": "Zvesia",
+    "SG": "Singapore",
+    "SH": "Ìzola S. Èlena",
+    "SI": "Zlovenia",
+    "SJ": "Zvàlbard e Jan Mayen",
+    "SK": "Zlovachia",
+    "SL": "Siera Leon",
+    "SM": "San Marin",
+    "SN": "Sènegal",
+    "SO": "Somalia",
+    "SR": "Suriname",
+    "SS": "Sud Sudan",
+    "ST": "S. Tomazo e Prìnsipe",
+    "SV": "El Salvador",
+    "SX": "S. Martin (Paezi Basi)",
+    "SY": "Siria",
+    "SZ": "Esuatini",
+    "TA": "Tristan de Cugna",
+    "TC": "Turks e Caicos",
+    "TD": "Ciad",
+    "TF": "Teritori fransezi de’l sud",
+    "TG": "Togo",
+    "TH": "Tailandia",
+    "TJ": "Tajikistan",
+    "TK": "Tokelàu",
+    "TL": "Timor Est",
+    "TM": "Turkmenistan",
+    "TN": "Tunizìa",
+    "TO": "Tonga",
+    "TR": "Turchia",
+    "TT": "Trinidà e Tabaco",
+    "TV": "Tuvalu",
+    "TW": "Taiwan",
+    "TZ": "Tanzania",
+    "UA": "Ucraina",
+    "UG": "Uganda",
+    "UM": "Ìzołe perifèreghe meregane",
+    "UN": "Nasion Unìe",
+    "US": "Stadi Unìi",
+    "UY": "Uruguài",
+    "UZ": "Uzbekistan",
+    "VA": "Vategan",
+    "VC": "S. Vincenso e Granadine",
+    "VE": "Venesuela",
+    "VG": "Ìzole Vèrjini britàneghe",
+    "VI": "Ìzole Vèrjini meregane",
+    "VN": "Vietnam",
+    "VU": "Vanuatu",
+    "WF": "Wallis e Futuna",
+    "WS": "Samòa",
+    "XA": "Pseudo asenti",
+    "XB": "Pseudo bidi",
+    "XK": "Kòsovo",
+    "YE": "Yemen",
+    "YT": "Ìzole Maiote",
+    "ZA": "Sudàfrega",
+    "ZM": "Zanbia",
+    "ZW": "Zinbawe",
+    "ZZ": "Rejon desconosùa"
+}
\ No newline at end of file
diff --git a/js/data/locale/vec/dateformats.json b/js/data/locale/vec/dateformats.json
index 97a8977cbb..6d54ca8c32 100644
--- a/js/data/locale/vec/dateformats.json
+++ b/js/data/locale/vec/dateformats.json
@@ -8,34 +8,27 @@
                 "s": "dd"
             },
             "dm": {
-                "f": "MMMM d",
-                "l": "MMMM d",
-                "m": "MMM d",
-                "s": "MM-dd"
+                "l": "d MMMM",
+                "m": "d MMM",
+                "s": "dd/MM"
             },
             "dmw": {
-                "f": "MMMM d, EEEE",
-                "l": "MMMM d, EEE",
-                "m": "MMM d, EE",
-                "s": "MM-dd, E"
+                "l": "EEE d MMMM",
+                "m": "EE d MMM",
+                "s": "E dd/MM"
             },
             "dmwy": {
-                "f": "yyyy MMMM d, EEEE",
-                "l": "yyyy MMMM d, EEE",
-                "m": "yyyy MMM d, EE",
-                "s": "yyyy-MM-dd, E"
+                "l": "EEE d MMMM yyyy",
+                "m": "EE d MMM yyyy",
+                "s": "E dd/MM/yy"
             },
             "dmy": {
-                "f": "yyyy MMMM d",
-                "l": "yyyy MMMM d",
-                "m": "yyyy MMM d",
-                "s": "yyyy-MM-dd"
+                "l": "d MMMM yyyy",
+                "m": "d MMM yyyy",
+                "s": "dd/MM/yy"
             },
             "dw": {
-                "f": "d, EEEE",
-                "l": "d, EEE",
-                "m": "d, EE",
-                "s": "dd, E"
+                "s": "E dd"
             },
             "m": {
                 "l": "MMMM",
@@ -43,63 +36,54 @@
                 "s": "MM"
             },
             "my": {
-                "f": "yyyy MMMM",
-                "l": "yyyy MMMM",
-                "m": "yyyy MMM",
-                "s": "yyyy-MM"
-            },
-            "y": {
-                "s": "yyyy"
+                "l": "MMMM yyyy",
+                "m": "MMM yyyy",
+                "s": "MM/yy"
             }
         },
+        "order": "{date}, {time}",
         "range": {
             "c00": {
-                "f": "{sy} {sm} {sd} {st} – {et}",
-                "l": "{sy} {sm} {sd} {st} – {et}",
-                "m": "{sy} {sm} {sd} {st} – {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {et}"
+                "f": "{sd} {sm} {sy}, {st} – {et}",
+                "l": "{sd} {sm} {sy}, {st} – {et}",
+                "m": "{sd} {sm} {sy}, {st} – {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {et}"
             },
             "c01": {
-                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+                "f": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "l": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c02": {
-                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+                "f": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "l": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c03": {
-                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+                "f": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "l": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c10": {
-                "f": "{sy} {sm} {sd} – {ed}",
-                "l": "{sy} {sm} {sd} – {ed}",
-                "m": "{sy} {sm} {sd} – {ed}",
-                "s": "{sy}-{sm}-{sd} – {ed}"
+                "f": "{sd} – {ed} {em} {ey}",
+                "l": "{sd} – {ed} {em} {ey}",
+                "m": "{sd} – {ed} {em} {ey}",
+                "s": "{sd} – {ed}/{em}/{ey}"
             },
             "c11": {
-                "f": "{sy} {sm} {sd} – {em} {ed}",
-                "l": "{sy} {sm} {sd} – {em} {ed}",
-                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+                "f": "{sd} {sm} – {ed} {em} {ey}",
+                "l": "{sd} {sm} – {ed} {em} {ey}",
+                "m": "{sd} {sm} – {ed} {em} {ey}",
+                "s": "{sd}/{sm} – {ed}/{em}/{ey}"
             },
             "c12": {
-                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+                "m": "{sd} {sm} {sy} – {ed} {em} {ey}"
             },
             "c20": {
-                "f": "{sy} {sm} – {ey} {em}",
-                "l": "{sy} {sm} – {ey} {em}",
-                "m": "{sy} {sm} – {ey} {em}",
-                "s": "{sy}-{sm} – {ey}-{em}"
+                "m": "{sm} {sy} – {em} {ey}"
             },
             "c30": {
                 "f": "{sy} – {ey}",
diff --git a/js/data/locale/vec/list.json b/js/data/locale/vec/list.json
new file mode 100644
index 0000000000..6e99ca7b0a
--- /dev/null
+++ b/js/data/locale/vec/list.json
@@ -0,0 +1,57 @@
+{
+    "or": {
+        "full": {
+            "2": "{0} o {1}",
+            "end": "{0}, o {1}"
+        },
+        "long": {
+            "2": "{0} o {1}",
+            "end": "{0}, o {1}"
+        },
+        "medium": {
+            "2": "{0} o {1}",
+            "end": "{0}, o {1}"
+        },
+        "short": {
+            "2": "{0} o {1}",
+            "end": "{0}, o {1}"
+        }
+    },
+    "standard": {
+        "full": {
+            "2": "{0} e {1}",
+            "end": "{0} e {1}"
+        },
+        "long": {
+            "2": "{0} e {1}",
+            "end": "{0} e {1}"
+        },
+        "medium": {
+            "2": "{0} e {1}",
+            "end": "{0} e {1}"
+        },
+        "short": {
+            "2": "{0} e {1}"
+        }
+    },
+    "unit": {
+        "full": {
+            "2": "{0} e {1}",
+            "end": "{0} e {1}"
+        },
+        "long": {
+            "2": "{0} e {1}",
+            "end": "{0} e {1}"
+        },
+        "medium": {
+            "2": "{0} e {1}",
+            "end": "{0} e {1}"
+        },
+        "short": {
+            "2": "{0} {1}",
+            "end": "{0} {1}",
+            "middle": "{0} {1}",
+            "start": "{0} {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/vec/numfmt.jf b/js/data/locale/vec/numfmt.jf
new file mode 100644
index 0000000000..9c197ae683
--- /dev/null
+++ b/js/data/locale/vec/numfmt.jf
@@ -0,0 +1,11 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "common": "{n} {s}",
+            "commonNegative": "-{n} {s}"
+        },
+        "decimalChar": ",",
+        "groupChar": " "
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/vec/sysres.json b/js/data/locale/vec/sysres.json
index 03ebba6582..b7bed1c0c0 100644
--- a/js/data/locale/vec/sysres.json
+++ b/js/data/locale/vec/sysres.json
@@ -65,66 +65,83 @@
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 year|#in {num} years": "#+{num} y",
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "EE0": "Sun",
-    "EE1": "Mon",
-    "EE2": "Tue",
-    "EE3": "Wed",
-    "EE4": "Thu",
-    "EE5": "Fri",
-    "EE6": "Sat",
-    "EEEE0": "Sun",
-    "EEEE1": "Mon",
-    "EEEE2": "Tue",
-    "EEEE3": "Wed",
-    "EEEE4": "Thu",
-    "EEEE5": "Fri",
-    "EEEE6": "Sat",
-    "MMM1": "M01",
-    "MMM10": "M10",
-    "MMM11": "M11",
-    "MMM12": "M12",
-    "MMM2": "M02",
-    "MMM3": "M03",
-    "MMM4": "M04",
-    "MMM5": "M05",
-    "MMM6": "M06",
-    "MMM7": "M07",
-    "MMM8": "M08",
-    "MMM9": "M09",
-    "MMMM1": "M01",
-    "MMMM10": "M10",
-    "MMMM11": "M11",
-    "MMMM12": "M12",
-    "MMMM2": "M02",
-    "MMMM3": "M03",
-    "MMMM4": "M04",
-    "MMMM5": "M05",
-    "MMMM6": "M06",
-    "MMMM7": "M07",
-    "MMMM8": "M08",
-    "MMMM9": "M09",
-    "N1": "M",
-    "N10": "M",
-    "N11": "M",
-    "N12": "M",
-    "N2": "M",
-    "N4": "M",
-    "N6": "M",
-    "N7": "M",
-    "N8": "M",
-    "N9": "M",
-    "NN1": "M0",
-    "NN10": "M1",
-    "NN11": "M1",
-    "NN12": "M1",
-    "NN2": "M0",
-    "NN3": "M0",
-    "NN4": "M0",
-    "NN5": "M0",
-    "NN6": "M0",
-    "NN7": "M0",
-    "NN8": "M0",
-    "NN9": "M0",
+    "E0": "D",
+    "E1": "L",
+    "E2": "M",
+    "E3": "M",
+    "E4": "Z",
+    "E5": "V",
+    "EE0": "dom",
+    "EE1": "lun",
+    "EE2": "mar",
+    "EE3": "mer",
+    "EE4": "zob",
+    "EE5": "vèn",
+    "EE6": "sab",
+    "EEE0": "dom",
+    "EEE1": "lun",
+    "EEE2": "mar",
+    "EEE3": "mer",
+    "EEE4": "zob",
+    "EEE5": "vèn",
+    "EEE6": "sab",
+    "EEEE0": "doménega",
+    "EEEE1": "luni",
+    "EEEE2": "marti",
+    "EEEE3": "mèrcore",
+    "EEEE4": "zoba",
+    "EEEE5": "vènare",
+    "EEEE6": "sabo",
+    "G-1": "v.e.c.",
+    "G1": "e.c.",
+    "MMM1": "jen",
+    "MMM10": "oto",
+    "MMM11": "nov",
+    "MMM12": "des",
+    "MMM2": "feb",
+    "MMM3": "mar",
+    "MMM4": "apr",
+    "MMM5": "maj",
+    "MMM6": "jug",
+    "MMM7": "luj",
+    "MMM8": "ago",
+    "MMM9": "set",
+    "MMMM1": "jenaro",
+    "MMMM10": "otobre",
+    "MMMM11": "novenbre",
+    "MMMM12": "desenbre",
+    "MMMM2": "febraro",
+    "MMMM3": "marso",
+    "MMMM4": "aprile",
+    "MMMM5": "majo",
+    "MMMM6": "jugno",
+    "MMMM7": "lujo",
+    "MMMM8": "agosto",
+    "MMMM9": "setenbre",
+    "N1": "j",
+    "N10": "o",
+    "N11": "n",
+    "N12": "d",
+    "N2": "f",
+    "N3": "m",
+    "N4": "a",
+    "N5": "m",
+    "N6": "j",
+    "N7": "l",
+    "N8": "a",
+    "N9": "s",
+    "NN1": "je",
+    "NN10": "ot",
+    "NN11": "no",
+    "NN12": "de",
+    "NN2": "fe",
+    "NN3": "ma",
+    "NN4": "ap",
+    "NN5": "ma",
+    "NN6": "ju",
+    "NN7": "lu",
+    "NN8": "ag",
+    "NN9": "se",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
     "durationMediumMillis": "#{num} ms",
@@ -133,10 +150,9 @@
     "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "#{num} min",
     "durationShortMonths": "#{num} m",
-    "finalSeparatorFull": ", ",
-    "finalSeparatorLong": ", ",
-    "finalSeparatorMedium": ", ",
-    "finalSeparatorShort": ", ",
-    "separatorMedium": ", ",
-    "separatorShort": ", "
+    "finalSeparatorFull": " e ",
+    "finalSeparatorLong": " e ",
+    "finalSeparatorMedium": " e ",
+    "finalSeparatorShort": " ",
+    "separatorMedium": ", "
 }
\ No newline at end of file
diff --git a/js/data/locale/vec/unitfmt.json b/js/data/locale/vec/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/vec/unitfmt.json
+++ b/js/data/locale/vec/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/vi/dateformats.json b/js/data/locale/vi/dateformats.json
index c459200e82..e01d0831d4 100644
--- a/js/data/locale/vi/dateformats.json
+++ b/js/data/locale/vi/dateformats.json
@@ -37,56 +37,49 @@
                 "f": "d",
                 "l": "d",
                 "m": "d",
-                "s": "dd"
+                "s": "d"
             },
             "dm": {
                 "l": "d MMMM",
-                "m": "d MMM",
-                "s": "dd/MM"
+                "m": "d MMM"
             },
             "dmw": {
                 "f": "EEEE, d MMMM",
                 "l": "EEE, d MMMM",
                 "m": "EE, d MMM",
-                "s": "E, dd/MM"
+                "s": "E, d/M"
             },
             "dmwy": {
                 "f": "EEEE, d MMMM, yyyy",
                 "l": "EEE, d MMMM, yyyy",
                 "m": "EE, d MMM, yyyy",
-                "s": "E, dd/MM/yyyy"
+                "s": "E, d/M/yy"
             },
             "dmy": {
                 "f": "d MMMM, yyyy",
                 "l": "d MMMM, yyyy",
-                "m": "d MMM, yyyy",
-                "s": "dd/MM/yyyy"
+                "m": "d MMM, yyyy"
             },
             "dw": {
                 "f": "EEEE, d",
                 "l": "EEE, d",
                 "m": "EE, d",
-                "s": "E, dd"
+                "s": "E, d"
             },
             "l": {
                 "f": "LLLL",
                 "l": "LLLL",
                 "m": "LLL",
-                "s": "LL"
+                "s": "L"
             },
             "m": {
                 "l": "MMMM",
-                "m": "MMM",
-                "s": "MM"
+                "m": "MMM"
             },
             "my": {
                 "f": "MMMM, yyyy",
                 "l": "MMMM, yyyy",
-                "m": "MMM, yyyy",
-                "s": "MM/yyyy"
-            },
-            "y": {
-                "s": "yyyy"
+                "m": "MMM, yyyy"
             }
         },
         "order": {
diff --git a/js/data/locale/vi/sysres.json b/js/data/locale/vi/sysres.json
index 595830b491..35c9ad3222 100644
--- a/js/data/locale/vi/sysres.json
+++ b/js/data/locale/vi/sysres.json
@@ -68,7 +68,7 @@
     "B0": "nửa đêm",
     "B1": "SA",
     "B2": "sáng",
-    "B3": "TR",
+    "B3": "trưa",
     "B4": "chiều",
     "B5": "CH",
     "B6": "tối",
@@ -102,7 +102,7 @@
     "EEEE5": "Thứ Sáu",
     "EEEE6": "Thứ Bảy",
     "G-1": "TCN",
-    "G1": "CN",
+    "G1": "SCN",
     "L1": "T1",
     "L10": "T10",
     "L11": "T11",
@@ -127,18 +127,18 @@
     "LL7": "Th7",
     "LL8": "Th8",
     "LL9": "Th9",
-    "LLL1": "Thg 1",
-    "LLL10": "Thg 10",
-    "LLL11": "Thg 11",
-    "LLL12": "Thg 12",
-    "LLL2": "Thg 2",
-    "LLL3": "Thg 3",
-    "LLL4": "Thg 4",
-    "LLL5": "Thg 5",
-    "LLL6": "Thg 6",
-    "LLL7": "Thg 7",
-    "LLL8": "Thg 8",
-    "LLL9": "Thg 9",
+    "LLL1": "Tháng 1",
+    "LLL10": "Tháng 10",
+    "LLL11": "Tháng 11",
+    "LLL12": "Tháng 12",
+    "LLL2": "Tháng 2",
+    "LLL3": "Tháng 3",
+    "LLL4": "Tháng 4",
+    "LLL5": "Tháng 5",
+    "LLL6": "Tháng 6",
+    "LLL7": "Tháng 7",
+    "LLL8": "Tháng 8",
+    "LLL9": "Tháng 9",
     "LLLL1": "Tháng 1",
     "LLLL10": "Tháng 10",
     "LLLL11": "Tháng 11",
diff --git a/js/data/locale/vi/unitfmt.json b/js/data/locale/vi/unitfmt.json
index 82ed2e716f..514777fe5b 100644
--- a/js/data/locale/vi/unitfmt.json
+++ b/js/data/locale/vi/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} átmốtphe",
             "bar": "#{n} bar",
             "barrel": "#{n} thùng",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/giây",
             "british-thermal-unit": "#{n} đơn vị nhiệt Anh",
@@ -40,12 +41,12 @@
             "deciliter": "#{n} đềxilít",
             "decimeter": "#{n} đềximét",
             "degree": "#{n} độ",
-            "dessert-spoon": "#{n} thìa ăn tráng miệng",
-            "dessert-spoon-imperial": "#{n} thìa ăn tráng miệng Anh",
+            "dessert-spoon": "#{n} thìa tráng miệng",
+            "dessert-spoon-imperial": "#{n} thìa tráng miệng Anh",
             "dot": "#{n} chấm",
             "dot-per-centimeter": "#{n} chấm/xentimét",
             "dot-per-inch": "#{n} chấm/inch",
-            "dram": "#{n} dram chất lỏng Anh",
+            "dram": "#{n} dram",
             "drop": "#{n} giọt",
             "dunam": "#{n} dunam",
             "earth-mass": "#{n} trọng lượng trái đất",
@@ -53,17 +54,17 @@
             "electronvolt": "#{n} electronvôn",
             "em": "#{n} em",
             "fahrenheit": "#{n} độ F",
-            "fathom": "#{n} fth",
+            "fathom": "#{n} sải",
             "fluid-ounce": "#{n} aoxơ chất lỏng",
             "fluid-ounce-imperial": "#{n} Aoxơ chất lỏng theo hệ đo lường Anh",
             "foodcalorie": "#{n} Calo",
             "foot": "#{n} feet",
             "foot-per-second": "#{n} feet/giây",
-            "furlong": "#{n} fur",
+            "furlong": "#{n} fulông",
             "g-force": "#{n} lực g",
             "gallon": "#{n} gallon",
             "gallon-imperial": "#{n} gallon Anh",
-            "generic": "#{n}°",
+            "generic": "#{n} độ",
             "gigabit": "#{n} gigabit",
             "gigabit-per-second": "#{n} gigabit/giây",
             "gigabyte": "#{n} gigabyte",
@@ -91,7 +92,7 @@
             "kilobyte": "#{n} kilobyte",
             "kilobyte-per-hour": "#{n} kilobyte/giờ",
             "kilobyte-per-second": "#{n} kilobyte/giây",
-            "kilocalorie": "#{n} kilô calo",
+            "kilocalorie": "#{n} kilôcalo",
             "kilogram": "#{n} kilôgam",
             "kilohertz": "#{n} kHz",
             "kilojoule": "#{n} kilô jun",
@@ -117,12 +118,12 @@
             "megabyte-per-second": "#{n} megabyte/giây",
             "megahertz": "#{n} MHz",
             "megaliter": "#{n} megalít",
-            "megapascal": "#{n} MPa",
+            "megapascal": "#{n} mêga pascal",
             "megapixel": "#{n} megapixel",
             "megawatt": "#{n} Megaoát",
             "meter": "#{n} mét",
             "meter-per-second": "#{n} mét/giây",
-            "meter-per-square-second": "#{n} m/s²",
+            "meter-per-square-second": "#{n} mét/giây bình phương",
             "microgram": "#{n} micrôgam",
             "micrometer": "#{n} micrômét",
             "microsecond": "#{n} micrô giây",
@@ -159,7 +160,7 @@
             "permille": "#{n}‰",
             "permillion": "#{n} ppm",
             "permyriad": "#{n} phần vạn",
-            "petabyte": "#{n} PB",
+            "petabyte": "#{n} petabyte",
             "picometer": "#{n} picômét",
             "pinch": "#{n} nhúm",
             "pint": "#{n} panh",
@@ -167,7 +168,7 @@
             "pixel": "#{n} pixel",
             "pixel-per-centimeter": "#{n} pixel/xentimét",
             "pixel-per-inch": "#{n} pixel/inch",
-            "point": "#{n} đ",
+            "point": "#{n} điểm",
             "pound": "#{n} pao",
             "pound-force": "#{n} pound lực",
             "pound-force-foot": "#{n} pound-feet",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} thùng",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/giây",
             "british-thermal-unit": "#{n} Btu",
@@ -246,8 +248,8 @@
             "deciliter": "#{n} dL",
             "decimeter": "#{n} dm",
             "degree": "#{n}°",
-            "dessert-spoon": "#{n} thìa tm",
-            "dessert-spoon-imperial": "#{n} thìa tm Anh",
+            "dessert-spoon": "#{n} thìa tráng miệng",
+            "dessert-spoon-imperial": "#{n} thìa tráng miệng Anh",
             "dot": "#{n} chấm",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
@@ -262,7 +264,7 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Anh",
-            "foodcalorie": "#{n} kcal",
+            "foodcalorie": "#{n} Cal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/giây",
             "furlong": "#{n} fur",
@@ -303,7 +305,7 @@
             "kilojoule": "#{n} kJ",
             "kilometer": "#{n} km",
             "kilometer-per-hour": "#{n} km/h",
-            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-liter": "#{n} km/L",
             "kilometer-per-second": "#{n} km/giây",
             "kilopascal": "#{n} kPa",
             "kilowatt": "#{n} kW",
@@ -331,11 +333,11 @@
             "meter-per-square-second": "#{n} m/s²",
             "microgram": "#{n} μg",
             "micrometer": "#{n} μm",
-            "microsecond": "#{n} μs",
+            "microsecond": "#{n} micrô giây",
             "mile": "#{n} dặm",
             "mile-per-gallon": "#{n} mpg",
             "mile-per-gallon-imperial": "#{n} mpg Imp.",
-            "mile-per-hour": "#{n} mi/h",
+            "mile-per-hour": "#{n} mph",
             "mile-per-second": "#{n} dặm/giây",
             "mile-scandinavian": "#{n} smi",
             "milliampere": "#{n} mA",
@@ -370,9 +372,9 @@
             "pinch": "#{n} nhúm",
             "pint": "#{n} pt",
             "pint-metric": "#{n} mpt",
-            "pixel": "#{n} px",
-            "pixel-per-centimeter": "#{n} ppcm",
-            "pixel-per-inch": "#{n} ppi",
+            "pixel": "#{n} pixel",
+            "pixel-per-centimeter": "#{n} pixel/cm",
+            "pixel-per-inch": "#{n} pixel/inch",
             "point": "#{n} đ",
             "pound": "#{n} lb",
             "pound-force": "#{n} lbf",
@@ -380,7 +382,7 @@
             "pound-force-per-square-inch": "#{n} psi",
             "quart": "#{n} qt",
             "quart-imperial": "#{n} lít Anh",
-            "quarter": "#{n} qúy",
+            "quarter": "#{n} quý",
             "radian": "#{n} rad",
             "revolution": "#{n} vòng",
             "second": "#{n} giây",
@@ -396,8 +398,8 @@
             "square-mile": "#{n} mi²",
             "square-yard": "#{n} yd²",
             "stone": "#{n} st",
-            "tablespoon": "#{n} thìa xúp",
-            "teaspoon": "#{n} thìa cà phê",
+            "tablespoon": "#{n} muỗng canh",
+            "teaspoon": "#{n} muỗng cà phê",
             "terabit": "#{n} Tb",
             "terabit-per-second": "#{n} Tb/giây",
             "terabyte": "#{n} TB",
diff --git a/js/data/locale/vmw/ctrynames.json b/js/data/locale/vmw/ctrynames.json
new file mode 100644
index 0000000000..d86e36fcf4
--- /dev/null
+++ b/js/data/locale/vmw/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "Afghanistan": "AF",
+    "Africa": "002",
+    "Åland Islands": "AX",
+    "Albania": "AL",
+    "Algeria": "DZ",
+    "American Samoa": "AS",
+    "Americas": "019",
+    "Andorra": "AD",
+    "Angola": "AO",
+    "Anguilla": "AI",
+    "Antarctica": "AQ",
+    "Antigua & Barbuda": "AG",
+    "Argentina": "AR",
+    "Armenia": "AM",
+    "Aruba": "AW",
+    "Ascension Island": "AC",
+    "Asia": "142",
+    "Australasia": "053",
+    "Australia": "AU",
+    "Austria": "AT",
+    "Azerbaijan": "AZ",
+    "Bahamas": "BS",
+    "Bahrain": "BH",
+    "Bangladesh": "BD",
+    "Barbados": "BB",
+    "Belarus": "BY",
+    "Belgium": "BE",
+    "Belize": "BZ",
+    "Benin": "BJ",
+    "Bermuda": "BM",
+    "Bhutan": "BT",
+    "Bolivia": "BO",
+    "Bosnia & Herzegovina": "BA",
+    "Botswana": "BW",
+    "Bouvet Island": "BV",
+    "Brazil": "BR",
+    "British Indian Ocean Territory": "IO",
+    "British Virgin Islands": "VG",
+    "Brunei": "BN",
+    "Bulgaria": "BG",
+    "Burkina Faso": "BF",
+    "Burundi": "BI",
+    "Cambodia": "KH",
+    "Cameroon": "CM",
+    "Canada": "CA",
+    "Canary Islands": "IC",
+    "Cape Verde": "CV",
+    "Caribbean": "029",
+    "Caribbean Netherlands": "BQ",
+    "Cayman Islands": "KY",
+    "Central African Republic": "CF",
+    "Central America": "013",
+    "Central Asia": "143",
+    "Ceuta & Melilla": "EA",
+    "Chad": "TD",
+    "Chile": "CL",
+    "China": "CN",
+    "Christmas Island": "CX",
+    "Clipperton Island": "CP",
+    "Cocos (Keeling) Islands": "CC",
+    "Colombia": "CO",
+    "Comoros": "KM",
+    "Congo - Brazzaville": "CG",
+    "Congo - Kinshasa": "CD",
+    "Cook Islands": "CK",
+    "Costa Rica": "CR",
+    "Côte d’Ivoire": "CI",
+    "Croatia": "HR",
+    "Cuba": "CU",
+    "Curaçao": "CW",
+    "Cyprus": "CY",
+    "Czechia": "CZ",
+    "Denmark": "DK",
+    "Diego Garcia": "DG",
+    "Djibouti": "DJ",
+    "Dominica": "DM",
+    "Dominican Republic": "DO",
+    "Eastern Africa": "014",
+    "Eastern Asia": "030",
+    "Eastern Europe": "151",
+    "Ecuador": "EC",
+    "Egypt": "EG",
+    "El Salvador": "SV",
+    "Equatorial Guinea": "GQ",
+    "Eritrea": "ER",
+    "Estonia": "EE",
+    "Eswatini": "SZ",
+    "Ethiopia": "ET",
+    "Europe": "150",
+    "European Union": "EU",
+    "Eurozone": "EZ",
+    "Falkland Islands": "FK",
+    "Faroe Islands": "FO",
+    "Fiji": "FJ",
+    "Finland": "FI",
+    "France": "FR",
+    "French Guiana": "GF",
+    "French Polynesia": "PF",
+    "French Southern Territories": "TF",
+    "Gabon": "GA",
+    "Gambia": "GM",
+    "Georgia": "GE",
+    "Germany": "DE",
+    "Ghana": "GH",
+    "Gibraltar": "GI",
+    "Greece": "GR",
+    "Greenland": "GL",
+    "Grenada": "GD",
+    "Guadeloupe": "GP",
+    "Guam": "GU",
+    "Guatemala": "GT",
+    "Guernsey": "GG",
+    "Guinea": "GN",
+    "Guinea-Bissau": "GW",
+    "Guyana": "GY",
+    "Haiti": "HT",
+    "Heard & McDonald Islands": "HM",
+    "Honduras": "HN",
+    "Hong Kong SAR China": "HK",
+    "Hungary": "HU",
+    "Iceland": "IS",
+    "India": "IN",
+    "Indonesia": "ID",
+    "Iran": "IR",
+    "Iraq": "IQ",
+    "Ireland": "IE",
+    "Isle of Man": "IM",
+    "Israel": "IL",
+    "Italy": "IT",
+    "Jamaica": "JM",
+    "Japan": "JP",
+    "Jersey": "JE",
+    "Jordan": "JO",
+    "Kazakhstan": "KZ",
+    "Kenya": "KE",
+    "Kiribati": "KI",
+    "Kosovo": "XK",
+    "Kuwait": "KW",
+    "Kyrgyzstan": "KG",
+    "Laos": "LA",
+    "Latin America": "419",
+    "Latvia": "LV",
+    "Lebanon": "LB",
+    "Lesotho": "LS",
+    "Liberia": "LR",
+    "Libya": "LY",
+    "Liechtenstein": "LI",
+    "Lithuania": "LT",
+    "Luxembourg": "LU",
+    "Macao SAR China": "MO",
+    "Madagascar": "MG",
+    "Malawi": "MW",
+    "Malaysia": "MY",
+    "Maldives": "MV",
+    "Mali": "ML",
+    "Malta": "MT",
+    "Marshall Islands": "MH",
+    "Martinique": "MQ",
+    "Mauritania": "MR",
+    "Mauritius": "MU",
+    "Mayotte": "YT",
+    "Melanesia": "054",
+    "Mexico": "MX",
+    "Micronesia": "FM",
+    "Micronesian Region": "057",
+    "Middle Africa": "017",
+    "Moldova": "MD",
+    "Monaco": "MC",
+    "Mongolia": "MN",
+    "Montenegro": "ME",
+    "Montserrat": "MS",
+    "Morocco": "MA",
+    "Myanmar (Burma)": "MM",
+    "Namibia": "NA",
+    "Nauru": "NR",
+    "Nepal": "NP",
+    "Netherlands": "NL",
+    "New Caledonia": "NC",
+    "New Zealand": "NZ",
+    "Nicaragua": "NI",
+    "Niger": "NE",
+    "Nigeria": "NG",
+    "Niue": "NU",
+    "Norfolk Island": "NF",
+    "North America": "003",
+    "North Korea": "KP",
+    "North Macedonia": "MK",
+    "Northern Africa": "015",
+    "Northern America": "021",
+    "Northern Europe": "154",
+    "Northern Mariana Islands": "MP",
+    "Norway": "NO",
+    "Oceania": "009",
+    "Oman": "OM",
+    "oMosambikhi": "MZ",
+    "Outlying Oceania": "QO",
+    "Pakistan": "PK",
+    "Palau": "PW",
+    "Palestinian Territories": "PS",
+    "Panama": "PA",
+    "Papua New Guinea": "PG",
+    "Paraguay": "PY",
+    "Peru": "PE",
+    "Philippines": "PH",
+    "Pitcairn Islands": "PN",
+    "Poland": "PL",
+    "Polynesia": "061",
+    "Portugal": "PT",
+    "Pseudo-Accents": "XA",
+    "Pseudo-Bidi": "XB",
+    "Puerto Rico": "PR",
+    "Qatar": "QA",
+    "Réunion": "RE",
+    "Romania": "RO",
+    "Russia": "RU",
+    "Rwanda": "RW",
+    "Samoa": "WS",
+    "San Marino": "SM",
+    "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
+    "Saudi Arabia": "SA",
+    "Senegal": "SN",
+    "Serbia": "RS",
+    "Seychelles": "SC",
+    "Sierra Leone": "SL",
+    "Singapore": "SG",
+    "Sint Maarten": "SX",
+    "Slovakia": "SK",
+    "Slovenia": "SI",
+    "Solomon Islands": "SB",
+    "Somalia": "SO",
+    "South Africa": "ZA",
+    "South America": "005",
+    "South Georgia & South Sandwich Islands": "GS",
+    "South Korea": "KR",
+    "South Sudan": "SS",
+    "Southeast Asia": "035",
+    "Southern Africa": "018",
+    "Southern Asia": "034",
+    "Southern Europe": "039",
+    "Spain": "ES",
+    "Sri Lanka": "LK",
+    "St. Barthélemy": "BL",
+    "St. Helena": "SH",
+    "St. Kitts & Nevis": "KN",
+    "St. Lucia": "LC",
+    "St. Martin": "MF",
+    "St. Pierre & Miquelon": "PM",
+    "St. Vincent & Grenadines": "VC",
+    "Sub-Saharan Africa": "202",
+    "Sudan": "SD",
+    "Suriname": "SR",
+    "Svalbard & Jan Mayen": "SJ",
+    "Sweden": "SE",
+    "Switzerland": "CH",
+    "Syria": "SY",
+    "Taiwan": "TW",
+    "Tajikistan": "TJ",
+    "Tanzania": "TZ",
+    "Thailand": "TH",
+    "Timor-Leste": "TL",
+    "Togo": "TG",
+    "Tokelau": "TK",
+    "Tonga": "TO",
+    "Trinidad & Tobago": "TT",
+    "Tristan da Cunha": "TA",
+    "Tunisia": "TN",
+    "Türkiye": "TR",
+    "Turkmenistan": "TM",
+    "Turks & Caicos Islands": "TC",
+    "Tuvalu": "TV",
+    "U.S. Outlying Islands": "UM",
+    "U.S. Virgin Islands": "VI",
+    "Uganda": "UG",
+    "Ukraine": "UA",
+    "United Arab Emirates": "AE",
+    "United Kingdom": "GB",
+    "United Nations": "UN",
+    "United States": "US",
+    "Unknown Region": "ZZ",
+    "Uruguay": "UY",
+    "Uzbekistan": "UZ",
+    "Vanuatu": "VU",
+    "Vatican City": "VA",
+    "Venezuela": "VE",
+    "Vietnam": "VN",
+    "Wallis & Futuna": "WF",
+    "Western Africa": "011",
+    "Western Asia": "145",
+    "Western Europe": "155",
+    "Western Sahara": "EH",
+    "world": "001",
+    "Yemen": "YE",
+    "Zambia": "ZM",
+    "Zimbabwe": "ZW"
+}
\ No newline at end of file
diff --git a/js/data/locale/vmw/ctryreverse.json b/js/data/locale/vmw/ctryreverse.json
new file mode 100644
index 0000000000..99423fa93f
--- /dev/null
+++ b/js/data/locale/vmw/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "001": "world",
+    "002": "Africa",
+    "003": "North America",
+    "005": "South America",
+    "009": "Oceania",
+    "011": "Western Africa",
+    "013": "Central America",
+    "014": "Eastern Africa",
+    "015": "Northern Africa",
+    "017": "Middle Africa",
+    "018": "Southern Africa",
+    "019": "Americas",
+    "021": "Northern America",
+    "029": "Caribbean",
+    "030": "Eastern Asia",
+    "034": "Southern Asia",
+    "035": "Southeast Asia",
+    "039": "Southern Europe",
+    "053": "Australasia",
+    "054": "Melanesia",
+    "057": "Micronesian Region",
+    "061": "Polynesia",
+    "142": "Asia",
+    "143": "Central Asia",
+    "145": "Western Asia",
+    "150": "Europe",
+    "151": "Eastern Europe",
+    "154": "Northern Europe",
+    "155": "Western Europe",
+    "202": "Sub-Saharan Africa",
+    "419": "Latin America",
+    "AC": "Ascension Island",
+    "AD": "Andorra",
+    "AE": "United Arab Emirates",
+    "AF": "Afghanistan",
+    "AG": "Antigua & Barbuda",
+    "AI": "Anguilla",
+    "AL": "Albania",
+    "AM": "Armenia",
+    "AO": "Angola",
+    "AQ": "Antarctica",
+    "AR": "Argentina",
+    "AS": "American Samoa",
+    "AT": "Austria",
+    "AU": "Australia",
+    "AW": "Aruba",
+    "AX": "Åland Islands",
+    "AZ": "Azerbaijan",
+    "BA": "Bosnia & Herzegovina",
+    "BB": "Barbados",
+    "BD": "Bangladesh",
+    "BE": "Belgium",
+    "BF": "Burkina Faso",
+    "BG": "Bulgaria",
+    "BH": "Bahrain",
+    "BI": "Burundi",
+    "BJ": "Benin",
+    "BL": "St. Barthélemy",
+    "BM": "Bermuda",
+    "BN": "Brunei",
+    "BO": "Bolivia",
+    "BQ": "Caribbean Netherlands",
+    "BR": "Brazil",
+    "BS": "Bahamas",
+    "BT": "Bhutan",
+    "BV": "Bouvet Island",
+    "BW": "Botswana",
+    "BY": "Belarus",
+    "BZ": "Belize",
+    "CA": "Canada",
+    "CC": "Cocos (Keeling) Islands",
+    "CD": "Congo - Kinshasa",
+    "CF": "Central African Republic",
+    "CG": "Congo - Brazzaville",
+    "CH": "Switzerland",
+    "CI": "Côte d’Ivoire",
+    "CK": "Cook Islands",
+    "CL": "Chile",
+    "CM": "Cameroon",
+    "CN": "China",
+    "CO": "Colombia",
+    "CP": "Clipperton Island",
+    "CQ": "Sark",
+    "CR": "Costa Rica",
+    "CU": "Cuba",
+    "CV": "Cape Verde",
+    "CW": "Curaçao",
+    "CX": "Christmas Island",
+    "CY": "Cyprus",
+    "CZ": "Czechia",
+    "DE": "Germany",
+    "DG": "Diego Garcia",
+    "DJ": "Djibouti",
+    "DK": "Denmark",
+    "DM": "Dominica",
+    "DO": "Dominican Republic",
+    "DZ": "Algeria",
+    "EA": "Ceuta & Melilla",
+    "EC": "Ecuador",
+    "EE": "Estonia",
+    "EG": "Egypt",
+    "EH": "Western Sahara",
+    "ER": "Eritrea",
+    "ES": "Spain",
+    "ET": "Ethiopia",
+    "EU": "European Union",
+    "EZ": "Eurozone",
+    "FI": "Finland",
+    "FJ": "Fiji",
+    "FK": "Falkland Islands",
+    "FM": "Micronesia",
+    "FO": "Faroe Islands",
+    "FR": "France",
+    "GA": "Gabon",
+    "GB": "United Kingdom",
+    "GD": "Grenada",
+    "GE": "Georgia",
+    "GF": "French Guiana",
+    "GG": "Guernsey",
+    "GH": "Ghana",
+    "GI": "Gibraltar",
+    "GL": "Greenland",
+    "GM": "Gambia",
+    "GN": "Guinea",
+    "GP": "Guadeloupe",
+    "GQ": "Equatorial Guinea",
+    "GR": "Greece",
+    "GS": "South Georgia & South Sandwich Islands",
+    "GT": "Guatemala",
+    "GU": "Guam",
+    "GW": "Guinea-Bissau",
+    "GY": "Guyana",
+    "HK": "Hong Kong SAR China",
+    "HM": "Heard & McDonald Islands",
+    "HN": "Honduras",
+    "HR": "Croatia",
+    "HT": "Haiti",
+    "HU": "Hungary",
+    "IC": "Canary Islands",
+    "ID": "Indonesia",
+    "IE": "Ireland",
+    "IL": "Israel",
+    "IM": "Isle of Man",
+    "IN": "India",
+    "IO": "British Indian Ocean Territory",
+    "IQ": "Iraq",
+    "IR": "Iran",
+    "IS": "Iceland",
+    "IT": "Italy",
+    "JE": "Jersey",
+    "JM": "Jamaica",
+    "JO": "Jordan",
+    "JP": "Japan",
+    "KE": "Kenya",
+    "KG": "Kyrgyzstan",
+    "KH": "Cambodia",
+    "KI": "Kiribati",
+    "KM": "Comoros",
+    "KN": "St. Kitts & Nevis",
+    "KP": "North Korea",
+    "KR": "South Korea",
+    "KW": "Kuwait",
+    "KY": "Cayman Islands",
+    "KZ": "Kazakhstan",
+    "LA": "Laos",
+    "LB": "Lebanon",
+    "LC": "St. Lucia",
+    "LI": "Liechtenstein",
+    "LK": "Sri Lanka",
+    "LR": "Liberia",
+    "LS": "Lesotho",
+    "LT": "Lithuania",
+    "LU": "Luxembourg",
+    "LV": "Latvia",
+    "LY": "Libya",
+    "MA": "Morocco",
+    "MC": "Monaco",
+    "MD": "Moldova",
+    "ME": "Montenegro",
+    "MF": "St. Martin",
+    "MG": "Madagascar",
+    "MH": "Marshall Islands",
+    "MK": "North Macedonia",
+    "ML": "Mali",
+    "MM": "Myanmar (Burma)",
+    "MN": "Mongolia",
+    "MO": "Macao SAR China",
+    "MP": "Northern Mariana Islands",
+    "MQ": "Martinique",
+    "MR": "Mauritania",
+    "MS": "Montserrat",
+    "MT": "Malta",
+    "MU": "Mauritius",
+    "MV": "Maldives",
+    "MW": "Malawi",
+    "MX": "Mexico",
+    "MY": "Malaysia",
+    "MZ": "oMosambikhi",
+    "NA": "Namibia",
+    "NC": "New Caledonia",
+    "NE": "Niger",
+    "NF": "Norfolk Island",
+    "NG": "Nigeria",
+    "NI": "Nicaragua",
+    "NL": "Netherlands",
+    "NO": "Norway",
+    "NP": "Nepal",
+    "NR": "Nauru",
+    "NU": "Niue",
+    "NZ": "New Zealand",
+    "OM": "Oman",
+    "PA": "Panama",
+    "PE": "Peru",
+    "PF": "French Polynesia",
+    "PG": "Papua New Guinea",
+    "PH": "Philippines",
+    "PK": "Pakistan",
+    "PL": "Poland",
+    "PM": "St. Pierre & Miquelon",
+    "PN": "Pitcairn Islands",
+    "PR": "Puerto Rico",
+    "PS": "Palestinian Territories",
+    "PT": "Portugal",
+    "PW": "Palau",
+    "PY": "Paraguay",
+    "QA": "Qatar",
+    "QO": "Outlying Oceania",
+    "RE": "Réunion",
+    "RO": "Romania",
+    "RS": "Serbia",
+    "RU": "Russia",
+    "RW": "Rwanda",
+    "SA": "Saudi Arabia",
+    "SB": "Solomon Islands",
+    "SC": "Seychelles",
+    "SD": "Sudan",
+    "SE": "Sweden",
+    "SG": "Singapore",
+    "SH": "St. Helena",
+    "SI": "Slovenia",
+    "SJ": "Svalbard & Jan Mayen",
+    "SK": "Slovakia",
+    "SL": "Sierra Leone",
+    "SM": "San Marino",
+    "SN": "Senegal",
+    "SO": "Somalia",
+    "SR": "Suriname",
+    "SS": "South Sudan",
+    "ST": "São Tomé & Príncipe",
+    "SV": "El Salvador",
+    "SX": "Sint Maarten",
+    "SY": "Syria",
+    "SZ": "Eswatini",
+    "TA": "Tristan da Cunha",
+    "TC": "Turks & Caicos Islands",
+    "TD": "Chad",
+    "TF": "French Southern Territories",
+    "TG": "Togo",
+    "TH": "Thailand",
+    "TJ": "Tajikistan",
+    "TK": "Tokelau",
+    "TL": "Timor-Leste",
+    "TM": "Turkmenistan",
+    "TN": "Tunisia",
+    "TO": "Tonga",
+    "TR": "Türkiye",
+    "TT": "Trinidad & Tobago",
+    "TV": "Tuvalu",
+    "TW": "Taiwan",
+    "TZ": "Tanzania",
+    "UA": "Ukraine",
+    "UG": "Uganda",
+    "UM": "U.S. Outlying Islands",
+    "UN": "United Nations",
+    "US": "United States",
+    "UY": "Uruguay",
+    "UZ": "Uzbekistan",
+    "VA": "Vatican City",
+    "VC": "St. Vincent & Grenadines",
+    "VE": "Venezuela",
+    "VG": "British Virgin Islands",
+    "VI": "U.S. Virgin Islands",
+    "VN": "Vietnam",
+    "VU": "Vanuatu",
+    "WF": "Wallis & Futuna",
+    "WS": "Samoa",
+    "XA": "Pseudo-Accents",
+    "XB": "Pseudo-Bidi",
+    "XK": "Kosovo",
+    "YE": "Yemen",
+    "YT": "Mayotte",
+    "ZA": "South Africa",
+    "ZM": "Zambia",
+    "ZW": "Zimbabwe",
+    "ZZ": "Unknown Region"
+}
\ No newline at end of file
diff --git a/js/data/locale/vmw/dateformats.json b/js/data/locale/vmw/dateformats.json
new file mode 100644
index 0000000000..97a8977cbb
--- /dev/null
+++ b/js/data/locale/vmw/dateformats.json
@@ -0,0 +1,133 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/vmw/langname.jf b/js/data/locale/vmw/langname.jf
new file mode 100644
index 0000000000..a34b3d3f7d
--- /dev/null
+++ b/js/data/locale/vmw/langname.jf
@@ -0,0 +1,4 @@
+{
+    "generated": true,
+    "language.name": "Makhuwa"
+}
\ No newline at end of file
diff --git a/js/data/locale/vmw/numfmt.jf b/js/data/locale/vmw/numfmt.jf
new file mode 100644
index 0000000000..d4b6f1bbeb
--- /dev/null
+++ b/js/data/locale/vmw/numfmt.jf
@@ -0,0 +1,11 @@
+{
+    "generated": true,
+    "numfmt": {
+        "currencyFormats": {
+            "common": "{n} {s}",
+            "commonNegative": "-{n} {s}"
+        },
+        "decimalChar": ",",
+        "groupChar": "."
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/vmw/sysres.json b/js/data/locale/vmw/sysres.json
new file mode 100644
index 0000000000..de610a52ce
--- /dev/null
+++ b/js/data/locale/vmw/sysres.json
@@ -0,0 +1,153 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "EE0": "ettiminku",
+    "EE1": "nihiku noolempwa",
+    "EE2": "namaanli",
+    "EE3": "namararu",
+    "EE4": "namaxexe",
+    "EE5": "namathanu",
+    "EE6": "esaabadu",
+    "EEE0": "ettiminku",
+    "EEE1": "nihiku noolempwa",
+    "EEE2": "namaanli",
+    "EEE3": "namararu",
+    "EEE4": "namaxexe",
+    "EEE5": "namathanu",
+    "EEE6": "esaabadu",
+    "EEEE0": "ettiminku",
+    "EEEE1": "nihiku noolempwa",
+    "EEEE2": "namaanli",
+    "EEEE3": "namararu",
+    "EEEE4": "namaxexe",
+    "EEEE5": "namathanu",
+    "EEEE6": "esaabadu",
+    "MMM1": "janeiru",
+    "MMM10": "outubru",
+    "MMM11": "novembru",
+    "MMM12": "dezembru",
+    "MMM2": "fevereiru",
+    "MMM3": "marsu",
+    "MMM4": "abril",
+    "MMM5": "maiu",
+    "MMM6": "junyu",
+    "MMM7": "julyu",
+    "MMM8": "agostu",
+    "MMM9": "setembru",
+    "MMMM1": "janeiru",
+    "MMMM10": "outubru",
+    "MMMM11": "novembru",
+    "MMMM12": "dezembru",
+    "MMMM2": "fevereiru",
+    "MMMM3": "marsu",
+    "MMMM4": "abril",
+    "MMMM5": "maiu",
+    "MMMM6": "junyu",
+    "MMMM7": "julyu",
+    "MMMM8": "agostu",
+    "MMMM9": "setembru",
+    "N1": "j",
+    "N10": "o",
+    "N11": "n",
+    "N12": "d",
+    "N2": "f",
+    "N3": "m",
+    "N4": "a",
+    "N5": "m",
+    "N6": "j",
+    "N7": "j",
+    "N8": "a",
+    "N9": "s",
+    "NN1": "ja",
+    "NN10": "ou",
+    "NN11": "no",
+    "NN12": "de",
+    "NN2": "fe",
+    "NN3": "ma",
+    "NN4": "ab",
+    "NN5": "ma",
+    "NN6": "ju",
+    "NN7": "ju",
+    "NN8": "ag",
+    "NN9": "se",
+    "a0": "vaasisu",
+    "a1": "makaaripi",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": ", ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/vmw/unitfmt.json b/js/data/locale/vmw/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/vmw/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/vo/unitfmt.json b/js/data/locale/vo/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/vo/unitfmt.json
+++ b/js/data/locale/vo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/vun/ctrynames.json b/js/data/locale/vun/ctrynames.json
index f17a4fc647..2f48370426 100644
--- a/js/data/locale/vun/ctrynames.json
+++ b/js/data/locale/vun/ctrynames.json
@@ -35,6 +35,7 @@
     "Botswana": "BW",
     "Bouvet Island": "BV",
     "Brazili": "BR",
+    "British Indian Ocean Territory": "IO",
     "Brunei": "BN",
     "Bukinafaso": "BF",
     "Bukini": "MG",
@@ -62,7 +63,6 @@
     "Eastern Europe": "151",
     "Ekwado": "EC",
     "Elsavado": "SV",
-    "Eneo la Uingereza katika Bahari Hindi": "IO",
     "Eritrea": "ER",
     "Estonia": "EE",
     "Europe": "150",
diff --git a/js/data/locale/vun/ctryreverse.json b/js/data/locale/vun/ctryreverse.json
index 3919b41208..894a6816e2 100644
--- a/js/data/locale/vun/ctryreverse.json
+++ b/js/data/locale/vun/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israeli",
     "IM": "Isle of Man",
     "IN": "India",
-    "IO": "Eneo la Uingereza katika Bahari Hindi",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Uajemi",
     "IS": "Aislandi",
diff --git a/js/data/locale/vun/unitfmt.json b/js/data/locale/vun/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/vun/unitfmt.json
+++ b/js/data/locale/vun/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/wa/unitfmt.json b/js/data/locale/wa/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/wa/unitfmt.json
+++ b/js/data/locale/wa/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/wae/ctrynames.json b/js/data/locale/wae/ctrynames.json
index 28d779e1ff..ebd4e46f71 100644
--- a/js/data/locale/wae/ctrynames.json
+++ b/js/data/locale/wae/ctrynames.json
@@ -35,7 +35,7 @@
     "Botswana": "BW",
     "Bouvetinsla": "BV",
     "Brasilie": "BR",
-    "Britišes Territorium em indiše Ozean": "IO",
+    "British Indian Ocean Territory": "IO",
     "Britiši Jungfröiwinslä": "VG",
     "Brunei": "BN",
     "Bulgarie": "BG",
diff --git a/js/data/locale/wae/ctryreverse.json b/js/data/locale/wae/ctryreverse.json
index cfefec64c4..31ad5d3a00 100644
--- a/js/data/locale/wae/ctryreverse.json
+++ b/js/data/locale/wae/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israel",
     "IM": "Isle of Man",
     "IN": "Indie",
-    "IO": "Britišes Territorium em indiše Ozean",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irak",
     "IR": "Iran",
     "IS": "Island",
diff --git a/js/data/locale/wae/unitfmt.json b/js/data/locale/wae/unitfmt.json
index faefec6e2b..41e9681bd1 100644
--- a/js/data/locale/wae/unitfmt.json
+++ b/js/data/locale/wae/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/wal/unitfmt.json b/js/data/locale/wal/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/wal/unitfmt.json
+++ b/js/data/locale/wal/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/wbp/unitfmt.json b/js/data/locale/wbp/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/wbp/unitfmt.json
+++ b/js/data/locale/wbp/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/wo/ctrynames.json b/js/data/locale/wo/ctrynames.json
index 0674d67fb7..f7ec8b31f0 100644
--- a/js/data/locale/wo/ctrynames.json
+++ b/js/data/locale/wo/ctrynames.json
@@ -34,6 +34,7 @@
     "Boliwi": "BO",
     "Bosni Ersegowin": "BA",
     "Botswana": "BW",
+    "British Indian Ocean Territory": "IO",
     "Burkina Faaso": "BF",
     "Burney": "BN",
     "Burundi": "BI",
@@ -269,7 +270,6 @@
     "Taylànd": "TH",
     "Taywan": "TW",
     "Teer Ostraal gu Fraas": "TF",
-    "Terituwaaru Brëtaañ ci Oseyaa Enjeŋ": "IO",
     "Timor Leste": "TL",
     "Tinisi": "TN",
     "Tirinite ak Tobago": "TT",
diff --git a/js/data/locale/wo/ctryreverse.json b/js/data/locale/wo/ctryreverse.json
index 0dd2e6dca0..071e98572c 100644
--- a/js/data/locale/wo/ctryreverse.json
+++ b/js/data/locale/wo/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Israyel",
     "IM": "Dunu Maan",
     "IN": "End",
-    "IO": "Terituwaaru Brëtaañ ci Oseyaa Enjeŋ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Irag",
     "IR": "Iraŋ",
     "IS": "Islànd",
diff --git a/js/data/locale/wo/unitfmt.json b/js/data/locale/wo/unitfmt.json
index db7f7f31e8..b6d628662d 100644
--- a/js/data/locale/wo/unitfmt.json
+++ b/js/data/locale/wo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#Bft {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -51,12 +52,12 @@
             "em": "#{n} em",
             "fahrenheit": "#{n}°F",
             "fathom": "#{n} fth",
-            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
             "furlong": "#{n} fur",
-            "g-force": "#{n} G",
+            "g-force": "#{n} g-force",
             "gallon": "#{n} gal US",
             "gallon-imperial": "#{n} gal Imp.",
             "generic": "#{n}°",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -253,7 +255,7 @@
             "em": "#{n} em",
             "fahrenheit": "#{n}°F",
             "fathom": "#{n} fth",
-            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/s",
diff --git a/js/data/locale/xh/list.json b/js/data/locale/xh/list.json
new file mode 100644
index 0000000000..7a6e9b926b
--- /dev/null
+++ b/js/data/locale/xh/list.json
@@ -0,0 +1,8 @@
+{
+    "or": {
+        "short": {
+            "2": "{0} okanye {1}",
+            "end": "{0}, okanye {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/xh/unitfmt.json b/js/data/locale/xh/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/xh/unitfmt.json
+++ b/js/data/locale/xh/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/xnr/ctrynames.json b/js/data/locale/xnr/ctrynames.json
new file mode 100644
index 0000000000..4bc6f76eae
--- /dev/null
+++ b/js/data/locale/xnr/ctrynames.json
@@ -0,0 +1,297 @@
+{
+    "Sark": "CQ",
+    "अंगोला": "AO",
+    "अज़रबैजान": "AZ",
+    "अंटार्कटिका": "AQ",
+    "अणजाण लाका": "ZZ",
+    "अफ़गानिस्तान": "AF",
+    "अफ़्रीका": "002",
+    "अमरिकी समोआ": "AS",
+    "अमरिके दा": "019",
+    "अरूबा": "AW",
+    "अर्जेंटीना": "AR",
+    "अल सल्वाडोर": "SV",
+    "अल्जीरिया": "DZ",
+    "अल्बानिया": "AL",
+    "असेंशन द्वीप": "AC",
+    "आइल ऑफ़ मैन": "IM",
+    "आइसलैंड": "IS",
+    "आउटलाइंग ओशिनिया": "QO",
+    "आयरलैंड": "IE",
+    "आर्मेनिया": "AM",
+    "इक्वाडोर": "EC",
+    "इक्वेटोरियल गिनी": "GQ",
+    "इज़राइल": "IL",
+    "इटली": "IT",
+    "इंडोनेशिया": "ID",
+    "इथियोपिया": "ET",
+    "इराक": "IQ",
+    "इरिट्रिया": "ER",
+    "ईरान": "IR",
+    "उज़्बेकिस्तान": "UZ",
+    "उत्तर अमरिका": "003",
+    "उत्तर कोरिया": "KP",
+    "उत्तरी अफ़्रीका": "015",
+    "उत्तरी अमरिका": "021",
+    "उत्तरी मकदूनिया": "MK",
+    "उत्तरी मारियाना द्वीपां दा झुंड": "MP",
+    "उत्तरी यूरोप": "154",
+    "उप-सहारा अफ़्रीका": "202",
+    "उरूग्वे": "UY",
+    "एंग्विला": "AI",
+    "एंटिगुआ कने बरबुडा": "AG",
+    "एंडोरा": "AD",
+    "एलैंड द्वीपां दा झुंड": "AX",
+    "एशिया": "142",
+    "एस्टोनिया": "EE",
+    "एस्वाटिनी": "SZ",
+    "ऑस्ट्रिया": "AT",
+    "ऑस्ट्रेलिया": "AU",
+    "ऑस्ट्रेलेशिया": "053",
+    "ओमान": "OM",
+    "ओशिआनिया": "009",
+    "कज़ाखस्तान": "KZ",
+    "कट्ठा अरब अमीरात": "AE",
+    "कट्ठा राज्य": "US",
+    "क़तर": "QA",
+    "कनेडा": "CA",
+    "कंबोडिया": "KH",
+    "कांगो - किंशासा": "CD",
+    "कांगो – ब्राज़ाविल": "CG",
+    "किरिबाती": "KI",
+    "किर्गिज़स्तान": "KG",
+    "कुक द्वीपां दा झुंड": "CK",
+    "कुवैत": "KW",
+    "केन्या": "KE",
+    "केप वर्ड": "CV",
+    "कैनेरी द्वीपां दा झुंड": "IC",
+    "कैमरून": "CM",
+    "कैमेन द्वीपसमूह": "KY",
+    "कैरिबियन": "029",
+    "कैरिबियन नीदरलैंड": "BQ",
+    "कोकोस (कीलिंग) द्वीपां दा झुंड": "CC",
+    "कोट डी आइवर": "CI",
+    "कोमोरोस": "KM",
+    "कोलंबिया": "CO",
+    "कोसोवो": "XK",
+    "कोस्टारिका": "CR",
+    "क्यूबा": "CU",
+    "क्यूरासाओ": "CW",
+    "क्रिसमस द्वीप": "CX",
+    "क्रोएशिया": "HR",
+    "क्लिपर्टन द्वीप": "CP",
+    "गर्नसी": "GG",
+    "गाम्बिया": "GM",
+    "गिनी": "GN",
+    "गिनी-बिसाउ": "GW",
+    "गुआम": "GU",
+    "गुयाना": "GY",
+    "गैबॉन": "GA",
+    "ग्रीनलैंड": "GL",
+    "ग्रेनेडा": "GD",
+    "ग्वाटेमाला": "GT",
+    "ग्वाडेलूप": "GP",
+    "घाना": "GH",
+    "चाड": "TD",
+    "चिली": "CL",
+    "चीन": "CN",
+    "चेकिया": "CZ",
+    "जमैका": "JM",
+    "जर्मनी": "DE",
+    "जर्सी": "JE",
+    "जापान": "JP",
+    "ज़ाम्बिया": "ZM",
+    "जिबूती": "DJ",
+    "जिब्राल्टर": "GI",
+    "ज़िम्बाब्वे": "ZW",
+    "जॉर्जिया": "GE",
+    "जॉर्डन": "JO",
+    "टोंगा": "TO",
+    "टोगो": "TG",
+    "ट्यूनीशिया": "TN",
+    "ट्रिस्टन दा कुना": "TA",
+    "डिएगो गार्सिया": "DG",
+    "डेनमार्क": "DK",
+    "डोमिनिकन गणराज्य": "DO",
+    "डोमिनिका": "DM",
+    "तंज़ानिया": "TZ",
+    "ताइवान": "TW",
+    "ताज़िकिस्तान": "TJ",
+    "तिमोर-लेस्त": "TL",
+    "तुर्क कने कैकोज़ द्वीपां दा झुंड": "TC",
+    "तुर्कमेनिस्तान": "TM",
+    "तुर्की": "TR",
+    "तुवालू": "TV",
+    "तोकेलाउ": "TK",
+    "त्रिनिदाद और टोबैगो": "TT",
+    "थाईलैंड": "TH",
+    "दखण अफ़्रीका": "ZA",
+    "दखण अमरिका": "005",
+    "दखण कोरिया": "KR",
+    "दखण जॉर्जिया और दखण सैंडविच द्वीपां दा झुंड": "GS",
+    "दखण सूडान": "SS",
+    "दखण-पूर्व एशिया": "035",
+    "दखणे बखें अफ़्रीका": "018",
+    "दखणे बखें एशिया": "034",
+    "दखणे बखें यूरोप": "039",
+    "दुनिया": "001",
+    "नाइजर": "NE",
+    "नाइजीरिया": "NG",
+    "नाउरु": "NR",
+    "नामीबिया": "NA",
+    "निकारागुआ": "NI",
+    "नीदरलैंड": "NL",
+    "नीयू": "NU",
+    "नेपाल": "NP",
+    "नॉरफ़ॉक द्वीप": "NF",
+    "नॉर्वे": "NO",
+    "न्यू कैलेडोनिया": "NC",
+    "न्यूज़ीलैंड": "NZ",
+    "पनामा": "PA",
+    "पराग्वे": "PY",
+    "पलाऊ": "PW",
+    "पश्चिमी अफ़्रीका": "011",
+    "पश्चिमी एशिया": "145",
+    "पश्चिमी यूरोप": "155",
+    "पश्चिमी सहारा": "EH",
+    "पाकिस्तान": "PK",
+    "पापुआ न्यू गिनी": "PG",
+    "पिटकैर्न द्वीपसमूह": "PN",
+    "पुर्तगाल": "PT",
+    "पूर्वी अफ़्रीका": "014",
+    "पूर्वी एशिया": "030",
+    "पूर्वी यूरोप": "151",
+    "पेरू": "PE",
+    "पोर्टो रिको": "PR",
+    "पोलिनेशिया": "061",
+    "पोलैंड": "PL",
+    "फ़िजी": "FJ",
+    "फ़िनलैंड": "FI",
+    "फ़िलिपींस": "PH",
+    "फ़िलिस्तीनी लाका": "PS",
+    "फ़ेरो द्वीपां दा झुंड": "FO",
+    "फ़ॉकलैंड द्वीपां दा झुंड": "FK",
+    "फ़्रांस": "FR",
+    "फ़्रांसीसी दखणे बखें लाका": "TF",
+    "फ़्रेंच गुयाना": "GF",
+    "फ़्रेंच पोलिनेशिया": "PF",
+    "बरमूडा": "BM",
+    "बहरीन": "BH",
+    "बहामास": "BS",
+    "बांग्लादेश": "BD",
+    "बारबाडोस": "BB",
+    "बिचला अफ़्रीका": "017",
+    "बिचला अफ़्रीकी गणराज्य": "CF",
+    "बिचला अमरिका": "013",
+    "बिचला एशिया": "143",
+    "बुरुंडी": "BI",
+    "बुर्किना फ़ासो": "BF",
+    "बुल्गारिया": "BG",
+    "बेनिन": "BJ",
+    "बेलारूस": "BY",
+    "बेलीज़": "BZ",
+    "बेल्जियम": "BE",
+    "बोत्स्वाना": "BW",
+    "बोलीविया": "BO",
+    "बोवेत द्वीप": "BV",
+    "बोस्निया और हर्ज़ेगोविना": "BA",
+    "ब्राज़ील": "BR",
+    "ब्रिटिश वर्जिन द्वीपां दा झुंड": "VG",
+    "ब्रिटिश हिंद महासागरीय लाका": "IO",
+    "ब्रूनेई": "BN",
+    "भारत": "IN",
+    "भूटान": "BT",
+    "मकाऊ (खास प्रशासनिक लाका चीन)": "MO",
+    "मंगोलिया": "MN",
+    "मलावी": "MW",
+    "मलेशिया": "MY",
+    "माइक्रोनेशिया": "FM",
+    "माइक्रोनेशियाई लाका": "057",
+    "मायोते": "YT",
+    "मार्टीनिक": "MQ",
+    "मार्शल द्वीपां दा झुंड": "MH",
+    "मालदीव": "MV",
+    "माली": "ML",
+    "माल्टा": "MT",
+    "मिस्र": "EG",
+    "मेडागास्कर": "MG",
+    "मेलानेशिया": "054",
+    "मैक्सिको": "MX",
+    "मॉरिटानिया": "MR",
+    "मॉरीशस": "MU",
+    "मॉल्डोवा": "MD",
+    "मोज़ांबिक": "MZ",
+    "मोंटसेरात": "MS",
+    "मोंटेनेग्रो": "ME",
+    "मोनाको": "MC",
+    "मोरक्को": "MA",
+    "म्यांमार (बर्मा)": "MM",
+    "यमन": "YE",
+    "युगांडा": "UG",
+    "यू॰एस॰ आउटलाइंग द्वीपां दा झुंड": "UM",
+    "यू॰एस॰ वर्जिन द्वीपां दा झुंड": "VI",
+    "यूक्रेन": "UA",
+    "यूनाइटेड किंगडम": "GB",
+    "यूनान": "GR",
+    "यूरोज़ोन": "EZ",
+    "यूरोप": "150",
+    "यूरोपीय संघ": "EU",
+    "रवांडा": "RW",
+    "रियूनियन": "RE",
+    "रूस": "RU",
+    "रोमानिया": "RO",
+    "लग्ज़मबर्ग": "LU",
+    "लाइबेरिया": "LR",
+    "लाओस": "LA",
+    "लातविया": "LV",
+    "लिचेंस्टीन": "LI",
+    "लिथुआनिया": "LT",
+    "लीबिया": "LY",
+    "लेबनान": "LB",
+    "लेसोथो": "LS",
+    "लैटिन अमरिका": "419",
+    "वनुआतू": "VU",
+    "वालिस और फ़्यूचूना": "WF",
+    "वियतनाम": "VN",
+    "वेटिकन सिटी": "VA",
+    "वेनेज़ुएला": "VE",
+    "श्रीलंका": "LK",
+    "सऊदी अरब": "SA",
+    "समोआ": "WS",
+    "संयुक्त रास्टर": "UN",
+    "सर्बिया": "RS",
+    "साइप्रस": "CY",
+    "साओ टोम और प्रिंसिपे": "ST",
+    "सिएरा लियोन": "SL",
+    "सिंगापुर": "SG",
+    "सिंट मार्टिन": "SX",
+    "सीरिया": "SY",
+    "सूडान": "SD",
+    "सूडो-एक्सेंट": "XA",
+    "सूडो-बायडायरेक्शनल": "XB",
+    "सूरीनाम": "SR",
+    "सेउटा और मेलिला": "EA",
+    "सेंट किट्स कने नेविस": "KN",
+    "सेंट पिएरे और मिक्वेलान": "PM",
+    "सेंट बार्थेलेमी": "BL",
+    "सेंट मार्टिन": "MF",
+    "सेंट लूसिया": "LC",
+    "सेंट विंसेंट और ग्रेनाडाइंस": "VC",
+    "सेंट हेलेना": "SH",
+    "सेनेगल": "SN",
+    "सेशेल्स": "SC",
+    "सैन मेरीनो": "SM",
+    "सोमालिया": "SO",
+    "सोलोमन द्वीपसमूह": "SB",
+    "स्पेन": "ES",
+    "स्लोवाकिया": "SK",
+    "स्लोवेनिया": "SI",
+    "स्वालबार्ड और जान मायेन": "SJ",
+    "स्विट्ज़रलैंड": "CH",
+    "स्वीडन": "SE",
+    "हंगरी": "HU",
+    "हर्ड द्वीप कने मैकडोनॉल्ड द्वीपां दा झुंड": "HM",
+    "हाँग काँग (चीन खास प्रशासनिक लाका)": "HK",
+    "हैती": "HT",
+    "होंडूरास": "HN"
+}
\ No newline at end of file
diff --git a/js/data/locale/xnr/ctryreverse.json b/js/data/locale/xnr/ctryreverse.json
new file mode 100644
index 0000000000..14324aa23f
--- /dev/null
+++ b/js/data/locale/xnr/ctryreverse.json
@@ -0,0 +1,297 @@
+{
+    "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": "पश्चिमी यूरोप",
+    "202": "उप-सहारा अफ़्रीका",
+    "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": "क्लिपर्टन द्वीप",
+    "CQ": "Sark",
+    "CR": "कोस्टारिका",
+    "CU": "क्यूबा",
+    "CV": "केप वर्ड",
+    "CW": "क्यूरासाओ",
+    "CX": "क्रिसमस द्वीप",
+    "CY": "साइप्रस",
+    "CZ": "चेकिया",
+    "DE": "जर्मनी",
+    "DG": "डिएगो गार्सिया",
+    "DJ": "जिबूती",
+    "DK": "डेनमार्क",
+    "DM": "डोमिनिका",
+    "DO": "डोमिनिकन गणराज्य",
+    "DZ": "अल्जीरिया",
+    "EA": "सेउटा और मेलिला",
+    "EC": "इक्वाडोर",
+    "EE": "एस्टोनिया",
+    "EG": "मिस्र",
+    "EH": "पश्चिमी सहारा",
+    "ER": "इरिट्रिया",
+    "ES": "स्पेन",
+    "ET": "इथियोपिया",
+    "EU": "यूरोपीय संघ",
+    "EZ": "यूरोज़ोन",
+    "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": "यू॰एस॰ आउटलाइंग द्वीपां दा झुंड",
+    "UN": "संयुक्त रास्टर",
+    "US": "कट्ठा राज्य",
+    "UY": "उरूग्वे",
+    "UZ": "उज़्बेकिस्तान",
+    "VA": "वेटिकन सिटी",
+    "VC": "सेंट विंसेंट और ग्रेनाडाइंस",
+    "VE": "वेनेज़ुएला",
+    "VG": "ब्रिटिश वर्जिन द्वीपां दा झुंड",
+    "VI": "यू॰एस॰ वर्जिन द्वीपां दा झुंड",
+    "VN": "वियतनाम",
+    "VU": "वनुआतू",
+    "WF": "वालिस और फ़्यूचूना",
+    "WS": "समोआ",
+    "XA": "सूडो-एक्सेंट",
+    "XB": "सूडो-बायडायरेक्शनल",
+    "XK": "कोसोवो",
+    "YE": "यमन",
+    "YT": "मायोते",
+    "ZA": "दखण अफ़्रीका",
+    "ZM": "ज़ाम्बिया",
+    "ZW": "ज़िम्बाब्वे",
+    "ZZ": "अणजाण लाका"
+}
\ No newline at end of file
diff --git a/js/data/locale/xnr/dateformats.json b/js/data/locale/xnr/dateformats.json
new file mode 100644
index 0000000000..fa20a7df0e
--- /dev/null
+++ b/js/data/locale/xnr/dateformats.json
@@ -0,0 +1,123 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "d"
+            },
+            "dm": {
+                "l": "d MMMM",
+                "m": "d MMM"
+            },
+            "dmw": {
+                "f": "EEEE, d MMMM",
+                "l": "EEE, d MMMM",
+                "m": "EE, d MMM",
+                "s": "E, d/M"
+            },
+            "dmwy": {
+                "f": "EEEE, d MMMM yyyy",
+                "l": "EEE, d MMMM yyyy",
+                "m": "EE, d MMM yyyy",
+                "s": "E, d/M/yy"
+            },
+            "dmy": {
+                "l": "d MMMM yyyy",
+                "m": "d MMM yyyy"
+            },
+            "dw": {
+                "f": "EEEE, d",
+                "l": "EEE, d",
+                "m": "EE, d",
+                "s": "E, d"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM"
+            },
+            "my": {
+                "l": "MMMM yyyy",
+                "m": "MMM yyyy"
+            }
+        },
+        "order": {
+            "f": "{date} जो {time}",
+            "l": "{date} जो {time}",
+            "m": "{date}, {time}",
+            "s": "{date}, {time}"
+        },
+        "range": {
+            "c00": {
+                "f": "{sd} {sm} {sy} जो {st} – {et}",
+                "l": "{sd} {sm} {sy} जो {st} – {et}",
+                "m": "{sd} {sm} {sy}, {st} – {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {et}"
+            },
+            "c01": {
+                "f": "{sd} {sm} {sy} जो {st} – {ed} {em} {ey} जो {et}",
+                "l": "{sd} {sm} {sy} जो {st} – {ed} {em} {ey} जो {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c02": {
+                "f": "{sd} {sm} {sy} जो {st} – {ed} {em} {ey} जो {et}",
+                "l": "{sd} {sm} {sy} जो {st} – {ed} {em} {ey} जो {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c03": {
+                "f": "{sd} {sm} {sy} जो {st} – {ed} {em} {ey} जो {et}",
+                "l": "{sd} {sm} {sy} जो {st} – {ed} {em} {ey} जो {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c10": {
+                "f": "{sd} – {ed} {em} {ey}",
+                "l": "{sd} – {ed} {em} {ey}",
+                "m": "{sd} – {ed} {em} {ey}",
+                "s": "{sd} – {ed}/{em}/{ey}"
+            },
+            "c11": {
+                "f": "{sd} {sm} – {ed} {em} {ey}",
+                "l": "{sd} {sm} – {ed} {em} {ey}",
+                "m": "{sd} {sm} – {ed} {em} {ey}",
+                "s": "{sd}/{sm} – {ed}/{em}/{ey}"
+            },
+            "c12": {
+                "m": "{sd} {sm} {sy} – {ed} {em} {ey}"
+            },
+            "c20": {
+                "m": "{sm} {sy} – {em} {ey}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/xnr/langname.jf b/js/data/locale/xnr/langname.jf
new file mode 100644
index 0000000000..72777963a9
--- /dev/null
+++ b/js/data/locale/xnr/langname.jf
@@ -0,0 +1,4 @@
+{
+    "generated": true,
+    "language.name": "Kangri"
+}
\ No newline at end of file
diff --git a/js/data/locale/xnr/list.json b/js/data/locale/xnr/list.json
new file mode 100644
index 0000000000..9ed606bdc2
--- /dev/null
+++ b/js/data/locale/xnr/list.json
@@ -0,0 +1,44 @@
+{
+    "or": {
+        "full": {
+            "2": "{0} या {1}",
+            "end": "{0} या {1}"
+        },
+        "long": {
+            "2": "{0} या {1}",
+            "end": "{0} या {1}"
+        },
+        "medium": {
+            "2": "{0} या {1}",
+            "end": "{0} या {1}"
+        },
+        "short": {
+            "2": "{0} या {1}",
+            "end": "{0} या {1}"
+        }
+    },
+    "standard": {
+        "full": {
+            "2": "{0} कने {1}",
+            "end": "{0}, कने {1}"
+        },
+        "long": {
+            "2": "{0} कने {1}",
+            "end": "{0}, कने {1}"
+        },
+        "medium": {
+            "2": "{0} कने {1}",
+            "end": "{0} कने {1}"
+        },
+        "short": {
+            "2": "{0} कने {1}",
+            "end": "{0} कने {1}"
+        }
+    },
+    "unit": {
+        "short": {
+            "2": "{0} {1}",
+            "end": "{0} {1}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/xnr/numfmt.jf b/js/data/locale/xnr/numfmt.jf
new file mode 100644
index 0000000000..f1f08baa2c
--- /dev/null
+++ b/js/data/locale/xnr/numfmt.jf
@@ -0,0 +1,29 @@
+{
+    "generated": true,
+    "native_numfmt": {
+        "currencyFormats": {
+            "common": "{s}{n}",
+            "commonNegative": "-{s}{n}"
+        },
+        "decimalChar": ".",
+        "digits": "०१२३४५६७८९",
+        "exponential": "E",
+        "groupChar": ",",
+        "negativenumFmt": "-{n}",
+        "negativepctFmt": "-{n}%",
+        "pctChar": "%",
+        "pctFmt": "{n}%",
+        "prigroupSize": 3,
+        "roundingMode": "halfdown",
+        "script": "Deva",
+        "secgroupSize": 2,
+        "useNative": true
+    },
+    "numfmt": {
+        "currencyFormats": {
+            "common": "{s}{n}",
+            "commonNegative": "-{s}{n}"
+        },
+        "secgroupSize": 2
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/xnr/sysres.json b/js/data/locale/xnr/sysres.json
new file mode 100644
index 0000000000..107a65b163
--- /dev/null
+++ b/js/data/locale/xnr/sysres.json
@@ -0,0 +1,162 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "E0": "त",
+    "E1": "सो",
+    "E2": "मं",
+    "E3": "बु",
+    "E4": "वी",
+    "E5": "शु",
+    "E6": "श",
+    "EE0": "त",
+    "EE1": "सो",
+    "EE2": "मं",
+    "EE3": "बु",
+    "EE4": "वी",
+    "EE5": "शु",
+    "EE6": "श",
+    "EEE0": "तोआर",
+    "EEE1": "सोआर",
+    "EEE2": "मंगल",
+    "EEE3": "बुध",
+    "EEE4": "वीर",
+    "EEE5": "शुक्कर",
+    "EEE6": "शनि",
+    "EEEE0": "तोआर",
+    "EEEE1": "सोआर",
+    "EEEE2": "मंगलवार",
+    "EEEE3": "बुधवार",
+    "EEEE4": "वीरवार",
+    "EEEE5": "शुक्करवार",
+    "EEEE6": "शनिच्चरवार",
+    "G-1": "ईसा-पैले",
+    "G1": "ईसवी",
+    "MMM1": "जन॰",
+    "MMM10": "अक्तू॰",
+    "MMM11": "नव॰",
+    "MMM12": "दिस॰",
+    "MMM2": "फ़र॰",
+    "MMM3": "मार्च",
+    "MMM4": "अप्रैल",
+    "MMM5": "मई",
+    "MMM6": "जून",
+    "MMM7": "जुल॰",
+    "MMM8": "अग॰",
+    "MMM9": "सित॰",
+    "MMMM1": "जनवरी",
+    "MMMM10": "अक्तूबर",
+    "MMMM11": "नवंबर",
+    "MMMM12": "दिसंबर",
+    "MMMM2": "फ़रवरी",
+    "MMMM3": "मार्च",
+    "MMMM4": "अप्रैल",
+    "MMMM5": "मई",
+    "MMMM6": "जून",
+    "MMMM7": "जुलाई",
+    "MMMM8": "अगस्त",
+    "MMMM9": "सितंबर",
+    "N1": "ज",
+    "N10": "अ",
+    "N11": "न",
+    "N12": "द",
+    "N2": "फ",
+    "N3": "म",
+    "N4": "अ",
+    "N5": "म",
+    "N6": "ज",
+    "N7": "ज",
+    "N8": "अ",
+    "N9": "स",
+    "NN1": "जन",
+    "NN10": "अक",
+    "NN11": "नव",
+    "NN12": "दि",
+    "NN2": "फ़",
+    "NN3": "मा",
+    "NN4": "अप",
+    "NN5": "मई",
+    "NN6": "जू",
+    "NN7": "जु",
+    "NN8": "अग",
+    "NN9": "सि",
+    "a0": "भ्यागा",
+    "a1": "दपेहरा/संजा",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": " ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/xnr/unitfmt.json b/js/data/locale/xnr/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/xnr/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/xog/ctrynames.json b/js/data/locale/xog/ctrynames.json
index a766f801cc..9239c0cec9 100644
--- a/js/data/locale/xog/ctrynames.json
+++ b/js/data/locale/xog/ctrynames.json
@@ -36,6 +36,7 @@
     "Botiswana": "BW",
     "Bouvet Island": "BV",
     "Boziniya Hezegovina": "BA",
+    "British Indian Ocean Territory": "IO",
     "Bubirigi": "BE",
     "Budaaki": "DE",
     "Bufalansa": "FR",
@@ -70,7 +71,6 @@
     "Eastern Europe": "151",
     "Ebiizinga bya Falikalandi": "FK",
     "Ebizanga bya Solomooni": "SB",
-    "Ebizinga bya Cago": "IO",
     "Ebizinga bya Firipino": "PH",
     "Ebizinga bya Kayimaani": "KY",
     "Ebizinga bya Kepu Veredi": "CV",
diff --git a/js/data/locale/xog/ctryreverse.json b/js/data/locale/xog/ctryreverse.json
index 9c92d704b5..6addbe96c1 100644
--- a/js/data/locale/xog/ctryreverse.json
+++ b/js/data/locale/xog/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Yisirayeri",
     "IM": "Isle of Man",
     "IN": "Buyindi",
-    "IO": "Ebizinga bya Cago",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Yiraaka",
     "IR": "Yiraani",
     "IS": "Ayisirandi",
diff --git a/js/data/locale/xog/unitfmt.json b/js/data/locale/xog/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/xog/unitfmt.json
+++ b/js/data/locale/xog/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/yav/ctrynames.json b/js/data/locale/yav/ctrynames.json
index e97677b056..f99f3cdc46 100644
--- a/js/data/locale/yav/ctrynames.json
+++ b/js/data/locale/yav/ctrynames.json
@@ -22,6 +22,7 @@
     "Australasia": "053",
     "ayíti": "HT",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Canary Islands": "IC",
     "Caribbean": "029",
     "Caribbean Netherlands": "BQ",
@@ -107,7 +108,6 @@
     "kɔlé wu mbát": "KR",
     "Kɔlɔ́mbía": "CO",
     "Kɔmɔ́ɔl": "KM",
-    "Kɔɔ́m kí ndián yi ngilís": "IO",
     "kuamiɛ": "GU",
     "kuatelúup": "GP",
     "kuatemalá": "GT",
diff --git a/js/data/locale/yav/ctryreverse.json b/js/data/locale/yav/ctryreverse.json
index 8d81223644..05f51a5590 100644
--- a/js/data/locale/yav/ctryreverse.json
+++ b/js/data/locale/yav/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ísilayɛ́l",
     "IM": "Isle of Man",
     "IN": "ɛ́ɛnd",
-    "IO": "Kɔɔ́m kí ndián yi ngilís",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ilák",
     "IR": "iláŋ",
     "IS": "isláand",
diff --git a/js/data/locale/yav/unitfmt.json b/js/data/locale/yav/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/yav/unitfmt.json
+++ b/js/data/locale/yav/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/yi/unitfmt.json b/js/data/locale/yi/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/yi/unitfmt.json
+++ b/js/data/locale/yi/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/yo/BJ/ctrynames.json b/js/data/locale/yo/BJ/ctrynames.json
index 083c040f56..83a18c4b8d 100644
--- a/js/data/locale/yo/BJ/ctrynames.json
+++ b/js/data/locale/yo/BJ/ctrynames.json
@@ -62,6 +62,7 @@
     "Bùùgáríà": "BG",
     "Bùùkíná Fasò": "BF",
     "Bùùrúndì": "BI",
+    "Curaçao": "CW",
     "Dɛ́mákì": "DK",
     "Díbɔ́ótì": "DJ",
     "Diego Gashia": "DG",
@@ -137,7 +138,7 @@
     "Ìlà Òrùn Yúrópù": "151",
     "ÌlàOòrùn Tímɔ̀": "TL",
     "Ìlú Bátílɛ́mì": "BL",
-    "Ìlú Mátíìnì": "MF",
+    "Ìlú Màtìnì": "MF",
     "Ìlú Vatican": "VA",
     "India": "IN",
     "Indonesia": "ID",
@@ -161,7 +162,7 @@
     "Kamerúúnì": "CM",
     "Kàmùbódíà": "KH",
     "Kánádà": "CA",
-    "Káríbíánì ti Nɛ́dálándì": "BQ",
+    "Kàríbíánì ti Nɛ́dálándì": "BQ",
     "Káríbíànù": "029",
     "Kashashatani": "KZ",
     "Kenya": "KE",
@@ -176,7 +177,6 @@
     "Kota": "QA",
     "Kóútè forà": "CI",
     "Kúbà": "CU",
-    "Kúrásáò": "CW",
     "Kurishisitani": "KG",
     "Kúrúsì": "CY",
     "Kuusita Ríkà": "CR",
diff --git a/js/data/locale/yo/BJ/ctryreverse.json b/js/data/locale/yo/BJ/ctryreverse.json
index f87712d07a..40c66d38da 100644
--- a/js/data/locale/yo/BJ/ctryreverse.json
+++ b/js/data/locale/yo/BJ/ctryreverse.json
@@ -60,7 +60,7 @@
     "BM": "Bémúdà",
     "BN": "Búrúnɛ́lì",
     "BO": "Bɔ̀lífíyà",
-    "BQ": "Káríbíánì ti Nɛ́dálándì",
+    "BQ": "Kàríbíánì ti Nɛ́dálándì",
     "BR": "Bàràsílì",
     "BS": "Bàhámásì",
     "BT": "Bútánì",
@@ -85,7 +85,7 @@
     "CR": "Kuusita Ríkà",
     "CU": "Kúbà",
     "CV": "Etíokun Kápé féndè",
-    "CW": "Kúrásáò",
+    "CW": "Curaçao",
     "CX": "Erékùsù Christmas",
     "CY": "Kúrúsì",
     "CZ": "Shɛ́ɛ́kì",
@@ -178,7 +178,7 @@
     "MC": "Monako",
     "MD": "Modofia",
     "ME": "Montenegro",
-    "MF": "Ìlú Mátíìnì",
+    "MF": "Ìlú Màtìnì",
     "MG": "Madasika",
     "MH": "Etikun Máshali",
     "MK": "Àríwá Macedonia",
diff --git a/js/data/locale/yo/BJ/unitfmt.json b/js/data/locale/yo/BJ/unitfmt.json
index 44bdf3eb15..4f38689a74 100644
--- a/js/data/locale/yo/BJ/unitfmt.json
+++ b/js/data/locale/yo/BJ/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} àwɔ́n bíìtì",
             "bit-per-second": "#{n} àwɔ́n bíìtì/ìsh àáy",
             "british-thermal-unit": "#{n} Btu",
@@ -43,8 +44,6 @@
             "dessert-spoon": "#{n} àmì shíbí oúnjɛ́ kékeré",
             "dessert-spoon-imperial": "#{n} àmì oúnjɛ kékeré",
             "dot": "#{n} dɔ́ɔ̀tì",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} àmì omi dírámù",
             "drop": "#{n} dírɔ́pù",
             "dunam": "#{n} dunam",
@@ -56,7 +55,6 @@
             "fathom": "#{n} fátɔ́ɔ̀mù",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/ìsh àáy",
             "furlong": "#{n} àwɔn fɔ́lɔ́ɔ̀ngì",
@@ -216,6 +214,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bíìtì",
             "bit-per-second": "#{n} bíìtì ìsh àáy",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +248,6 @@
             "dessert-spoon": "#{n} shíbí oúnjɛ́ kékeré",
             "dessert-spoon-imperial": "#{n} àmì oúnjɛ kékeré",
             "dot": "#{n} dɔ́ɔ̀tì",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} àmì omi dírámù",
             "drop": "#{n} dírɔ́pù",
             "dunam": "#{n} dunam",
@@ -262,7 +259,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft ìsh àáy",
             "furlong": "#{n} fɔ́",
diff --git a/js/data/locale/yo/ctrynames.json b/js/data/locale/yo/ctrynames.json
index fd48939cef..9ff9bcb9a2 100644
--- a/js/data/locale/yo/ctrynames.json
+++ b/js/data/locale/yo/ctrynames.json
@@ -62,6 +62,7 @@
     "Bùùgáríà": "BG",
     "Bùùkíná Fasò": "BF",
     "Bùùrúndì": "BI",
+    "Curaçao": "CW",
     "Dẹ́mákì": "DK",
     "Díbọ́ótì": "DJ",
     "Diego Gaṣia": "DG",
@@ -137,7 +138,7 @@
     "Ìlà Òrùn Yúrópù": "151",
     "ÌlàOòrùn Tímọ̀": "TL",
     "Ìlú Bátílẹ́mì": "BL",
-    "Ìlú Mátíìnì": "MF",
+    "Ìlú Màtìnì": "MF",
     "Ìlú Vatican": "VA",
     "India": "IN",
     "Indonesia": "ID",
@@ -161,7 +162,7 @@
     "Kamerúúnì": "CM",
     "Kàmùbódíà": "KH",
     "Kánádà": "CA",
-    "Káríbíánì ti Nẹ́dálándì": "BQ",
+    "Kàríbíánì ti Nẹ́dálándì": "BQ",
     "Káríbíànù": "029",
     "Kaṣaṣatani": "KZ",
     "Kenya": "KE",
@@ -176,7 +177,6 @@
     "Kota": "QA",
     "Kóútè forà": "CI",
     "Kúbà": "CU",
-    "Kúrásáò": "CW",
     "Kuriṣisitani": "KG",
     "Kúrúsì": "CY",
     "Kuusita Ríkà": "CR",
diff --git a/js/data/locale/yo/ctryreverse.json b/js/data/locale/yo/ctryreverse.json
index 6020641182..dc10ea88b5 100644
--- a/js/data/locale/yo/ctryreverse.json
+++ b/js/data/locale/yo/ctryreverse.json
@@ -60,7 +60,7 @@
     "BM": "Bémúdà",
     "BN": "Búrúnẹ́lì",
     "BO": "Bọ̀lífíyà",
-    "BQ": "Káríbíánì ti Nẹ́dálándì",
+    "BQ": "Kàríbíánì ti Nẹ́dálándì",
     "BR": "Bàràsílì",
     "BS": "Bàhámásì",
     "BT": "Bútánì",
@@ -85,7 +85,7 @@
     "CR": "Kuusita Ríkà",
     "CU": "Kúbà",
     "CV": "Etíokun Kápé féndè",
-    "CW": "Kúrásáò",
+    "CW": "Curaçao",
     "CX": "Erékùsù Christmas",
     "CY": "Kúrúsì",
     "CZ": "Ṣẹ́ẹ́kì",
@@ -178,7 +178,7 @@
     "MC": "Monako",
     "MD": "Modofia",
     "ME": "Montenegro",
-    "MF": "Ìlú Mátíìnì",
+    "MF": "Ìlú Màtìnì",
     "MG": "Madasika",
     "MH": "Etikun Máṣali",
     "MK": "Àríwá Macedonia",
diff --git a/js/data/locale/yo/unitfmt.json b/js/data/locale/yo/unitfmt.json
index eb56c1593f..beb1399352 100644
--- a/js/data/locale/yo/unitfmt.json
+++ b/js/data/locale/yo/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#Beaufort {n}",
             "bit": "#{n} àwọ́n bíìtì",
             "bit-per-second": "#{n} àwọ́n bíìtì/ìṣ àáy",
             "british-thermal-unit": "#{n} Btu",
@@ -43,8 +44,6 @@
             "dessert-spoon": "#{n} àmì ṣíbí oúnjẹ́ kékeré",
             "dessert-spoon-imperial": "#{n} àmì oúnjẹ kékeré",
             "dot": "#{n} dọ́ọ̀tì",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} àmì omi dírámù",
             "drop": "#{n} dírọ́pù",
             "dunam": "#{n} dunam",
@@ -56,7 +55,6 @@
             "fathom": "#{n} fátọ́ọ̀mù",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft/ìṣ àáy",
             "furlong": "#{n} àwọn fọ́lọ́ọ̀ngì",
@@ -216,6 +214,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bíìtì",
             "bit-per-second": "#{n} bíìtì ìṣ àáy",
             "british-thermal-unit": "#{n} Btu",
@@ -249,8 +248,6 @@
             "dessert-spoon": "#{n} ṣíbí oúnjẹ́ kékeré",
             "dessert-spoon-imperial": "#{n} àmì oúnjẹ kékeré",
             "dot": "#{n} dọ́ọ̀tì",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} àmì omi dírámù",
             "drop": "#{n} dírọ́pù",
             "dunam": "#{n} dunam",
@@ -262,7 +259,6 @@
             "fathom": "#{n} fth",
             "fluid-ounce": "#{n} fl oz US",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} kcal",
             "foot": "#{n} ft",
             "foot-per-second": "#{n} ft ìṣ àáy",
             "furlong": "#{n} fọ́",
diff --git a/js/data/locale/yrl/CO/ctrynames.json b/js/data/locale/yrl/CO/ctrynames.json
index 6a780bd9c5..06b2fbc946 100644
--- a/js/data/locale/yrl/CO/ctrynames.json
+++ b/js/data/locale/yrl/CO/ctrynames.json
@@ -49,8 +49,8 @@
     "Beujika": "BE",
     "Bidiresiunaurana": "XB",
     "Bieru-rúsiya": "BY",
-    "Biritãniku Usuasawa Useyanu Ĩdiku": "IO",
     "Brasiu": "BR",
+    "British Indian Ocean Territory": "IO",
     "Bugáriya": "BG",
     "Bukina Fasu": "BF",
     "Buríwia": "BO",
diff --git a/js/data/locale/yrl/CO/ctryreverse.json b/js/data/locale/yrl/CO/ctryreverse.json
index 0396450684..64abf05f6c 100644
--- a/js/data/locale/yrl/CO/ctryreverse.json
+++ b/js/data/locale/yrl/CO/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirayeu",
     "IM": "Mã Kapuãma",
     "IN": "Ĩdiya",
-    "IO": "Biritãniku Usuasawa Useyanu Ĩdiku",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irã",
     "IS": "Isirãdiya",
diff --git a/js/data/locale/yrl/CO/unitfmt.json b/js/data/locale/yrl/CO/unitfmt.json
index 514fbe1f72..0cecf75dbc 100644
--- a/js/data/locale/yrl/CO/unitfmt.json
+++ b/js/data/locale/yrl/CO/unitfmt.json
@@ -2,19 +2,20 @@
     "unitfmt": {
         "long": {
             "acre": "one#{n} acre|#{n} acre-ita",
-            "acre-foot": "one#{n} acre-pí|#{n} acre-pí-ita",
+            "acre-foot": "#{n} acre-pí-ita",
             "ampere": "one#{n} ampere|#{n} ampere-ita",
             "arc-minute": "one#{n} mirapara minutu|#{n} mirapara minutu-ita",
             "arc-second": "one#{n} mirapara segũdu|#{n} mirapara segũdu-ita",
             "astronomical-unit": "one#{n} yepesawa iwakasara|#{n} yepesawa iwakasara-ita",
             "atmosphere": "one#{n} yãgasawa|#{n} yãgasawa-ita",
-            "bar": "one#{n} bar|#{n} bar-ita",
+            "bar": "#{n} bar-ita",
             "barrel": "one#{n} bariu|#{n} bariu-ita",
-            "bit": "one#{n} bit|#{n} bit-ita",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit-ita",
             "bit-per-second": "#{n} bit-ita segũdu rupi",
             "british-thermal-unit": "one#{n} yepesawa sakusawa biritãnika|#{n} yepesawa sakusawa biritãnika-ita",
             "bushel": "#{n} bu",
-            "byte": "one#{n} byte|#{n} byte-ita",
+            "byte": "#{n} byte-ita",
             "byte-per-hour": "#{n} byte-ita hura rupi",
             "byte-per-second": "#{n} byte-ita segũdu rupi",
             "calorie": "one#{n} karuria|#{n} karuria-ita",
@@ -35,18 +36,16 @@
             "cup": "one#{n} xikara|#{n} xikara-ita",
             "cup-metric": "one#{n} xikara métirika|#{n} xikara métirika-ita",
             "dalton": "one#{n} dalton|#{n} dalton-ita",
-            "day": "one#{n} ara|#{n} ara-ita",
+            "day": "#{n} ara-ita",
             "decade": "one#{n} dékada|#{n} dékada-ita",
             "deciliter": "one#{n} desiritru|#{n} desiritru-ita",
             "decimeter": "one#{n} desimeturu|#{n} desimeturu-ita",
             "degree": "one#{n} garau|#{n} garau-ita",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "one#{n} pitusá sẽtimeturu rupi|#{n} pitusá-ita sẽtimeturu rupi",
-            "dot-per-inch": "one#{n} pitusá puregada rupi|#{n} pitusá-ita puregada rupi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
-            "dunam": "one#{n} dunan|#{n} dunan-ita",
+            "dunam": "#{n} dunan-ita",
             "earth-mass": "one#{n} iwí susuẽga|#{n} iwí susuẽga-ita",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "one#{n} elétron-volt|#{n} elétron-volt-ita",
@@ -55,8 +54,7 @@
             "fathom": "one#{n} barasa|#{n} barasa-ita",
             "fluid-ounce": "one#{n} iauareté fruida|#{n} iauareté fruida-ita",
             "fluid-ounce-imperial": "one#{n} iauareté fruida ĩperiawa|#{n} iauareté fruida ĩperiawa-ita",
-            "foodcalorie": "one#{n} Karuria|#{n} Karuria-ita",
-            "foot": "one#{n} pí|#{n} pí-ita",
+            "foot": "#{n} pí-ita",
             "foot-per-second": "#{n} pí-ita segũdu rupi",
             "furlong": "one#{n} furlong|#{n} furlong-ita",
             "g-force": "one#{n} kirĩba g|#{n} kirĩba g-ita",
@@ -102,8 +100,8 @@
             "kilowatt": "one#{n} kiruwatt|#{n} kiruwatt-ita",
             "kilowatt-hour": "one#{n} kiruwatt-hura|#{n} kiruwatt-hura-ita",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
-            "knot": "one#{n} kitanga|#{n} kitanga-ita",
-            "light-year": "one#{n} akayú-werawa|#{n} akayú-werawa-ita",
+            "knot": "#{n} kitanga-ita",
+            "light-year": "#{n} akayú-werawa-ita",
             "liter": "one#{n} irerú-pukú|#{n} irerú-pukú-ita",
             "liter-per-100-kilometer": "one#{n} irerú-pukú 100 apekatusawa rupi|#{n} irerú-pukú-ita 100 apekatusawa rupi",
             "liter-per-kilometer": "one#{n} irerú-pukú-ita apekatusawa rupi|#{n} irerú-pukú apekatusawa rupi",
@@ -142,8 +140,8 @@
             "millisecond": "one#{n} mirisegũdu-ita|#{n} mirisegũdu rupi",
             "milliwatt": "one#{n} miriwatt|#{n} miriwatt-ita",
             "minute": "one#{n} minutu|#{n} minutu-ita",
-            "mole": "one#{n} mol|#{n} mol-ita",
-            "month": "one#{n} yasí|#{n} yasí-ita",
+            "mole": "#{n} mol-ita",
+            "month": "#{n} yasí-ita",
             "nanometer": "one#{n} nanumeturu|#{n} nanumeturu-ita",
             "nanosecond": "one#{n} nanusegũdu|#{n} nanusegũdu-ita",
             "nautical-mile": "one#{n} milla paranãuara|#{n} milla paranãuara-ita",
@@ -203,7 +201,7 @@
             "watt": "one#{n} watt|#{n} watt-ita",
             "week": "one#{n} sẽmãna|#{n} sẽmãna-ita",
             "yard": "one#{n} jarda|#{n} jarda-ita",
-            "year": "one#{n} akayú|#{n} akayú-ita"
+            "year": "#{n} akayú-ita"
         },
         "short": {
             "acre": "#{n} ac",
@@ -215,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -247,8 +246,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunan",
@@ -260,7 +257,6 @@
             "fathom": "#{n} brs.",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} cal",
             "foot": "#{n} pí",
             "foot-per-second": "#{n} pí/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/yrl/VE/ctrynames.json b/js/data/locale/yrl/VE/ctrynames.json
index 6a780bd9c5..06b2fbc946 100644
--- a/js/data/locale/yrl/VE/ctrynames.json
+++ b/js/data/locale/yrl/VE/ctrynames.json
@@ -49,8 +49,8 @@
     "Beujika": "BE",
     "Bidiresiunaurana": "XB",
     "Bieru-rúsiya": "BY",
-    "Biritãniku Usuasawa Useyanu Ĩdiku": "IO",
     "Brasiu": "BR",
+    "British Indian Ocean Territory": "IO",
     "Bugáriya": "BG",
     "Bukina Fasu": "BF",
     "Buríwia": "BO",
diff --git a/js/data/locale/yrl/VE/ctryreverse.json b/js/data/locale/yrl/VE/ctryreverse.json
index 0396450684..64abf05f6c 100644
--- a/js/data/locale/yrl/VE/ctryreverse.json
+++ b/js/data/locale/yrl/VE/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirayeu",
     "IM": "Mã Kapuãma",
     "IN": "Ĩdiya",
-    "IO": "Biritãniku Usuasawa Useyanu Ĩdiku",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irã",
     "IS": "Isirãdiya",
diff --git a/js/data/locale/yrl/VE/unitfmt.json b/js/data/locale/yrl/VE/unitfmt.json
index 514fbe1f72..0cecf75dbc 100644
--- a/js/data/locale/yrl/VE/unitfmt.json
+++ b/js/data/locale/yrl/VE/unitfmt.json
@@ -2,19 +2,20 @@
     "unitfmt": {
         "long": {
             "acre": "one#{n} acre|#{n} acre-ita",
-            "acre-foot": "one#{n} acre-pí|#{n} acre-pí-ita",
+            "acre-foot": "#{n} acre-pí-ita",
             "ampere": "one#{n} ampere|#{n} ampere-ita",
             "arc-minute": "one#{n} mirapara minutu|#{n} mirapara minutu-ita",
             "arc-second": "one#{n} mirapara segũdu|#{n} mirapara segũdu-ita",
             "astronomical-unit": "one#{n} yepesawa iwakasara|#{n} yepesawa iwakasara-ita",
             "atmosphere": "one#{n} yãgasawa|#{n} yãgasawa-ita",
-            "bar": "one#{n} bar|#{n} bar-ita",
+            "bar": "#{n} bar-ita",
             "barrel": "one#{n} bariu|#{n} bariu-ita",
-            "bit": "one#{n} bit|#{n} bit-ita",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit-ita",
             "bit-per-second": "#{n} bit-ita segũdu rupi",
             "british-thermal-unit": "one#{n} yepesawa sakusawa biritãnika|#{n} yepesawa sakusawa biritãnika-ita",
             "bushel": "#{n} bu",
-            "byte": "one#{n} byte|#{n} byte-ita",
+            "byte": "#{n} byte-ita",
             "byte-per-hour": "#{n} byte-ita hura rupi",
             "byte-per-second": "#{n} byte-ita segũdu rupi",
             "calorie": "one#{n} karuria|#{n} karuria-ita",
@@ -35,18 +36,16 @@
             "cup": "one#{n} xikara|#{n} xikara-ita",
             "cup-metric": "one#{n} xikara métirika|#{n} xikara métirika-ita",
             "dalton": "one#{n} dalton|#{n} dalton-ita",
-            "day": "one#{n} ara|#{n} ara-ita",
+            "day": "#{n} ara-ita",
             "decade": "one#{n} dékada|#{n} dékada-ita",
             "deciliter": "one#{n} desiritru|#{n} desiritru-ita",
             "decimeter": "one#{n} desimeturu|#{n} desimeturu-ita",
             "degree": "one#{n} garau|#{n} garau-ita",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "one#{n} pitusá sẽtimeturu rupi|#{n} pitusá-ita sẽtimeturu rupi",
-            "dot-per-inch": "one#{n} pitusá puregada rupi|#{n} pitusá-ita puregada rupi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
-            "dunam": "one#{n} dunan|#{n} dunan-ita",
+            "dunam": "#{n} dunan-ita",
             "earth-mass": "one#{n} iwí susuẽga|#{n} iwí susuẽga-ita",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "one#{n} elétron-volt|#{n} elétron-volt-ita",
@@ -55,8 +54,7 @@
             "fathom": "one#{n} barasa|#{n} barasa-ita",
             "fluid-ounce": "one#{n} iauareté fruida|#{n} iauareté fruida-ita",
             "fluid-ounce-imperial": "one#{n} iauareté fruida ĩperiawa|#{n} iauareté fruida ĩperiawa-ita",
-            "foodcalorie": "one#{n} Karuria|#{n} Karuria-ita",
-            "foot": "one#{n} pí|#{n} pí-ita",
+            "foot": "#{n} pí-ita",
             "foot-per-second": "#{n} pí-ita segũdu rupi",
             "furlong": "one#{n} furlong|#{n} furlong-ita",
             "g-force": "one#{n} kirĩba g|#{n} kirĩba g-ita",
@@ -102,8 +100,8 @@
             "kilowatt": "one#{n} kiruwatt|#{n} kiruwatt-ita",
             "kilowatt-hour": "one#{n} kiruwatt-hura|#{n} kiruwatt-hura-ita",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
-            "knot": "one#{n} kitanga|#{n} kitanga-ita",
-            "light-year": "one#{n} akayú-werawa|#{n} akayú-werawa-ita",
+            "knot": "#{n} kitanga-ita",
+            "light-year": "#{n} akayú-werawa-ita",
             "liter": "one#{n} irerú-pukú|#{n} irerú-pukú-ita",
             "liter-per-100-kilometer": "one#{n} irerú-pukú 100 apekatusawa rupi|#{n} irerú-pukú-ita 100 apekatusawa rupi",
             "liter-per-kilometer": "one#{n} irerú-pukú-ita apekatusawa rupi|#{n} irerú-pukú apekatusawa rupi",
@@ -142,8 +140,8 @@
             "millisecond": "one#{n} mirisegũdu-ita|#{n} mirisegũdu rupi",
             "milliwatt": "one#{n} miriwatt|#{n} miriwatt-ita",
             "minute": "one#{n} minutu|#{n} minutu-ita",
-            "mole": "one#{n} mol|#{n} mol-ita",
-            "month": "one#{n} yasí|#{n} yasí-ita",
+            "mole": "#{n} mol-ita",
+            "month": "#{n} yasí-ita",
             "nanometer": "one#{n} nanumeturu|#{n} nanumeturu-ita",
             "nanosecond": "one#{n} nanusegũdu|#{n} nanusegũdu-ita",
             "nautical-mile": "one#{n} milla paranãuara|#{n} milla paranãuara-ita",
@@ -203,7 +201,7 @@
             "watt": "one#{n} watt|#{n} watt-ita",
             "week": "one#{n} sẽmãna|#{n} sẽmãna-ita",
             "yard": "one#{n} jarda|#{n} jarda-ita",
-            "year": "one#{n} akayú|#{n} akayú-ita"
+            "year": "#{n} akayú-ita"
         },
         "short": {
             "acre": "#{n} ac",
@@ -215,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -247,8 +246,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunan",
@@ -260,7 +257,6 @@
             "fathom": "#{n} brs.",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} cal",
             "foot": "#{n} pí",
             "foot-per-second": "#{n} pí/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/yrl/ctrynames.json b/js/data/locale/yrl/ctrynames.json
index 1453c434eb..f3ae63cbe4 100644
--- a/js/data/locale/yrl/ctrynames.json
+++ b/js/data/locale/yrl/ctrynames.json
@@ -49,8 +49,8 @@
     "Beujika": "BE",
     "Bidiresiunaurana": "XB",
     "Bieru-rúsiya": "BY",
-    "Biritãniku Usuasawa Useyanu Ĩdiku": "IO",
     "Brasiu": "BR",
+    "British Indian Ocean Territory": "IO",
     "Bugáriya": "BG",
     "Bukina Fasu": "BF",
     "Buríwia": "BO",
diff --git a/js/data/locale/yrl/ctryreverse.json b/js/data/locale/yrl/ctryreverse.json
index ee3037d3ff..305d050608 100644
--- a/js/data/locale/yrl/ctryreverse.json
+++ b/js/data/locale/yrl/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "Isirayeu",
     "IM": "Mã Kapuãma",
     "IN": "Ĩdiya",
-    "IO": "Biritãniku Usuasawa Useyanu Ĩdiku",
+    "IO": "British Indian Ocean Territory",
     "IQ": "Iraki",
     "IR": "Irã",
     "IS": "Isirãdiya",
diff --git a/js/data/locale/yrl/sysres.json b/js/data/locale/yrl/sysres.json
index ec82abad06..b8d37eb0b8 100644
--- a/js/data/locale/yrl/sysres.json
+++ b/js/data/locale/yrl/sysres.json
@@ -6,10 +6,10 @@
     "#in {num}s": "one#{num} seg. resê|#{num} seg. resê itá",
     "#in {num}w": "one#{num} sẽm. resê|#{num} sẽm. itá resê",
     "#in {num}y": "one#{num} akayú resê|#{num} akayú itá resê",
-    "#{num} ms": "one#{num} ms|#{num} ms",
-    "#{num}d": "one#{num} ara|#{num} ara",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} ara",
     "#{num}d ago": "one#aikué {num} ara|#aikué {num} ara itá",
-    "#{num}h": "one#{num} h|#{num} h",
+    "#{num}h": "#{num} h",
     "#{num}h ago": "one#aikué {num} h|#aikué {num} h itá",
     "#{num}mi ago": "one#aikué {num} min.|#aikué {num} min. itá",
     "#{num}mo ago": "one#aikué {num} yasí|#aikué {num} yasí itá",
@@ -17,40 +17,40 @@
     "#{num}s ago": "one#aikué {num} seg.|#aikué {num} seg. itá",
     "#{num}w": "one#{num} sem.|#{num} sem",
     "#{num}w ago": "one#aikué {num} sẽm.|#aikué {num} sẽm. itá",
-    "#{num}y": "one#{num} akayú|#{num} akayú",
+    "#{num}y": "#{num} akayú",
     "#{num}y ago": "one#aikué {num} akayú|#aikué {num} akayú itá",
     "1#1 day ago|#{num} days ago": "one#aikué {num} ara|#aikué {num} ara itá",
-    "1#1 day|#{num} days": "one#{num} ara|#{num} ara-ita",
+    "1#1 day|#{num} days": "#{num} ara-ita",
     "1#1 dy ago|#{num} dys ago": "one#aikué {num} ara|#aikué {num} ara itá",
-    "1#1 dy|#{num} dys": "one#{num} ara|#{num} ara",
+    "1#1 dy|#{num} dys": "#{num} ara",
     "1#1 hour ago|#{num} hours ago": "one#aikué {num} hura|#aikué {num} hura itá",
     "1#1 hour|#{num} hours": "one#{num} hura|#{num} hura-ita",
     "1#1 hr ago|#{num} hrs ago": "one#aikué {num} hura|#aikué {num} hura itá",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "1#1 millisecond|#{num} milliseconds": "one#{num} mirisegũdu-ita|#{num} mirisegũdu rupi",
     "1#1 min ago|#{num} min ago": "one#aikué {num} minutu|#aikué {num} minutu itá",
     "1#1 minute ago|#{num} minutes ago": "one#aikué {num} minutu|#aikué {num} minutu itá",
     "1#1 minute|#{num} minutes": "one#{num} minutu|#{num} minutu-ita",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "1#1 mon ago|#{num} mons ago": "one#aikué {num} yasí|#aikué {num} yasí itá",
     "1#1 month ago|#{num} months ago": "one#aikué {num} yasí|#aikué {num} yasí itá",
-    "1#1 month|#{num} months": "one#{num} yasí|#{num} yasí-ita",
-    "1#1 mon|#{num} mons": "one#{num} yasí|#{num} yasí",
-    "1#1 mo|#{num} mos": "one#{num} yasí|#{num} yasí",
+    "1#1 month|#{num} months": "#{num} yasí-ita",
+    "1#1 mon|#{num} mons": "#{num} yasí",
+    "1#1 mo|#{num} mos": "#{num} yasí",
     "1#1 sec ago|#{num} sec ago": "one#aikué {num} segũdu|#aikué {num} segũdu itá",
     "1#1 second ago|#{num} seconds ago": "one#aikué {num} segũdu|#aikué {num} segũdu itá",
     "1#1 second|#{num} seconds": "one#{num} segũdu|#{num} segũdu-ita",
-    "1#1 sec|#{num} sec": "one#{num} seg|#{num} seg",
+    "1#1 sec|#{num} sec": "#{num} seg",
     "1#1 se|#{num} sec": "one#{num} s|#{num} s",
     "1#1 week ago|#{num} weeks ago": "one#aikué {num} sẽmãna|#aikué {num} sẽmãna itá",
     "1#1 week|#{num} weeks": "one#{num} sẽmãna|#{num} sẽmãna-ita",
     "1#1 wk ago|#{num} wks ago": "one#aikué {num} sẽmãna|#aikué {num} sẽmãna itá",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sem",
     "1#1 year ago|#{num} years ago": "one#aikué {num} akayú|#aikué {num} akayú itá",
-    "1#1 year|#{num} years": "one#{num} akayú|#{num} akayú-ita",
+    "1#1 year|#{num} years": "#{num} akayú-ita",
     "1#1 yr ago|#{num} yrs ago": "one#aikué {num} akayú|#aikué {num} akayú itá",
-    "1#1 yr|#{num} yrs": "one#{num} akayú|#{num} akayú",
+    "1#1 yr|#{num} yrs": "#{num} akayú",
     "1#in 1 day|#in {num} days": "one#{num} ara resê|#{num} ara itá resê",
     "1#in 1 dy|#in {num} dys": "one#{num} ara resê|#{num} ara itá resê",
     "1#in 1 hour|#in {num} hours": "one#{num} hura resê|#{num} hura resê itá",
@@ -149,14 +149,14 @@
     "NN7": "pm",
     "NN8": "ps",
     "NN9": "pi",
-    "durationLongDays": "one#{num} ara|#{num} ara",
-    "durationMediumHours": "one#{num} h|#{num} h",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationLongDays": "#{num} ara",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} sem.|#{num} sem",
-    "durationMediumYears": "one#{num} akayú|#{num} akayú",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "durationShortMinutes": "one#{num} min|#{num} min",
-    "durationShortMonths": "one#{num} yasí|#{num} yasí",
+    "durationMediumYears": "#{num} akayú",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} yasí",
     "finalSeparatorFull": " asuí ",
     "finalSeparatorLong": " asuí ",
     "finalSeparatorMedium": " asuí ",
diff --git a/js/data/locale/yrl/unitfmt.json b/js/data/locale/yrl/unitfmt.json
index 54d3f216e6..9e4970e582 100644
--- a/js/data/locale/yrl/unitfmt.json
+++ b/js/data/locale/yrl/unitfmt.json
@@ -2,19 +2,20 @@
     "unitfmt": {
         "long": {
             "acre": "one#{n} acre|#{n} acre-ita",
-            "acre-foot": "one#{n} acre-pí|#{n} acre-pí-ita",
+            "acre-foot": "#{n} acre-pí-ita",
             "ampere": "one#{n} ampere|#{n} ampere-ita",
             "arc-minute": "one#{n} mirapara minutu|#{n} mirapara minutu-ita",
             "arc-second": "one#{n} mirapara segũdu|#{n} mirapara segũdu-ita",
             "astronomical-unit": "one#{n} yepesawa iwakasara|#{n} yepesawa iwakasara-ita",
             "atmosphere": "one#{n} yãgasawa|#{n} yãgasawa-ita",
-            "bar": "one#{n} bar|#{n} bar-ita",
+            "bar": "#{n} bar-ita",
             "barrel": "one#{n} bariu|#{n} bariu-ita",
-            "bit": "one#{n} bit|#{n} bit-ita",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit-ita",
             "bit-per-second": "#{n} bit-ita segũdu rupi",
             "british-thermal-unit": "one#{n} yepesawa sakusawa biritãnika|#{n} yepesawa sakusawa biritãnika-ita",
             "bushel": "#{n} bu",
-            "byte": "one#{n} byte|#{n} byte-ita",
+            "byte": "#{n} byte-ita",
             "byte-per-hour": "#{n} byte-ita hura rupi",
             "byte-per-second": "#{n} byte-ita segũdu rupi",
             "calorie": "one#{n} karuria|#{n} karuria-ita",
@@ -35,18 +36,16 @@
             "cup": "one#{n} xikara|#{n} xikara-ita",
             "cup-metric": "one#{n} xikara métirika|#{n} xikara métirika-ita",
             "dalton": "one#{n} dalton|#{n} dalton-ita",
-            "day": "one#{n} ara|#{n} ara-ita",
+            "day": "#{n} ara-ita",
             "decade": "one#{n} dékada|#{n} dékada-ita",
             "deciliter": "one#{n} desiritru|#{n} desiritru-ita",
             "decimeter": "one#{n} desimeturu|#{n} desimeturu-ita",
             "degree": "one#{n} garau|#{n} garau-ita",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "one#{n} pitusá sẽtimeturu rupi|#{n} pitusá-ita sẽtimeturu rupi",
-            "dot-per-inch": "one#{n} pitusá puregada rupi|#{n} pitusá-ita puregada rupi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
-            "dunam": "one#{n} dunan|#{n} dunan-ita",
+            "dunam": "#{n} dunan-ita",
             "earth-mass": "one#{n} iwí susuẽga|#{n} iwí susuẽga-ita",
             "earth-radius": "#{n} R⊕",
             "electronvolt": "one#{n} elétron-volt|#{n} elétron-volt-ita",
@@ -55,8 +54,7 @@
             "fathom": "one#{n} barasa|#{n} barasa-ita",
             "fluid-ounce": "one#{n} iauareté fruida|#{n} iauareté fruida-ita",
             "fluid-ounce-imperial": "one#{n} iauareté fruida ĩperiawa|#{n} iauareté fruida ĩperiawa-ita",
-            "foodcalorie": "one#{n} Karuria|#{n} Karuria-ita",
-            "foot": "one#{n} pí|#{n} pí-ita",
+            "foot": "#{n} pí-ita",
             "foot-per-second": "#{n} pí-ita segũdu rupi",
             "furlong": "one#{n} furlong|#{n} furlong-ita",
             "g-force": "one#{n} kirĩba g|#{n} kirĩba g-ita",
@@ -102,8 +100,8 @@
             "kilowatt": "one#{n} kiruwatt|#{n} kiruwatt-ita",
             "kilowatt-hour": "one#{n} kiruwatt-hura|#{n} kiruwatt-hura-ita",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
-            "knot": "one#{n} kitanga|#{n} kitanga-ita",
-            "light-year": "one#{n} akayú-werawa|#{n} akayú-werawa-ita",
+            "knot": "#{n} kitanga-ita",
+            "light-year": "#{n} akayú-werawa-ita",
             "liter": "one#{n} irerú-pukú|#{n} irerú-pukú-ita",
             "liter-per-100-kilometer": "one#{n} irerú-pukú 100 apekatusawa rupi|#{n} irerú-pukú-ita 100 apekatusawa rupi",
             "liter-per-kilometer": "one#{n} irerú-pukú-ita apekatusawa rupi|#{n} irerú-pukú apekatusawa rupi",
@@ -142,8 +140,8 @@
             "millisecond": "one#{n} mirisegũdu-ita|#{n} mirisegũdu rupi",
             "milliwatt": "one#{n} miriwatt|#{n} miriwatt-ita",
             "minute": "one#{n} minutu|#{n} minutu-ita",
-            "mole": "one#{n} mol|#{n} mol-ita",
-            "month": "one#{n} yasí|#{n} yasí-ita",
+            "mole": "#{n} mol-ita",
+            "month": "#{n} yasí-ita",
             "nanometer": "one#{n} nanumeturu|#{n} nanumeturu-ita",
             "nanosecond": "one#{n} nanusegũdu|#{n} nanusegũdu-ita",
             "nautical-mile": "one#{n} milha paranãuara|#{n} milha paranãuara-ita",
@@ -203,7 +201,7 @@
             "watt": "one#{n} watt|#{n} watt-ita",
             "week": "one#{n} sẽmãna|#{n} sẽmãna-ita",
             "yard": "one#{n} jarda|#{n} jarda-ita",
-            "year": "one#{n} akayú|#{n} akayú-ita"
+            "year": "#{n} akayú-ita"
         },
         "short": {
             "acre": "#{n} ac",
@@ -215,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} BTU",
@@ -247,8 +246,6 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunan",
@@ -260,7 +257,6 @@
             "fathom": "#{n} brs.",
             "fluid-ounce": "#{n} fl oz",
             "fluid-ounce-imperial": "#{n} fl oz Imp.",
-            "foodcalorie": "#{n} cal",
             "foot": "#{n} pí",
             "foot-per-second": "#{n} pí/s",
             "furlong": "#{n} fur",
diff --git a/js/data/locale/yue/Hans/unitfmt.json b/js/data/locale/yue/Hans/unitfmt.json
index 1d08713384..eef630344c 100644
--- a/js/data/locale/yue/Hans/unitfmt.json
+++ b/js/data/locale/yue/Hans/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福氏风级 {n} 级",
             "bit": "#{n} bit",
             "bit-per-second": "#每秒 {n} bit",
             "british-thermal-unit": "#{n} 英制热量单位",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福氏风级 {n} 级",
             "bit": "#{n} bit",
             "bit-per-second": "#每秒{n} bit",
             "british-thermal-unit": "#{n} 英制热量单位",
diff --git a/js/data/locale/yue/unitfmt.json b/js/data/locale/yue/unitfmt.json
index 39ee2ad320..eda7d2e003 100644
--- a/js/data/locale/yue/unitfmt.json
+++ b/js/data/locale/yue/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福氏風級 {n} 級",
             "bit": "#{n} bit",
             "bit-per-second": "#每秒 {n} bit",
             "british-thermal-unit": "#{n} 英制熱量單位",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福氏風級 {n} 級",
             "bit": "#{n} bit",
             "bit-per-second": "#每秒{n} bit",
             "british-thermal-unit": "#{n} 英制熱量單位",
@@ -249,8 +251,8 @@
             "dessert-spoon": "#{n}甜品匙",
             "dessert-spoon-imperial": "#{n}英制甜品匙",
             "dot": "#{n} 個圓點",
-            "dot-per-centimeter": "#{n} 點/厘米",
-            "dot-per-inch": "#{n} 點/吋",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n}英制液量打蘭",
             "drop": "#{n}滴",
             "dunam": "#{n} 德南",
@@ -372,7 +374,7 @@
             "pint-metric": "#{n} 公制品脫",
             "pixel": "#{n} 像素",
             "pixel-per-centimeter": "#{n} 像素/厘米",
-            "pixel-per-inch": "#{n} 像素/吋",
+            "pixel-per-inch": "#{n} ppi",
             "point": "#{n} 點",
             "pound": "#{n} 磅",
             "pound-force": "#{n} 磅力",
diff --git a/js/data/locale/sms/ctrynames.json b/js/data/locale/za/ctrynames.json
similarity index 99%
rename from js/data/locale/sms/ctrynames.json
rename to js/data/locale/za/ctrynames.json
index 3cf0212256..f70db430b3 100644
--- a/js/data/locale/sms/ctrynames.json
+++ b/js/data/locale/za/ctrynames.json
@@ -55,7 +55,6 @@
     "Ceuta & Melilla": "EA",
     "Chad": "TD",
     "Chile": "CL",
-    "China": "CN",
     "Christmas Island": "CX",
     "Clipperton Island": "CP",
     "Cocos (Keeling) Islands": "CC",
@@ -68,6 +67,7 @@
     "Côte d’Ivoire": "CI",
     "Croatia": "HR",
     "Cuba": "CU",
+    "Cunghgoz": "CN",
     "Curaçao": "CW",
     "Cyprus": "CY",
     "Czechia": "CZ",
@@ -218,6 +218,7 @@
     "Samoa": "WS",
     "San Marino": "SM",
     "São Tomé & Príncipe": "ST",
+    "Sark": "CQ",
     "Saudi Arabia": "SA",
     "Senegal": "SN",
     "Serbia": "RS",
@@ -265,7 +266,7 @@
     "Trinidad & Tobago": "TT",
     "Tristan da Cunha": "TA",
     "Tunisia": "TN",
-    "Turkey": "TR",
+    "Türkiye": "TR",
     "Turkmenistan": "TM",
     "Turks & Caicos Islands": "TC",
     "Tuvalu": "TV",
diff --git a/js/data/locale/frr/ctryreverse.json b/js/data/locale/za/ctryreverse.json
similarity index 99%
rename from js/data/locale/frr/ctryreverse.json
rename to js/data/locale/za/ctryreverse.json
index 1a338682b8..417a13947b 100644
--- a/js/data/locale/frr/ctryreverse.json
+++ b/js/data/locale/za/ctryreverse.json
@@ -78,9 +78,10 @@
     "CK": "Cook Islands",
     "CL": "Chile",
     "CM": "Cameroon",
-    "CN": "China",
+    "CN": "Cunghgoz",
     "CO": "Colombia",
     "CP": "Clipperton Island",
+    "CQ": "Sark",
     "CR": "Costa Rica",
     "CU": "Cuba",
     "CV": "Cape Verde",
@@ -263,7 +264,7 @@
     "TM": "Turkmenistan",
     "TN": "Tunisia",
     "TO": "Tonga",
-    "TR": "Turkey",
+    "TR": "Türkiye",
     "TT": "Trinidad & Tobago",
     "TV": "Tuvalu",
     "TW": "Taiwan",
diff --git a/js/data/locale/za/dateformats.json b/js/data/locale/za/dateformats.json
new file mode 100644
index 0000000000..97a8977cbb
--- /dev/null
+++ b/js/data/locale/za/dateformats.json
@@ -0,0 +1,133 @@
+{
+    "gregorian": {
+        "date": {
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "MM-dd"
+            },
+            "dmw": {
+                "f": "MMMM d, EEEE",
+                "l": "MMMM d, EEE",
+                "m": "MMM d, EE",
+                "s": "MM-dd, E"
+            },
+            "dmwy": {
+                "f": "yyyy MMMM d, EEEE",
+                "l": "yyyy MMMM d, EEE",
+                "m": "yyyy MMM d, EE",
+                "s": "yyyy-MM-dd, E"
+            },
+            "dmy": {
+                "f": "yyyy MMMM d",
+                "l": "yyyy MMMM d",
+                "m": "yyyy MMM d",
+                "s": "yyyy-MM-dd"
+            },
+            "dw": {
+                "f": "d, EEEE",
+                "l": "d, EEE",
+                "m": "d, EE",
+                "s": "dd, E"
+            },
+            "m": {
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "my": {
+                "f": "yyyy MMMM",
+                "l": "yyyy MMMM",
+                "m": "yyyy MMM",
+                "s": "yyyy-MM"
+            },
+            "y": {
+                "s": "yyyy"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sy} {sm} {sd} {st} – {et}",
+                "l": "{sy} {sm} {sd} {st} – {et}",
+                "m": "{sy} {sm} {sd} {st} – {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c02": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c03": {
+                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+            },
+            "c10": {
+                "f": "{sy} {sm} {sd} – {ed}",
+                "l": "{sy} {sm} {sd} – {ed}",
+                "m": "{sy} {sm} {sd} – {ed}",
+                "s": "{sy}-{sm}-{sd} – {ed}"
+            },
+            "c11": {
+                "f": "{sy} {sm} {sd} – {em} {ed}",
+                "l": "{sy} {sm} {sd} – {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c12": {
+                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+            },
+            "c20": {
+                "f": "{sy} {sm} – {ey} {em}",
+                "l": "{sy} {sm} – {ey} {em}",
+                "m": "{sy} {sm} – {ey} {em}",
+                "s": "{sy}-{sm} – {ey}-{em}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        },
+        "time": {
+            "12": {
+                "ah": "h a",
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            },
+            "24": {
+                "ah": "HH",
+                "ahm": "HH:mm",
+                "ahms": "HH:mm:ss",
+                "ahmsz": "HH:mm:ss z",
+                "ahmz": "HH:mm z",
+                "h": "HH",
+                "hm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "hmz": "HH:mm z"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/za/sysres.json b/js/data/locale/za/sysres.json
new file mode 100644
index 0000000000..8862196307
--- /dev/null
+++ b/js/data/locale/za/sysres.json
@@ -0,0 +1,153 @@
+{
+    "#in {num}d": "#+{num} d",
+    "#in {num}h": "#+{num} h",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}s": "#+{num} s",
+    "#in {num}w": "#+{num} w",
+    "#in {num}y": "#+{num} y",
+    "#{num} ms": "#{num} ms",
+    "#{num}d": "#{num} d",
+    "#{num}d ago": "#-{num} d",
+    "#{num}h": "#{num} h",
+    "#{num}h ago": "#-{num} h",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}s": "#{num} s",
+    "#{num}s ago": "#-{num} s",
+    "#{num}w": "#{num} w",
+    "#{num}w ago": "#-{num} w",
+    "#{num}y": "#{num} y",
+    "#{num}y ago": "#-{num} y",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 day|#{num} days": "#{num} d",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 dy|#{num} dys": "#{num} d",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 hour|#{num} hours": "#{num} h",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 hr|#{num} hrs": "#{num} h",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 minute|#{num} minutes": "#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 month|#{num} months": "#{num} m",
+    "1#1 mon|#{num} mons": "#{num} m",
+    "1#1 mo|#{num} mos": "#{num} m",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 second|#{num} seconds": "#{num} s",
+    "1#1 sec|#{num} sec": "#{num} s",
+    "1#1 se|#{num} sec": "#{num} s",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 week|#{num} weeks": "#{num} w",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 wk|#{num} wks": "#{num} w",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 year|#{num} years": "#{num} y",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "EE0": "ngoenzsinghgiz",
+    "EE1": "singhgizit",
+    "EE2": "singhgizngeih",
+    "EE3": "singhgizsam",
+    "EE4": "singhgizseiq",
+    "EE5": "singhgizhaj",
+    "EE6": "singhgizroek",
+    "EEE0": "ngoenzsinghgiz",
+    "EEE1": "singhgizit",
+    "EEE2": "singhgizngeih",
+    "EEE3": "singhgizsam",
+    "EEE4": "singhgizseiq",
+    "EEE5": "singhgizhaj",
+    "EEE6": "singhgizroek",
+    "EEEE0": "ngoenzsinghgiz",
+    "EEEE1": "singhgizit",
+    "EEEE2": "singhgizngeih",
+    "EEEE3": "singhgizsam",
+    "EEEE4": "singhgizseiq",
+    "EEEE5": "singhgizhaj",
+    "EEEE6": "singhgizroek",
+    "MMM1": "ndwenit",
+    "MMM10": "ndwencib",
+    "MMM11": "ndwencib’it",
+    "MMM12": "ndwencibngeih",
+    "MMM2": "ndwenngeih",
+    "MMM3": "ndwensam",
+    "MMM4": "ndwenseiq",
+    "MMM5": "ndwenngux",
+    "MMM6": "ndwenloeg",
+    "MMM7": "ndwencaet",
+    "MMM8": "ndwenbet",
+    "MMM9": "ndwengouj",
+    "MMMM1": "ndwenit",
+    "MMMM10": "ndwencib",
+    "MMMM11": "ndwencib’it",
+    "MMMM12": "ndwencibngeih",
+    "MMMM2": "ndwenngeih",
+    "MMMM3": "ndwensam",
+    "MMMM4": "ndwenseiq",
+    "MMMM5": "ndwenngux",
+    "MMMM6": "ndwenloeg",
+    "MMMM7": "ndwencaet",
+    "MMMM8": "ndwenbet",
+    "MMMM9": "ndwengouj",
+    "N1": "n",
+    "N10": "n",
+    "N11": "n",
+    "N12": "n",
+    "N2": "n",
+    "N3": "n",
+    "N4": "n",
+    "N5": "n",
+    "N6": "n",
+    "N7": "n",
+    "N8": "n",
+    "N9": "n",
+    "NN1": "nd",
+    "NN10": "nd",
+    "NN11": "nd",
+    "NN12": "nd",
+    "NN2": "nd",
+    "NN3": "nd",
+    "NN4": "nd",
+    "NN5": "nd",
+    "NN6": "nd",
+    "NN7": "nd",
+    "NN8": "nd",
+    "NN9": "nd",
+    "a0": "banhaet",
+    "a1": "banringzgvaq",
+    "durationLongDays": "#{num} d",
+    "durationMediumHours": "#{num} h",
+    "durationMediumMillis": "#{num} ms",
+    "durationMediumWeeks": "#{num} w",
+    "durationMediumYears": "#{num} y",
+    "durationShortMillis": "#{num} ms",
+    "durationShortMinutes": "#{num} min",
+    "durationShortMonths": "#{num} m",
+    "finalSeparatorFull": ", ",
+    "finalSeparatorLong": ", ",
+    "finalSeparatorMedium": ", ",
+    "finalSeparatorShort": ", ",
+    "separatorMedium": ", ",
+    "separatorShort": ", "
+}
\ No newline at end of file
diff --git a/js/data/locale/za/unitfmt.json b/js/data/locale/za/unitfmt.json
new file mode 100644
index 0000000000..eb12322e2c
--- /dev/null
+++ b/js/data/locale/za/unitfmt.json
@@ -0,0 +1,410 @@
+{
+    "unitfmt": {
+        "long": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        },
+        "short": {
+            "acre": "#{n} ac",
+            "acre-foot": "#{n} ac ft",
+            "ampere": "#{n} A",
+            "arc-minute": "#{n}′",
+            "arc-second": "#{n}″",
+            "astronomical-unit": "#{n} au",
+            "atmosphere": "#{n} atm",
+            "bar": "#{n} bar",
+            "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
+            "bit": "#{n} bit",
+            "bit-per-second": "#{n} bit/s",
+            "british-thermal-unit": "#{n} Btu",
+            "bushel": "#{n} bu",
+            "byte": "#{n} byte",
+            "byte-per-hour": "#{n} byte/h",
+            "byte-per-second": "#{n} byte/s",
+            "calorie": "#{n} cal",
+            "candela": "#{n} cd",
+            "carat": "#{n} CD",
+            "celsius": "#{n}°C",
+            "centiliter": "#{n} cL",
+            "centimeter": "#{n} cm",
+            "century": "#{n} c",
+            "coordinateUnit": "",
+            "cubic-centimeter": "#{n} cm³",
+            "cubic-foot": "#{n} ft³",
+            "cubic-inch": "#{n} in³",
+            "cubic-kilometer": "#{n} km³",
+            "cubic-meter": "#{n} m³",
+            "cubic-mile": "#{n} mi³",
+            "cubic-yard": "#{n} yd³",
+            "cup": "#{n} c",
+            "cup-metric": "#{n} mc",
+            "dalton": "#{n} Da",
+            "day": "#{n} d",
+            "decade": "#{n} dec",
+            "deciliter": "#{n} dL",
+            "decimeter": "#{n} dm",
+            "degree": "#{n}°",
+            "dessert-spoon": "#{n} dstspn",
+            "dessert-spoon-imperial": "#{n} dstspn Imp",
+            "dram": "#{n} dram fl",
+            "drop": "#{n} drop",
+            "dunam": "#{n} dunam",
+            "earth-mass": "#{n} M⊕",
+            "earth-radius": "#{n} R⊕",
+            "electronvolt": "#{n} eV",
+            "em": "#{n} em",
+            "fahrenheit": "#{n}°F",
+            "fathom": "#{n} fth",
+            "fluid-ounce": "#{n} fl oz US",
+            "fluid-ounce-imperial": "#{n} fl oz Imp.",
+            "foot": "#{n} ft",
+            "foot-per-second": "#{n} ft/s",
+            "furlong": "#{n} fur",
+            "g-force": "#{n} G",
+            "gallon": "#{n} gal US",
+            "gallon-imperial": "#{n} gal Imp.",
+            "generic": "#{n}°",
+            "gigabit": "#{n} Gb",
+            "gigabit-per-second": "#{n} Gb/s",
+            "gigabyte": "#{n} GB",
+            "gigabyte-per-hour": "#{n} GB/h",
+            "gigabyte-per-second": "#{n} GB/s",
+            "gigahertz": "#{n} GHz",
+            "gigawatt": "#{n} GW",
+            "grain": "#{n} grain",
+            "gram": "#{n} g",
+            "hectare": "#{n} ha",
+            "hectoliter": "#{n} hL",
+            "hectopascal": "#{n} hPa",
+            "hertz": "#{n} Hz",
+            "horsepower": "#{n} hp",
+            "hour": "#{n} h",
+            "inch": "#{n} in",
+            "inch-ofhg": "#{n} inHg",
+            "item": "#{n} item",
+            "jigger": "#{n} jigger",
+            "joule": "#{n} J",
+            "karat": "#{n} kt",
+            "kelvin": "#{n} K",
+            "kilobit": "#{n} kb",
+            "kilobit-per-second": "#{n} kb/s",
+            "kilobyte": "#{n} kB",
+            "kilobyte-per-hour": "#{n} kB/h",
+            "kilobyte-per-second": "#{n} kB/s",
+            "kilocalorie": "#{n} kcal",
+            "kilogram": "#{n} kg",
+            "kilohertz": "#{n} kHz",
+            "kilojoule": "#{n} kJ",
+            "kilometer": "#{n} km",
+            "kilometer-per-hour": "#{n} km/h",
+            "kilometer-per-liter": "#{n} km/l",
+            "kilometer-per-second": "#{n} km/s",
+            "kilopascal": "#{n} kPa",
+            "kilowatt": "#{n} kW",
+            "kilowatt-hour": "#{n} kWh",
+            "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
+            "knot": "#{n} kn",
+            "light-year": "#{n} ly",
+            "liter": "#{n} l",
+            "liter-per-100-kilometer": "#{n} L/100km",
+            "liter-per-kilometer": "#{n} L/km",
+            "lumen": "#{n} lm",
+            "lux": "#{n} lx",
+            "megabit": "#{n} Mb",
+            "megabit-per-second": "#{n} Mb/s",
+            "megabyte": "#{n} MB",
+            "megabyte-per-hour": "#{n} MB/h",
+            "megabyte-per-second": "#{n} MB/s",
+            "megahertz": "#{n} MHz",
+            "megaliter": "#{n} ML",
+            "megapascal": "#{n} MPa",
+            "megapixel": "#{n} MP",
+            "megawatt": "#{n} MW",
+            "meter": "#{n} m",
+            "meter-per-second": "#{n} m/s",
+            "meter-per-square-second": "#{n} m/s²",
+            "microgram": "#{n} μg",
+            "micrometer": "#{n} μm",
+            "microsecond": "#{n} μs",
+            "mile": "#{n} mi",
+            "mile-per-gallon": "#{n} mpg US",
+            "mile-per-gallon-imperial": "#{n} mpg Imp.",
+            "mile-per-hour": "#{n} mi/h",
+            "mile-per-second": "#{n} mi/s",
+            "mile-scandinavian": "#{n} smi",
+            "milliampere": "#{n} mA",
+            "millibar": "#{n} mbar",
+            "milligram": "#{n} mg",
+            "milligram-ofglucose-per-deciliter": "#{n} mg/dL",
+            "milliliter": "#{n} mL",
+            "millimeter": "#{n} mm",
+            "millimeter-ofhg": "#{n} mm Hg",
+            "millimole-per-liter": "#{n} mmol/L",
+            "millisecond": "#{n} ms",
+            "milliwatt": "#{n} mW",
+            "minute": "#{n} min",
+            "mole": "#{n} mol",
+            "month": "#{n} m",
+            "nanometer": "#{n} nm",
+            "nanosecond": "#{n} ns",
+            "nautical-mile": "#{n} nmi",
+            "newton": "#{n} N",
+            "newton-meter": "#{n} N⋅m",
+            "ohm": "#{n} Ω",
+            "ounce": "#{n} oz",
+            "ounce-troy": "#{n} oz t",
+            "parsec": "#{n} pc",
+            "pascal": "#{n} Pa",
+            "percent": "#{n}%",
+            "permille": "#{n}‰",
+            "permillion": "#{n} ppm",
+            "permyriad": "#{n}‱",
+            "petabyte": "#{n} PB",
+            "picometer": "#{n} pm",
+            "pinch": "#{n} pinch",
+            "pint": "#{n} pt",
+            "pint-metric": "#{n} mpt",
+            "pixel": "#{n} px",
+            "pixel-per-centimeter": "#{n} ppcm",
+            "pixel-per-inch": "#{n} ppi",
+            "point": "#{n} pt",
+            "pound": "#{n} lb",
+            "pound-force": "#{n} lbf",
+            "pound-force-foot": "#{n} lbf⋅ft",
+            "pound-force-per-square-inch": "#{n} psi",
+            "quart": "#{n} qt",
+            "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
+            "radian": "#{n} rad",
+            "revolution": "#{n} rev",
+            "second": "#{n} s",
+            "short-ton": "#{n} tn",
+            "solar-luminosity": "#{n} L☉",
+            "solar-mass": "#{n} M☉",
+            "solar-radius": "#{n} R☉",
+            "square-centimeter": "#{n} cm²",
+            "square-foot": "#{n} ft²",
+            "square-inch": "#{n} in²",
+            "square-kilometer": "#{n} km²",
+            "square-meter": "#{n} m²",
+            "square-mile": "#{n} mi²",
+            "square-yard": "#{n} yd²",
+            "stone": "#{n} st",
+            "tablespoon": "#{n} tbsp",
+            "teaspoon": "#{n} tsp",
+            "terabit": "#{n} Tb",
+            "terabit-per-second": "#{n} Tb/s",
+            "terabyte": "#{n} TB",
+            "terabyte-per-hour": "#{n} TB/h",
+            "terabyte-per-second": "#{n} TB/s",
+            "therm-us": "#{n} US therm",
+            "ton": "#{n} tn",
+            "tonne": "#{n} t",
+            "volt": "#{n} V",
+            "watt": "#{n} W",
+            "week": "#{n} w",
+            "yard": "#{n} yd",
+            "year": "#{n} y"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/zgh/ctrynames.json b/js/data/locale/zgh/ctrynames.json
index bb37446a38..45dede9794 100644
--- a/js/data/locale/zgh/ctrynames.json
+++ b/js/data/locale/zgh/ctrynames.json
@@ -7,6 +7,7 @@
     "Asia": "142",
     "Australasia": "053",
     "Bouvet Island": "BV",
+    "British Indian Ocean Territory": "IO",
     "Canary Islands": "IC",
     "Caribbean": "029",
     "Caribbean Netherlands": "BQ",
@@ -265,7 +266,6 @@
     "ⵜⴰⴳⴷⵓⴷⴰⵏⵜ ⵜⴰⵜⵛⵉⴽⵉⵜ": "CZ",
     "ⵜⴰⴳⵍⴷⵉⵜ ⵉⵎⵓⵏⵏ": "GB",
     "ⵜⴰⴷⵊⴰⴽⵉⵙⵜⴰⵏ": "TJ",
-    "ⵜⴰⵎⵏⴰⴹⵜ ⵜⴰⵏⴳⵍⵉⵣⵉⵜ ⵏ ⵓⴳⴰⵔⵓ ⴰⵀⵉⵏⴷⵉ": "IO",
     "ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⴽⴰⴱⴱⵉⵔⴷⵉ": "CV",
     "ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⴽⴰⵢⵎⴰⵏ": "KY",
     "ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⴽⵓⴽ": "CK",
diff --git a/js/data/locale/zgh/ctryreverse.json b/js/data/locale/zgh/ctryreverse.json
index ed851b34ad..ff1c1be861 100644
--- a/js/data/locale/zgh/ctryreverse.json
+++ b/js/data/locale/zgh/ctryreverse.json
@@ -143,7 +143,7 @@
     "IL": "ⵉⵙⵔⴰⵢⵉⵍ",
     "IM": "Isle of Man",
     "IN": "ⵍⵀⵉⵏⴷ",
-    "IO": "ⵜⴰⵎⵏⴰⴹⵜ ⵜⴰⵏⴳⵍⵉⵣⵉⵜ ⵏ ⵓⴳⴰⵔⵓ ⴰⵀⵉⵏⴷⵉ",
+    "IO": "British Indian Ocean Territory",
     "IQ": "ⵍⵄⵉⵔⴰⵇ",
     "IR": "ⵉⵔⴰⵏ",
     "IS": "ⵉⵙⵍⴰⵏⴷ",
diff --git a/js/data/locale/zgh/unitfmt.json b/js/data/locale/zgh/unitfmt.json
index db7f7f31e8..eb12322e2c 100644
--- a/js/data/locale/zgh/unitfmt.json
+++ b/js/data/locale/zgh/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -212,6 +213,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
diff --git a/js/data/locale/zh/Hans/HK/unitfmt.json b/js/data/locale/zh/Hans/HK/unitfmt.json
index b4ccc1f728..a964e052e6 100644
--- a/js/data/locale/zh/Hans/HK/unitfmt.json
+++ b/js/data/locale/zh/Hans/HK/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n}个标准大气压",
             "bar": "#{n}巴",
             "barrel": "#{n}桶",
+            "beaufort": "#{n}级",
             "bit": "#{n}比特",
             "bit-per-second": "#{n}比特/秒",
             "british-thermal-unit": "#{n}英热单位",
@@ -43,7 +44,7 @@
             "dessert-spoon": "#{n}甜点匙",
             "dessert-spoon-imperial": "#{n}英制甜点匙",
             "dot": "#{n}点",
-            "dot-per-centimeter": "#{n} 点/厘米",
+            "dot-per-centimeter": "#{n}点/厘米",
             "dot-per-inch": "#{n}点/英寸",
             "dram": "#{n}打兰",
             "drop": "#{n}滴",
@@ -56,7 +57,7 @@
             "fathom": "#{n}英寻",
             "fluid-ounce": "#{n}液盎司",
             "fluid-ounce-imperial": "#{n}英制液盎司",
-            "foodcalorie": "#{n}卡路里",
+            "foodcalorie": "#{n}大卡",
             "foot": "#{n}英尺",
             "foot-per-second": "#{n}英尺/秒",
             "furlong": "#{n}弗隆",
@@ -165,8 +166,8 @@
             "pint": "#{n}品脱",
             "pint-metric": "#{n}公制品脱",
             "pixel": "#{n}像素",
-            "pixel-per-centimeter": "#{n} 像素/厘米",
-            "pixel-per-inch": "#{n} 像素/英寸",
+            "pixel-per-centimeter": "#{n}像素/厘米",
+            "pixel-per-inch": "#{n}像素/英寸",
             "point": "#{n} pt",
             "pound": "#{n}磅",
             "pound-force": "#{n}磅力",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n}桶",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/秒",
             "british-thermal-unit": "#{n}英热单位",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n}甜点匙",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
+            "dot": "#{n}点",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n}液量打兰",
@@ -262,7 +264,7 @@
             "fathom": "#{n}英寻",
             "fluid-ounce": "#{n}液盎司",
             "fluid-ounce-imperial": "#{n}英制液盎司",
-            "foodcalorie": "#{n}大卡",
+            "foodcalorie": "#{n} Cal",
             "foot": "#{n}英尺",
             "foot-per-second": "#{n}英尺/秒",
             "furlong": "#{n}弗隆",
diff --git a/js/data/locale/zh/Hans/MO/unitfmt.json b/js/data/locale/zh/Hans/MO/unitfmt.json
index b4ccc1f728..a964e052e6 100644
--- a/js/data/locale/zh/Hans/MO/unitfmt.json
+++ b/js/data/locale/zh/Hans/MO/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n}个标准大气压",
             "bar": "#{n}巴",
             "barrel": "#{n}桶",
+            "beaufort": "#{n}级",
             "bit": "#{n}比特",
             "bit-per-second": "#{n}比特/秒",
             "british-thermal-unit": "#{n}英热单位",
@@ -43,7 +44,7 @@
             "dessert-spoon": "#{n}甜点匙",
             "dessert-spoon-imperial": "#{n}英制甜点匙",
             "dot": "#{n}点",
-            "dot-per-centimeter": "#{n} 点/厘米",
+            "dot-per-centimeter": "#{n}点/厘米",
             "dot-per-inch": "#{n}点/英寸",
             "dram": "#{n}打兰",
             "drop": "#{n}滴",
@@ -56,7 +57,7 @@
             "fathom": "#{n}英寻",
             "fluid-ounce": "#{n}液盎司",
             "fluid-ounce-imperial": "#{n}英制液盎司",
-            "foodcalorie": "#{n}卡路里",
+            "foodcalorie": "#{n}大卡",
             "foot": "#{n}英尺",
             "foot-per-second": "#{n}英尺/秒",
             "furlong": "#{n}弗隆",
@@ -165,8 +166,8 @@
             "pint": "#{n}品脱",
             "pint-metric": "#{n}公制品脱",
             "pixel": "#{n}像素",
-            "pixel-per-centimeter": "#{n} 像素/厘米",
-            "pixel-per-inch": "#{n} 像素/英寸",
+            "pixel-per-centimeter": "#{n}像素/厘米",
+            "pixel-per-inch": "#{n}像素/英寸",
             "point": "#{n} pt",
             "pound": "#{n}磅",
             "pound-force": "#{n}磅力",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n}桶",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/秒",
             "british-thermal-unit": "#{n}英热单位",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n}甜点匙",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
+            "dot": "#{n}点",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n}液量打兰",
@@ -262,7 +264,7 @@
             "fathom": "#{n}英寻",
             "fluid-ounce": "#{n}液盎司",
             "fluid-ounce-imperial": "#{n}英制液盎司",
-            "foodcalorie": "#{n}大卡",
+            "foodcalorie": "#{n} Cal",
             "foot": "#{n}英尺",
             "foot-per-second": "#{n}英尺/秒",
             "furlong": "#{n}弗隆",
diff --git a/js/data/locale/zh/Hans/SG/unitfmt.json b/js/data/locale/zh/Hans/SG/unitfmt.json
index b4ccc1f728..a964e052e6 100644
--- a/js/data/locale/zh/Hans/SG/unitfmt.json
+++ b/js/data/locale/zh/Hans/SG/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n}个标准大气压",
             "bar": "#{n}巴",
             "barrel": "#{n}桶",
+            "beaufort": "#{n}级",
             "bit": "#{n}比特",
             "bit-per-second": "#{n}比特/秒",
             "british-thermal-unit": "#{n}英热单位",
@@ -43,7 +44,7 @@
             "dessert-spoon": "#{n}甜点匙",
             "dessert-spoon-imperial": "#{n}英制甜点匙",
             "dot": "#{n}点",
-            "dot-per-centimeter": "#{n} 点/厘米",
+            "dot-per-centimeter": "#{n}点/厘米",
             "dot-per-inch": "#{n}点/英寸",
             "dram": "#{n}打兰",
             "drop": "#{n}滴",
@@ -56,7 +57,7 @@
             "fathom": "#{n}英寻",
             "fluid-ounce": "#{n}液盎司",
             "fluid-ounce-imperial": "#{n}英制液盎司",
-            "foodcalorie": "#{n}卡路里",
+            "foodcalorie": "#{n}大卡",
             "foot": "#{n}英尺",
             "foot-per-second": "#{n}英尺/秒",
             "furlong": "#{n}弗隆",
@@ -165,8 +166,8 @@
             "pint": "#{n}品脱",
             "pint-metric": "#{n}公制品脱",
             "pixel": "#{n}像素",
-            "pixel-per-centimeter": "#{n} 像素/厘米",
-            "pixel-per-inch": "#{n} 像素/英寸",
+            "pixel-per-centimeter": "#{n}像素/厘米",
+            "pixel-per-inch": "#{n}像素/英寸",
             "point": "#{n} pt",
             "pound": "#{n}磅",
             "pound-force": "#{n}磅力",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n}桶",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/秒",
             "british-thermal-unit": "#{n}英热单位",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n}甜点匙",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
+            "dot": "#{n}点",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n}液量打兰",
@@ -262,7 +264,7 @@
             "fathom": "#{n}英寻",
             "fluid-ounce": "#{n}液盎司",
             "fluid-ounce-imperial": "#{n}英制液盎司",
-            "foodcalorie": "#{n}大卡",
+            "foodcalorie": "#{n} Cal",
             "foot": "#{n}英尺",
             "foot-per-second": "#{n}英尺/秒",
             "furlong": "#{n}弗隆",
diff --git a/js/data/locale/zh/Hant/HK/unitfmt.json b/js/data/locale/zh/Hant/HK/unitfmt.json
index 873d2d0488..cf5f1b820b 100644
--- a/js/data/locale/zh/Hant/HK/unitfmt.json
+++ b/js/data/locale/zh/Hant/HK/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} 大氣壓",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福氏風級 {n} 級",
             "bit": "#{n} 個位元",
             "bit-per-second": "#{n} 個位元每秒",
             "british-thermal-unit": "#{n} 英制熱量單位",
@@ -42,7 +43,6 @@
             "degree": "#{n} 度",
             "dessert-spoon": "#{n} 甜品匙",
             "dessert-spoon-imperial": "#{n} 英制甜品匙",
-            "dot": "#{n} px",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} 打蘭",
@@ -60,7 +60,7 @@
             "foot": "#{n} 呎",
             "foot-per-second": "#{n} 呎每秒",
             "furlong": "#{n} 化朗",
-            "g-force": "#{n} G 力",
+            "g-force": "#{n} G",
             "gallon": "#{n} 加侖",
             "gallon-imperial": "#{n} 英制加侖",
             "generic": "#{n}°",
@@ -94,7 +94,7 @@
             "kilocalorie": "#{n} 千卡",
             "kilogram": "#{n} 公斤",
             "kilohertz": "#{n} 千赫",
-            "kilojoule": "#{n} 千焦耳",
+            "kilojoule": "#{n} 千焦",
             "kilometer": "#{n} 公里",
             "kilometer-per-hour": "#每小時 {n} 公里",
             "kilometer-per-liter": "#{n} 公里 每公升",
@@ -126,11 +126,11 @@
             "microgram": "#{n} 微克",
             "micrometer": "#{n} 微米",
             "microsecond": "#{n} 微秒",
-            "mile": "#{n} 英里",
+            "mile": "#{n} 哩",
             "mile-per-gallon": "#{n} 英里/加侖",
             "mile-per-gallon-imperial": "#每英制加侖 {n} 英里",
             "mile-per-hour": "#每小時 {n} 英里",
-            "mile-per-second": "#{n} 英里每秒",
+            "mile-per-second": "#{n} 哩每秒",
             "mile-scandinavian": "#{n} 斯堪地那維亞英里",
             "milliampere": "#{n} 毫安培",
             "millibar": "#{n} 毫巴",
@@ -147,7 +147,7 @@
             "month": "#{n} 個月",
             "nanometer": "#{n} 納米",
             "nanosecond": "#{n} 納秒",
-            "nautical-mile": "#{n} 海里",
+            "nautical-mile": "#{n} 浬",
             "newton": "#{n} 牛頓",
             "newton-meter": "#{n} 牛頓米",
             "ohm": "#{n} 歐姆",
@@ -216,6 +216,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福氏風級 {n} 級",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit每秒",
             "british-thermal-unit": "#{n} 英熱單位",
@@ -248,7 +249,6 @@
             "degree": "#{n} 度",
             "dessert-spoon": "#{n} 甜品匙",
             "dessert-spoon-imperial": "#{n} 英制甜品匙",
-            "dot": "#{n} px",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} 打蘭",
diff --git a/js/data/locale/zh/Hant/MO/unitfmt.json b/js/data/locale/zh/Hant/MO/unitfmt.json
index 873d2d0488..cf5f1b820b 100644
--- a/js/data/locale/zh/Hant/MO/unitfmt.json
+++ b/js/data/locale/zh/Hant/MO/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} 大氣壓",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福氏風級 {n} 級",
             "bit": "#{n} 個位元",
             "bit-per-second": "#{n} 個位元每秒",
             "british-thermal-unit": "#{n} 英制熱量單位",
@@ -42,7 +43,6 @@
             "degree": "#{n} 度",
             "dessert-spoon": "#{n} 甜品匙",
             "dessert-spoon-imperial": "#{n} 英制甜品匙",
-            "dot": "#{n} px",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} 打蘭",
@@ -60,7 +60,7 @@
             "foot": "#{n} 呎",
             "foot-per-second": "#{n} 呎每秒",
             "furlong": "#{n} 化朗",
-            "g-force": "#{n} G 力",
+            "g-force": "#{n} G",
             "gallon": "#{n} 加侖",
             "gallon-imperial": "#{n} 英制加侖",
             "generic": "#{n}°",
@@ -94,7 +94,7 @@
             "kilocalorie": "#{n} 千卡",
             "kilogram": "#{n} 公斤",
             "kilohertz": "#{n} 千赫",
-            "kilojoule": "#{n} 千焦耳",
+            "kilojoule": "#{n} 千焦",
             "kilometer": "#{n} 公里",
             "kilometer-per-hour": "#每小時 {n} 公里",
             "kilometer-per-liter": "#{n} 公里 每公升",
@@ -126,11 +126,11 @@
             "microgram": "#{n} 微克",
             "micrometer": "#{n} 微米",
             "microsecond": "#{n} 微秒",
-            "mile": "#{n} 英里",
+            "mile": "#{n} 哩",
             "mile-per-gallon": "#{n} 英里/加侖",
             "mile-per-gallon-imperial": "#每英制加侖 {n} 英里",
             "mile-per-hour": "#每小時 {n} 英里",
-            "mile-per-second": "#{n} 英里每秒",
+            "mile-per-second": "#{n} 哩每秒",
             "mile-scandinavian": "#{n} 斯堪地那維亞英里",
             "milliampere": "#{n} 毫安培",
             "millibar": "#{n} 毫巴",
@@ -147,7 +147,7 @@
             "month": "#{n} 個月",
             "nanometer": "#{n} 納米",
             "nanosecond": "#{n} 納秒",
-            "nautical-mile": "#{n} 海里",
+            "nautical-mile": "#{n} 浬",
             "newton": "#{n} 牛頓",
             "newton-meter": "#{n} 牛頓米",
             "ohm": "#{n} 歐姆",
@@ -216,6 +216,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福氏風級 {n} 級",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit每秒",
             "british-thermal-unit": "#{n} 英熱單位",
@@ -248,7 +249,6 @@
             "degree": "#{n} 度",
             "dessert-spoon": "#{n} 甜品匙",
             "dessert-spoon-imperial": "#{n} 英制甜品匙",
-            "dot": "#{n} px",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} 打蘭",
diff --git a/js/data/locale/zh/Hant/list.json b/js/data/locale/zh/Hant/list.json
index 8930b05a7f..bdf972ecd3 100644
--- a/js/data/locale/zh/Hant/list.json
+++ b/js/data/locale/zh/Hant/list.json
@@ -1,7 +1,6 @@
 {
     "standard": {
         "short": {
-            "2": "{0}和{1}",
             "end": "{0}和{1}"
         }
     },
diff --git a/js/data/locale/zh/Hant/unitfmt.json b/js/data/locale/zh/Hant/unitfmt.json
index 496ec4f4cd..a754066762 100644
--- a/js/data/locale/zh/Hant/unitfmt.json
+++ b/js/data/locale/zh/Hant/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} 大氣壓",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福風級 {n} 級",
             "bit": "#{n} bit",
             "bit-per-second": "#每秒 {n} bit",
             "british-thermal-unit": "#{n} 英熱單位",
@@ -42,7 +43,6 @@
             "degree": "#{n} 度",
             "dessert-spoon": "#{n} 甜品匙",
             "dessert-spoon-imperial": "#{n} 英制甜品匙",
-            "dot": "#{n} px",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} 打蘭",
@@ -216,6 +216,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} 巴",
             "barrel": "#{n} 桶",
+            "beaufort": "#蒲福風級 {n} 級",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/秒",
             "british-thermal-unit": "#{n} 英熱單位",
@@ -248,7 +249,6 @@
             "degree": "#{n} 度",
             "dessert-spoon": "#{n} 甜品匙",
             "dessert-spoon-imperial": "#{n} 英制甜品匙",
-            "dot": "#{n} px",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n} 打蘭",
diff --git a/js/data/locale/zh/unitfmt.json b/js/data/locale/zh/unitfmt.json
index 7bf39cde88..c9b505a58b 100644
--- a/js/data/locale/zh/unitfmt.json
+++ b/js/data/locale/zh/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n}个标准大气压",
             "bar": "#{n}巴",
             "barrel": "#{n}桶",
+            "beaufort": "#{n}级",
             "bit": "#{n}比特",
             "bit-per-second": "#{n}比特/秒",
             "british-thermal-unit": "#{n}英热单位",
@@ -43,7 +44,7 @@
             "dessert-spoon": "#{n}甜点匙",
             "dessert-spoon-imperial": "#{n}英制甜点匙",
             "dot": "#{n}点",
-            "dot-per-centimeter": "#{n} 点/厘米",
+            "dot-per-centimeter": "#{n}点/厘米",
             "dot-per-inch": "#{n}点/英寸",
             "dram": "#{n}打兰",
             "drop": "#{n}滴",
@@ -56,7 +57,7 @@
             "fathom": "#{n}英寻",
             "fluid-ounce": "#{n}液盎司",
             "fluid-ounce-imperial": "#{n}英制液盎司",
-            "foodcalorie": "#{n}卡路里",
+            "foodcalorie": "#{n}大卡",
             "foot": "#{n}英尺",
             "foot-per-second": "#{n}英尺/秒",
             "furlong": "#{n}弗隆",
@@ -165,8 +166,8 @@
             "pint": "#{n}品脱",
             "pint-metric": "#{n}公制品脱",
             "pixel": "#{n}像素",
-            "pixel-per-centimeter": "#{n} 像素/厘米",
-            "pixel-per-inch": "#{n} 像素/英寸",
+            "pixel-per-centimeter": "#{n}像素/厘米",
+            "pixel-per-inch": "#{n}像素/英寸",
             "point": "#{n} pt",
             "pound": "#{n}磅",
             "pound-force": "#{n}磅力",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n}桶",
+            "beaufort": "#B {n}",
             "bit": "#{n} b",
             "bit-per-second": "#{n} b/秒",
             "british-thermal-unit": "#{n}英热单位",
@@ -248,7 +250,7 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n}甜点匙",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
+            "dot": "#{n}点",
             "dot-per-centimeter": "#{n} dpcm",
             "dot-per-inch": "#{n} dpi",
             "dram": "#{n}液量打兰",
@@ -262,7 +264,7 @@
             "fathom": "#{n}英寻",
             "fluid-ounce": "#{n}液盎司",
             "fluid-ounce-imperial": "#{n}英制液盎司",
-            "foodcalorie": "#{n}大卡",
+            "foodcalorie": "#{n} Cal",
             "foot": "#{n}英尺",
             "foot-per-second": "#{n}英尺/秒",
             "furlong": "#{n}弗隆",
diff --git a/js/data/locale/zoneinfo/Africa/Casablanca.json b/js/data/locale/zoneinfo/Africa/Casablanca.json
index d0b109df9c..2aca214772 100644
--- a/js/data/locale/zoneinfo/Africa/Casablanca.json
+++ b/js/data/locale/zoneinfo/Africa/Casablanca.json
@@ -2,7 +2,7 @@
     "c": "MA",
     "e": {
         "m": 4,
-        "r": "23",
+        "r": "14",
         "t": "2:0"
     },
     "f": "+01/+00",
diff --git a/js/data/locale/zoneinfo/Africa/El_Aaiun.json b/js/data/locale/zoneinfo/Africa/El_Aaiun.json
index 79791a6a5b..9fdbe12f20 100644
--- a/js/data/locale/zoneinfo/Africa/El_Aaiun.json
+++ b/js/data/locale/zoneinfo/Africa/El_Aaiun.json
@@ -2,7 +2,7 @@
     "c": "EH",
     "e": {
         "m": 4,
-        "r": "23",
+        "r": "14",
         "t": "2:0"
     },
     "f": "+01/+00",
diff --git a/js/data/locale/zoneinfo/America/Bahia_Banderas.json b/js/data/locale/zoneinfo/America/Bahia_Banderas.json
index a05f89f450..a0679ce6fe 100644
--- a/js/data/locale/zoneinfo/America/Bahia_Banderas.json
+++ b/js/data/locale/zoneinfo/America/Bahia_Banderas.json
@@ -1,19 +1,6 @@
 {
     "c": "MX",
-    "e": {
-        "c": "S",
-        "m": 10,
-        "r": "l0",
-        "t": "2:0"
-    },
-    "f": "C{c}T",
+    "f": "CST",
     "n": "Central {c} Time (Mexico)",
-    "o": "-6:0",
-    "s": {
-        "c": "D",
-        "m": 4,
-        "r": "0>1",
-        "t": "2:0",
-        "v": "1:0"
-    }
+    "o": "-6:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/America/Chihuahua.json b/js/data/locale/zoneinfo/America/Chihuahua.json
index 467adb34fc..a0679ce6fe 100644
--- a/js/data/locale/zoneinfo/America/Chihuahua.json
+++ b/js/data/locale/zoneinfo/America/Chihuahua.json
@@ -1,6 +1,6 @@
 {
     "c": "MX",
     "f": "CST",
-    "n": "Mountain {c} Time (Mexico)",
+    "n": "Central {c} Time (Mexico)",
     "o": "-6:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/America/Ciudad_Juarez.json b/js/data/locale/zoneinfo/America/Ciudad_Juarez.json
index b0b92633de..8d0da6224b 100644
--- a/js/data/locale/zoneinfo/America/Ciudad_Juarez.json
+++ b/js/data/locale/zoneinfo/America/Ciudad_Juarez.json
@@ -7,6 +7,7 @@
         "t": "2:0"
     },
     "f": "M{c}T",
+    "n": "Mountain {c} Time",
     "o": "-7:0",
     "s": {
         "c": "D",
diff --git a/js/data/locale/zoneinfo/America/Ensenada.json b/js/data/locale/zoneinfo/America/Ensenada.json
index 776fe48754..ef7eb9595a 100644
--- a/js/data/locale/zoneinfo/America/Ensenada.json
+++ b/js/data/locale/zoneinfo/America/Ensenada.json
@@ -1,18 +1,5 @@
 {
     "c": "MX",
-    "e": {
-        "c": "S",
-        "m": 10,
-        "r": "l0",
-        "t": "2:0"
-    },
-    "f": "P{c}T",
-    "o": "-8:0",
-    "s": {
-        "c": "D",
-        "m": 4,
-        "r": "0>1",
-        "t": "2:0",
-        "v": "1:0"
-    }
+    "f": "PST",
+    "o": "-8:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/America/Mazatlan.json b/js/data/locale/zoneinfo/America/Mazatlan.json
index e6b35fb5f9..5cf9399d87 100644
--- a/js/data/locale/zoneinfo/America/Mazatlan.json
+++ b/js/data/locale/zoneinfo/America/Mazatlan.json
@@ -1,19 +1,6 @@
 {
     "c": "MX",
-    "e": {
-        "c": "S",
-        "m": 10,
-        "r": "l0",
-        "t": "2:0"
-    },
-    "f": "M{c}T",
+    "f": "MST",
     "n": "Mountain {c} Time (Mexico)",
-    "o": "-7:0",
-    "s": {
-        "c": "D",
-        "m": 4,
-        "r": "0>1",
-        "t": "2:0",
-        "v": "1:0"
-    }
+    "o": "-7:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/America/Merida.json b/js/data/locale/zoneinfo/America/Merida.json
index a05f89f450..a0679ce6fe 100644
--- a/js/data/locale/zoneinfo/America/Merida.json
+++ b/js/data/locale/zoneinfo/America/Merida.json
@@ -1,19 +1,6 @@
 {
     "c": "MX",
-    "e": {
-        "c": "S",
-        "m": 10,
-        "r": "l0",
-        "t": "2:0"
-    },
-    "f": "C{c}T",
+    "f": "CST",
     "n": "Central {c} Time (Mexico)",
-    "o": "-6:0",
-    "s": {
-        "c": "D",
-        "m": 4,
-        "r": "0>1",
-        "t": "2:0",
-        "v": "1:0"
-    }
+    "o": "-6:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/America/Mexico_City.json b/js/data/locale/zoneinfo/America/Mexico_City.json
index a05f89f450..a0679ce6fe 100644
--- a/js/data/locale/zoneinfo/America/Mexico_City.json
+++ b/js/data/locale/zoneinfo/America/Mexico_City.json
@@ -1,19 +1,6 @@
 {
     "c": "MX",
-    "e": {
-        "c": "S",
-        "m": 10,
-        "r": "l0",
-        "t": "2:0"
-    },
-    "f": "C{c}T",
+    "f": "CST",
     "n": "Central {c} Time (Mexico)",
-    "o": "-6:0",
-    "s": {
-        "c": "D",
-        "m": 4,
-        "r": "0>1",
-        "t": "2:0",
-        "v": "1:0"
-    }
+    "o": "-6:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/America/Monterrey.json b/js/data/locale/zoneinfo/America/Monterrey.json
index a05f89f450..a0679ce6fe 100644
--- a/js/data/locale/zoneinfo/America/Monterrey.json
+++ b/js/data/locale/zoneinfo/America/Monterrey.json
@@ -1,19 +1,6 @@
 {
     "c": "MX",
-    "e": {
-        "c": "S",
-        "m": 10,
-        "r": "l0",
-        "t": "2:0"
-    },
-    "f": "C{c}T",
+    "f": "CST",
     "n": "Central {c} Time (Mexico)",
-    "o": "-6:0",
-    "s": {
-        "c": "D",
-        "m": 4,
-        "r": "0>1",
-        "t": "2:0",
-        "v": "1:0"
-    }
+    "o": "-6:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/America/Ojinaga.json b/js/data/locale/zoneinfo/America/Ojinaga.json
index 5b15ca8ed1..81024e1606 100644
--- a/js/data/locale/zoneinfo/America/Ojinaga.json
+++ b/js/data/locale/zoneinfo/America/Ojinaga.json
@@ -7,7 +7,7 @@
         "t": "2:0"
     },
     "f": "C{c}T",
-    "n": "Mountain {c} Time",
+    "n": "Central {c} Time",
     "o": "-6:0",
     "s": {
         "c": "D",
diff --git a/js/data/locale/zoneinfo/America/Scoresbysund.json b/js/data/locale/zoneinfo/America/Scoresbysund.json
index fa6112396d..f850d34897 100644
--- a/js/data/locale/zoneinfo/America/Scoresbysund.json
+++ b/js/data/locale/zoneinfo/America/Scoresbysund.json
@@ -3,16 +3,16 @@
     "e": {
         "m": 10,
         "r": "l0",
-        "t": "1:0"
+        "t": "0:0"
     },
-    "f": "-01/+00",
+    "f": "-02/-01",
     "n": "Azores {c} Time",
-    "o": "-1:0",
+    "o": "-2:0",
     "s": {
         "c": "S",
         "m": 3,
-        "r": "l0",
-        "t": "0:0",
+        "r": "l6",
+        "t": "23:0",
         "v": "1:0"
     }
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/Antarctica/Casey.json b/js/data/locale/zoneinfo/Antarctica/Casey.json
index 39889def65..6ccf97411e 100644
--- a/js/data/locale/zoneinfo/Antarctica/Casey.json
+++ b/js/data/locale/zoneinfo/Antarctica/Casey.json
@@ -1,6 +1,6 @@
 {
     "c": "AQ",
-    "f": "+11",
+    "f": "+08",
     "n": "Central Pacific {c} Time",
-    "o": "11:0"
+    "o": "8:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/Antarctica/Vostok.json b/js/data/locale/zoneinfo/Antarctica/Vostok.json
index c6fd457429..7fe82b4d11 100644
--- a/js/data/locale/zoneinfo/Antarctica/Vostok.json
+++ b/js/data/locale/zoneinfo/Antarctica/Vostok.json
@@ -1,6 +1,6 @@
 {
     "c": "AQ",
-    "f": "+06",
+    "f": "+05",
     "n": "Central Asia {c} Time",
-    "o": "6:0"
+    "o": "5:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/Asia/Almaty.json b/js/data/locale/zoneinfo/Asia/Almaty.json
index e436c3a31f..0502edd79d 100644
--- a/js/data/locale/zoneinfo/Asia/Almaty.json
+++ b/js/data/locale/zoneinfo/Asia/Almaty.json
@@ -1,6 +1,6 @@
 {
     "c": "KZ",
-    "f": "+06",
+    "f": "+05",
     "n": "Central Asia {c} Time",
-    "o": "6:0"
+    "o": "5:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/Asia/Gaza.json b/js/data/locale/zoneinfo/Asia/Gaza.json
index 100f54d042..4c80aae4c0 100644
--- a/js/data/locale/zoneinfo/Asia/Gaza.json
+++ b/js/data/locale/zoneinfo/Asia/Gaza.json
@@ -11,7 +11,7 @@
     "s": {
         "c": "S",
         "m": 4,
-        "r": "29",
+        "r": "20",
         "t": "2:0",
         "v": "1:0"
     }
diff --git a/js/data/locale/zoneinfo/Asia/Hebron.json b/js/data/locale/zoneinfo/Asia/Hebron.json
index 100f54d042..4c80aae4c0 100644
--- a/js/data/locale/zoneinfo/Asia/Hebron.json
+++ b/js/data/locale/zoneinfo/Asia/Hebron.json
@@ -11,7 +11,7 @@
     "s": {
         "c": "S",
         "m": 4,
-        "r": "29",
+        "r": "20",
         "t": "2:0",
         "v": "1:0"
     }
diff --git a/js/data/locale/zoneinfo/Asia/Qostanay.json b/js/data/locale/zoneinfo/Asia/Qostanay.json
index e436c3a31f..0502edd79d 100644
--- a/js/data/locale/zoneinfo/Asia/Qostanay.json
+++ b/js/data/locale/zoneinfo/Asia/Qostanay.json
@@ -1,6 +1,6 @@
 {
     "c": "KZ",
-    "f": "+06",
+    "f": "+05",
     "n": "Central Asia {c} Time",
-    "o": "6:0"
+    "o": "5:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/Asia/Tehran.json b/js/data/locale/zoneinfo/Asia/Tehran.json
index c36ee12e9a..b8791fe356 100644
--- a/js/data/locale/zoneinfo/Asia/Tehran.json
+++ b/js/data/locale/zoneinfo/Asia/Tehran.json
@@ -1,17 +1,6 @@
 {
     "c": "IR",
-    "e": {
-        "m": 9,
-        "r": "22",
-        "t": "0:0"
-    },
     "f": "+0330/+0430",
     "n": "Iran {c} Time",
-    "o": "3:30",
-    "s": {
-        "m": 3,
-        "r": "22",
-        "t": "0:0",
-        "v": "1:0"
-    }
+    "o": "3:30"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/Mexico/BajaSur.json b/js/data/locale/zoneinfo/Mexico/BajaSur.json
index 0d2b0ca809..c005a406dd 100644
--- a/js/data/locale/zoneinfo/Mexico/BajaSur.json
+++ b/js/data/locale/zoneinfo/Mexico/BajaSur.json
@@ -1,18 +1,5 @@
 {
     "c": "MX",
-    "e": {
-        "c": "S",
-        "m": 10,
-        "r": "l0",
-        "t": "2:0"
-    },
-    "f": "M{c}T",
-    "o": "-7:0",
-    "s": {
-        "c": "D",
-        "m": 4,
-        "r": "0>1",
-        "t": "2:0",
-        "v": "1:0"
-    }
+    "f": "MST",
+    "o": "-7:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zoneinfo/Mexico/General.json b/js/data/locale/zoneinfo/Mexico/General.json
index 81f3359940..f0d5f3626f 100644
--- a/js/data/locale/zoneinfo/Mexico/General.json
+++ b/js/data/locale/zoneinfo/Mexico/General.json
@@ -1,18 +1,5 @@
 {
     "c": "MX",
-    "e": {
-        "c": "S",
-        "m": 10,
-        "r": "l0",
-        "t": "2:0"
-    },
-    "f": "C{c}T",
-    "o": "-6:0",
-    "s": {
-        "c": "D",
-        "m": 4,
-        "r": "0>1",
-        "t": "2:0",
-        "v": "1:0"
-    }
+    "f": "CST",
+    "o": "-6:0"
 }
\ No newline at end of file
diff --git a/js/data/locale/zu/sysres.json b/js/data/locale/zu/sysres.json
index 39405bd00d..dc438be3a3 100644
--- a/js/data/locale/zu/sysres.json
+++ b/js/data/locale/zu/sysres.json
@@ -6,7 +6,7 @@
     "#in {num}s": "one#kusekhondi elingu-{num} elizayo|#kumasekhondi angu-{num} ezayo",
     "#in {num}w": "one#evikini elingu-{num} elizayo|#emavikini angu-{num} ezayo",
     "#in {num}y": "one#onyakeni ongu-{num} ozayo|#eminyakeni engu-{num} ezayo",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "#{num}d": "one#{num} suku|#{num} suku",
     "#{num}d ago": "one#{num} usuku olwedlule|#{num} izinsuku ezedlule",
     "#{num}h": "one#{num} hora|#{num} hora",
@@ -27,7 +27,7 @@
     "1#1 hour|#{num} hours": "one#{num} ihora|#{num} amahora",
     "1#1 hr ago|#{num} hrs ago": "one#{num} ihora eledlule|#emahoreni angu-{num} edlule",
     "1#1 hr|#{num} hrs": "one#{num} hora|#{num} hr",
-    "1#1 millisecond|#{num} milliseconds": "one#{num} ms|#{num} ms",
+    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
     "1#1 min ago|#{num} min ago": "one#{num} iminithi eledlule|#{num} amaminithi edlule",
     "1#1 minute ago|#{num} minutes ago": "one#{num} iminithi eledlule|#{num} amaminithi edlule",
     "1#1 minute|#{num} minutes": "one#{num} iminithi|#{num} amaminithi",
@@ -172,10 +172,10 @@
     "NN8": "Ag",
     "durationLongDays": "one#{num} usuku|#{num} izinsuku",
     "durationMediumHours": "one#{num} hora|#{num} hora",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "durationMediumWeeks": "one#{num} v|#{num} v",
     "durationMediumYears": "one#{num} nk|#{num} nk",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "durationShortMinutes": "one#{num} umzuzu|#{num} umzuzu",
     "durationShortMonths": "one#{num} ng|#{num} ng",
     "finalSeparatorFull": ", ",
diff --git a/js/data/locale/zu/unitfmt.json b/js/data/locale/zu/unitfmt.json
index 51f329f835..794f5d5b53 100644
--- a/js/data/locale/zu/unitfmt.json
+++ b/js/data/locale/zu/unitfmt.json
@@ -10,6 +10,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "one#{n} i-bit|#{n} ama-bits",
             "bit-per-second": "#{n} ama-bitsps",
             "british-thermal-unit": "#{n} Btu",
@@ -42,9 +43,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "one#{n} sipuni dessert|#{n} dstspn",
             "dessert-spoon-imperial": "one#{n} Imp. isipuni dessert|#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "one#{n} ichashazi|#{n} amachashazi",
+            "dot-per-centimeter": "one#{n} ichashazi ngesenthimitha|#{n} amachashazi ngesethimitha",
+            "dot-per-inch": "one#{n} ichashazi nge-inch|#{n} amachashazi nge-inch",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
@@ -173,7 +174,7 @@
             "pound-force-foot": "#{n} lbf⋅ft",
             "pound-force-per-square-inch": "#{n} psi",
             "quart": "#{n} qt",
-            "quart-imperial": "#{n} qt Imp.",
+            "quart-imperial": "one#{n} Imp. quart|#{n} qt Imp.",
             "quarter": "#{n} q",
             "radian": "#{n} radians",
             "revolution": "one#{n} revolution|#{n} revolutions",
@@ -216,6 +217,7 @@
             "atmosphere": "#{n} atm",
             "bar": "#{n} bar",
             "barrel": "#{n} bbl",
+            "beaufort": "#B {n}",
             "bit": "#{n} bit",
             "bit-per-second": "#{n} bit/s",
             "british-thermal-unit": "#{n} Btu",
@@ -248,9 +250,9 @@
             "degree": "#{n}°",
             "dessert-spoon": "#{n} dstspn",
             "dessert-spoon-imperial": "#{n} dstspn Imp",
-            "dot": "#{n} px",
-            "dot-per-centimeter": "#{n} ppcm",
-            "dot-per-inch": "#{n} ppi",
+            "dot": "one#{n} ichashazi|#{n} amachashazi",
+            "dot-per-centimeter": "#{n} dpcm",
+            "dot-per-inch": "#{n} dpi",
             "dram": "#{n} dram fl",
             "drop": "#{n} drop",
             "dunam": "#{n} dunam",
diff --git a/js/lib/ilib.js b/js/lib/ilib.js
index 94948ae96c..478611a47b 100644
--- a/js/lib/ilib.js
+++ b/js/lib/ilib.js
@@ -1,7 +1,7 @@
 /*
  * ilib.js - define the ilib name space
  *
- * Copyright © 2012-2021, JEDLSoft
+ * Copyright © 2012-2021, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ ilib.getVersion = function () {
  * @return {string} the adopted cldr version for ilib
  */
 ilib.getCLDRVersion = function () {
-    return "43.1";
+    return "44.1";
 };
 
 /**
@@ -157,7 +157,7 @@ ilib._getPlatform = function () {
         } else if (typeof(Qt) !== 'undefined') {
             ilib._platform = "qt";
             ilib._cacheMerged = true; // qt is too slow, so we need to cache the already-merged locale data
-        } else if (typeof(PalmSystem) !== 'undefined') {
+        } else if ((typeof(PalmSystem) !== 'undefined') || (typeof(webOSSystem) !== 'undefined')) {
             ilib._platform = (typeof(window) !== 'undefined') ? "webos-webapp" : "webos";
         } else if (typeof(window) !== 'undefined') {
             ilib._platform = "browser";
@@ -391,6 +391,8 @@ ilib.getLocale = function () {
                     ilib.locale = parseLocale(PalmSystem.locales.UI);
                 } else if (typeof(PalmSystem.locale) !== 'undefined') {
                     ilib.locale = parseLocale(PalmSystem.locale);
+                } else if (typeof(webOSSystem.locale) !== 'undefined') {
+                    ilib.locale = parseLocale(webOSSystem.locale);
                 } else {
                     ilib.locale = undefined;
                 }
@@ -481,7 +483,8 @@ ilib.getTimeZone = function() {
             case 'webos-webapp':
             case 'webos':
                 // running in webkit on webOS
-                if (PalmSystem.timezone && PalmSystem.timezone.length > 0) {
+                if ((PalmSystem.timezone && PalmSystem.timezone.length > 0) ||
+                    (webOSSystem.timeZone && PalmSystem.timeZone.length > 0)) {
                     ilib.tz = PalmSystem.timezone;
                 }
                 break;
diff --git a/js/test/address/testaddress.js b/js/test/address/testaddress.js
index 3f330fe0ef..faae4bd43b 100644
--- a/js/test/address/testaddress.js
+++ b/js/test/address/testaddress.js
@@ -1,7 +1,7 @@
 /*
  * testaddress.js - test the address parsing and formatting routines
  *
- * Copyright © 2013-2015,2017,2023 JEDLSoft
+ * Copyright © 2013-2015, 2017, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1170,7 +1170,7 @@ module.exports.testaddress = {
             "Angola",
             "Anguila",
             "Antigua y Barbuda",
-            "Arabia Saudí",
+            "Arabia Saudita",
             "Argelia",
             "Argentina",
             "Armenia",
@@ -1275,7 +1275,7 @@ module.exports.testaddress = {
             "Islas Cocos",
             "Islas Cook",
             "Islas Feroe",
-            "Islas Georgia del Sur y Sandwich del Sur",
+            "Islas Georgia del Sur y Sándwich del Sur",
             "Islas Heard y McDonald",
             "Islas Malvinas",
             "Islas Marianas del Norte",
@@ -1361,7 +1361,7 @@ module.exports.testaddress = {
             "República Dominicana",
             "Reunión",
             "Ruanda",
-            "Rumanía",
+            "Rumania",
             "Rusia",
             "Sahara Occidental",
             "Samoa",
@@ -1400,7 +1400,7 @@ module.exports.testaddress = {
             "Territorios alejados de Oceanía",
             "Territorios Australes Franceses",
             "Territorios Palestinos",
-            "Timor-Leste",
+            "Timor Oriental",
             "Togo",
             "Tokelau",
             "Tonga",
diff --git a/js/test/calendar/testpersiandateastro.js b/js/test/calendar/testpersiandateastro.js
index d13cf9d8ac..f8830db8c0 100644
--- a/js/test/calendar/testpersiandateastro.js
+++ b/js/test/calendar/testpersiandateastro.js
@@ -1,7 +1,7 @@
 /*
  * testpersiandateastro.js - test the persian date object
  *
- * Copyright © 2014-2015,2017,2021 JEDLSoft
+ * Copyright © 2014-2015,2017,2021,2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -620,7 +620,7 @@ module.exports.testpersiandateastro = {
 
         test.ok(pd !== null);
 
-        test.equal(pd.getJulianDay(), 2458201.1965277777);
+        test.equal(pd.getJulianDay(), 2458201.238194444);
         test.done();
     },
     /*
diff --git a/js/test/date/testMeridiems.js b/js/test/date/testMeridiems.js
index e6c282596c..7bdcca9f25 100644
--- a/js/test/date/testMeridiems.js
+++ b/js/test/date/testMeridiems.js
@@ -1,7 +1,7 @@
  /*
  * testMeridiems.js - test the meridiems data
  *
- * Copyright © 2019-2023, JEDLSoft
+ * Copyright © 2019-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -544,8 +544,8 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-MX"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, 'a. m.');
-        test.equal(fmt[1].name, 'p. m.');
+        test.equal(fmt[0].name, 'a.m.');
+        test.equal(fmt[1].name, 'p.m.');
 
         test.done();
     },
@@ -614,8 +614,8 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-US"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, 'a. m.');
-        test.equal(fmt[1].name, 'p. m.');
+        test.equal(fmt[0].name, 'a.m.');
+        test.equal(fmt[1].name, 'p.m.');
 
         test.done();
     },
@@ -1170,7 +1170,7 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"ta-IN"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "முற்பகல்");
+        test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "பிற்பகல்");
 
         test.done();
diff --git a/js/test/date/testMonthTranslation.js b/js/test/date/testMonthTranslation.js
index e6ac8bae1b..a0c8f340cf 100644
--- a/js/test/date/testMonthTranslation.js
+++ b/js/test/date/testMonthTranslation.js
@@ -1,7 +1,7 @@
 /*
  * testMonthTranslation.js - test the month's translation
  *
- * Copyright © 2019-2023, JEDLSoft
+ * Copyright © 2019-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -2053,7 +2053,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[5], 'jun');
         test.equal(value[6], 'jul');
         test.equal(value[7], 'ago');
-        test.equal(value[8], 'sept');
+        test.equal(value[8], 'sep');
         test.equal(value[9], 'oct');
         test.equal(value[10], 'nov');
         test.equal(value[11], 'dic');
@@ -4902,18 +4902,18 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        test.equal(value[0], "січ");
-        test.equal(value[1], "лют");
-        test.equal(value[2], "бер");
-        test.equal(value[3], "кві");
-        test.equal(value[4], "тра");
-        test.equal(value[5], "чер");
-        test.equal(value[6], "лип");
-        test.equal(value[7], "сер");
-        test.equal(value[8], "вер");
-        test.equal(value[9], "жов");
-        test.equal(value[10], "лис");
-        test.equal(value[11], "гру");
+        test.equal(value[0], "січ.");
+        test.equal(value[1], "лют.");
+        test.equal(value[2], "бер.");
+        test.equal(value[3], "квіт.");
+        test.equal(value[4], "трав.");
+        test.equal(value[5], "черв.");
+        test.equal(value[6], "лип.");
+        test.equal(value[7], "серп.");
+        test.equal(value[8], "вер.");
+        test.equal(value[9], "жовт.");
+        test.equal(value[10], "лист.");
+        test.equal(value[11], "груд.");
 
         test.done();
     },
@@ -5038,18 +5038,18 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        test.equal(value[0], "Thg 1");
-        test.equal(value[1], "Thg 2");
-        test.equal(value[2], "Thg 3");
-        test.equal(value[3], "Thg 4");
-        test.equal(value[4], "Thg 5");
-        test.equal(value[5], "Thg 6");
-        test.equal(value[6], "Thg 7");
-        test.equal(value[7], "Thg 8");
-        test.equal(value[8], "Thg 9");
-        test.equal(value[9], "Thg 10");
-        test.equal(value[10], "Thg 11");
-        test.equal(value[11], "Thg 12");
+        test.equal(value[0], "Tháng 1");
+        test.equal(value[1], "Tháng 2");
+        test.equal(value[2], "Tháng 3");
+        test.equal(value[3], "Tháng 4");
+        test.equal(value[4], "Tháng 5");
+        test.equal(value[5], "Tháng 6");
+        test.equal(value[6], "Tháng 7");
+        test.equal(value[7], "Tháng 8");
+        test.equal(value[8], "Tháng 9");
+        test.equal(value[9], "Tháng 10");
+        test.equal(value[10], "Tháng 11");
+        test.equal(value[11], "Tháng 12");
         test.done();
     },
     testMonthTranslate_zh_Hans_CN: function(test) {
@@ -7619,35 +7619,35 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        test.equal(value[0], "Xaneiro");
-        test.equal(value[1], "Febreiro");
-        test.equal(value[2], "Marzo");
-        test.equal(value[3], "Abril");
-        test.equal(value[4], "Maio");
-        test.equal(value[5], "Xuño");
-        test.equal(value[6], "Xullo");
-        test.equal(value[7], "Agosto");
-        test.equal(value[8], "Setembro");
-        test.equal(value[9], "Outubro");
-        test.equal(value[10], "Novembro");
-        test.equal(value[11], "Decembro");
+        test.equal(value[0], "xaneiro");
+        test.equal(value[1], "febreiro");
+        test.equal(value[2], "marzo");
+        test.equal(value[3], "abril");
+        test.equal(value[4], "maio");
+        test.equal(value[5], "xuño");
+        test.equal(value[6], "xullo");
+        test.equal(value[7], "agosto");
+        test.equal(value[8], "setembro");
+        test.equal(value[9], "outubro");
+        test.equal(value[10], "novembro");
+        test.equal(value[11], "decembro");
 
         var fmt = new DateFmt({locale:"gl-ES", date:"m", length: "medium", useNative:false, timezone:"local"})
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        test.equal(value[0], "Xan.");
-        test.equal(value[1], "Feb.");
-        test.equal(value[2], "Mar.");
-        test.equal(value[3], "Abr.");
-        test.equal(value[4], "Maio");
-        test.equal(value[5], "Xuño");
-        test.equal(value[6], "Xul.");
-        test.equal(value[7], "Ago.");
-        test.equal(value[8], "Set.");
-        test.equal(value[9], "Out.");
-        test.equal(value[10], "Nov.");
-        test.equal(value[11], "Dec.");
+        test.equal(value[0], "xan.");
+        test.equal(value[1], "feb.");
+        test.equal(value[2], "mar.");
+        test.equal(value[3], "abr.");
+        test.equal(value[4], "maio");
+        test.equal(value[5], "xuño");
+        test.equal(value[6], "xul.");
+        test.equal(value[7], "ago.");
+        test.equal(value[8], "set.");
+        test.equal(value[9], "out.");
+        test.equal(value[10], "nov.");
+        test.equal(value[11], "dec.");
         test.done();
     },
     testMonthTranslate_eu_ES: function(test) {
diff --git a/js/test/date/testWeekdayTranslation.js b/js/test/date/testWeekdayTranslation.js
index a9b561f4e8..a3476c17a1 100644
--- a/js/test/date/testWeekdayTranslation.js
+++ b/js/test/date/testWeekdayTranslation.js
@@ -1,7 +1,7 @@
 /*
  * testWeekdayTranslation.js - test the weekday's translation
  *
- * Copyright © 2019-2023, JEDLSoft
+ * Copyright © 2019-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -704,13 +704,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "So."); //standAlone format
-        test.equal(value[1], "Mo."); //standAlone format
-        test.equal(value[2], "Di."); //standAlone format
-        test.equal(value[3], "Mi."); //standAlone format
-        test.equal(value[4], "Do."); //standAlone format
-        test.equal(value[5], "Fr."); //standAlone format
-        test.equal(value[6], "Sa."); //standAlone format
+        test.equal(value[0], "So"); //standAlone format
+        test.equal(value[1], "Mo"); //standAlone format
+        test.equal(value[2], "Di"); //standAlone format
+        test.equal(value[3], "Mi"); //standAlone format
+        test.equal(value[4], "Do"); //standAlone format
+        test.equal(value[5], "Fr"); //standAlone format
+        test.equal(value[6], "Sa"); //standAlone format
 
         fmt = new DateFmt({locale:"de-CH", date:"w", length: "short", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
@@ -1060,26 +1060,26 @@ module.exports.testWeekdayTranslation = {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
 
-        test.equal(value[0], "Sun"); //standAlone format
-        test.equal(value[1], "Mon"); //standAlone format
+        test.equal(value[0], "Su"); //standAlone format
+        test.equal(value[1], "Mo"); //standAlone format
         test.equal(value[2], "Tu"); //standAlone format
-        test.equal(value[3], "Wed"); //standAlone format
-        test.equal(value[4], "Thu"); //standAlone format
-        test.equal(value[5], "Fri"); //standAlone format
-        test.equal(value[6], "Sat"); //standAlone format
+        test.equal(value[3], "We"); //standAlone format
+        test.equal(value[4], "Th"); //standAlone format
+        test.equal(value[5], "Fr"); //standAlone format
+        test.equal(value[6], "Sa"); //standAlone format
 
         fmt = new DateFmt({locale:"en-AU", date:"w", length: "short", useNative:false, timezone:"local"});
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
 
-        test.equal(value[0], "Su.");
-        test.equal(value[1], "M.");
-        test.equal(value[2], "Tu.");
-        test.equal(value[3], "W.");
-        test.equal(value[4], "Th.");
-        test.equal(value[5], "F.");
-        test.equal(value[6], "Sa.");
+        test.equal(value[0], "S");
+        test.equal(value[1], "M");
+        test.equal(value[2], "T");
+        test.equal(value[3], "W");
+        test.equal(value[4], "T");
+        test.equal(value[5], "F");
+        test.equal(value[6], "S");
 
         test.done();
     },
@@ -11533,13 +11533,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "dg");
-        test.equal(value[1], "dl");
-        test.equal(value[2], "dt");
-        test.equal(value[3], "dc");
-        test.equal(value[4], "dj");
-        test.equal(value[5], "dv");
-        test.equal(value[6], "ds");
+        test.equal(value[0], "dg.");
+        test.equal(value[1], "dl.");
+        test.equal(value[2], "dt.");
+        test.equal(value[3], "dc.");
+        test.equal(value[4], "dj.");
+        test.equal(value[5], "dv.");
+        test.equal(value[6], "ds.");
 
         test.done();
     },
@@ -11604,13 +11604,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "dg");
-        test.equal(value[1], "dl");
-        test.equal(value[2], "dt");
-        test.equal(value[3], "dc");
-        test.equal(value[4], "dj");
-        test.equal(value[5], "dv");
-        test.equal(value[6], "ds");
+        test.equal(value[0], "dg.");
+        test.equal(value[1], "dl.");
+        test.equal(value[2], "dt.");
+        test.equal(value[3], "dc.");
+        test.equal(value[4], "dj.");
+        test.equal(value[5], "dv.");
+        test.equal(value[6], "ds.");
         test.done();
     },
     testWeekdayTranslationFull_hy_AM: function(test) {
@@ -11691,13 +11691,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "Domingo");
-        test.equal(value[1], "Luns");
-        test.equal(value[2], "Martes");
-        test.equal(value[3], "Mércores");
-        test.equal(value[4], "Xoves");
-        test.equal(value[5], "Venres");
-        test.equal(value[6], "Sábado");
+        test.equal(value[0], "domingo");
+        test.equal(value[1], "luns");
+        test.equal(value[2], "martes");
+        test.equal(value[3], "mércores");
+        test.equal(value[4], "xoves");
+        test.equal(value[5], "venres");
+        test.equal(value[6], "sábado");
         test.done();
     },
     testWeekdayTranslationLong_gl_ES: function(test) {
@@ -11708,13 +11708,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "Dom.");
-        test.equal(value[1], "Luns");
-        test.equal(value[2], "Mar.");
-        test.equal(value[3], "Mér.");
-        test.equal(value[4], "Xov.");
-        test.equal(value[5], "Ven.");
-        test.equal(value[6], "Sáb.");
+        test.equal(value[0], "dom.");
+        test.equal(value[1], "luns");
+        test.equal(value[2], "mar.");
+        test.equal(value[3], "mér.");
+        test.equal(value[4], "xov.");
+        test.equal(value[5], "ven.");
+        test.equal(value[6], "sáb.");
 
         test.done();
     },
@@ -11726,13 +11726,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "Do");
-        test.equal(value[1], "Lu");
-        test.equal(value[2], "Ma");
-        test.equal(value[3], "Mé");
-        test.equal(value[4], "Xo");
-        test.equal(value[5], "Ve");
-        test.equal(value[6], "Sá");
+        test.equal(value[0], "do.");
+        test.equal(value[1], "lu.");
+        test.equal(value[2], "ma.");
+        test.equal(value[3], "mé.");
+        test.equal(value[4], "xo.");
+        test.equal(value[5], "ve.");
+        test.equal(value[6], "sá.");
 
         test.done();
     },
diff --git a/js/test/date/testclock.js b/js/test/date/testclock.js
index 7cbe0b58b5..ecece1dfb6 100644
--- a/js/test/date/testclock.js
+++ b/js/test/date/testclock.js
@@ -1,7 +1,7 @@
 /*
  * testclock.js - test the 12/24 hour support amongst various locales
  *
- * Copyright © 2019-2023, JEDLSoft
+ * Copyright © 2019-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,6 @@ if (typeof(ilib) === "undefined") {
     var ilib = require("../../lib/ilib.js");
 }
 
-if (ilib._getPlatform() === "nodejs" && ilib._dyndata && ilib._dyncode) {
-    var path = require("path");
-}
-
 if (typeof(LocaleInfo) === "undefined") {
     var LocaleInfo = require("../../lib/LocaleInfo.js");
 }
@@ -378,7 +374,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-AR");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_BO: function(test) {
@@ -386,7 +382,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-BO");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_CL: function(test) {
@@ -394,7 +390,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-CL");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_CO: function(test) {
@@ -418,7 +414,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-EC");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_ES: function(test) {
@@ -434,7 +430,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-GT");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_HN: function(test) {
@@ -442,7 +438,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-HN");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_MX: function(test) {
@@ -450,7 +446,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-MX");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_NI: function(test) {
@@ -458,7 +454,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-NI");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_PA: function(test) {
@@ -474,7 +470,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-PE");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_PR: function(test) {
@@ -490,7 +486,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-PY");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_SV: function(test) {
@@ -498,7 +494,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-SV");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_US: function(test) {
@@ -514,7 +510,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-UY");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_VE: function(test) {
@@ -722,6 +718,7 @@ module.exports.testclock = {
             test.done();
             return;
         }
+        var path = require("path");
         var multiPath = path.relative(process.cwd(), path.resolve(__dirname, "./custom"));
         var ilibLoader = ilib.getLoader();
         ilibLoader.addPath(multiPath);
@@ -1100,7 +1097,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("en-MX");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_en_TW: function(test) {
@@ -1380,7 +1377,7 @@ module.exports.testclock = {
         var info = new LocaleInfo("es-CR");
         test.ok(info !== null);
 
-        test.equal(info.getClock(), 24);
+        test.equal(info.getClock(), 12);
         test.done();
     },
     testClock_es_GQ: function(test) {
diff --git a/js/test/date/testdate.js b/js/test/date/testdate.js
index 0e5c31c85f..b4a729454b 100644
--- a/js/test/date/testdate.js
+++ b/js/test/date/testdate.js
@@ -1,7 +1,7 @@
 /*
  * testdate.js - test the date object
  *
- * Copyright © 2012-2015,2017,2021-2023 JEDLSoft
+ * Copyright © 2012-2015,2017,2021-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -392,7 +392,7 @@ module.exports.testdate = {
         test.equal(boundaryiLib.getTimeExtended(), 1693713600000);
         var ildMyBday = DateFactory({unixtime: 1693713600000});
         var fmt = new DateFmt({length: "short", type:"datetime",locale:"es-CL", timezone:"America/Santiago"});
-        test.equal(fmt.format(ildMyBday), "03-09-23, 01:00");
+        test.equal(fmt.format(ildMyBday), '03-09-23, 1:00 a. m.');
 
         test.done();
     },
@@ -405,7 +405,7 @@ module.exports.testdate = {
         test.equal(boundaryiLib.getTimeExtended(), 1586059200000);
         var ildMyBday = DateFactory({unixtime: 1586059200000});
         var fmt = new DateFmt({length: "short", type:"datetime",locale:"es-CL", timezone:"America/Santiago"});
-        test.equal(fmt.format(ildMyBday), "05-04-20, 00:00");
+        test.equal(fmt.format(ildMyBday), '05-04-20, 12:00 a. m.');
 
         test.done();
     },
@@ -421,7 +421,7 @@ module.exports.testdate = {
 
         var ildMyBday = DateFactory({unixtime: 1586052000000});
         var fmt = new DateFmt({length: "short", type:"datetime", locale:"es-CL", timezone:"America/Santiago"});
-        test.equal(fmt.format(ildMyBday), "04-04-20, 23:00");
+        test.equal(fmt.format(ildMyBday), '04-04-20, 11:00 p. m.');
 
         test.done();
     }
diff --git a/js/test/date/testdatefmt.js b/js/test/date/testdatefmt.js
index 28ba0ed19b..4565d1d510 100644
--- a/js/test/date/testdatefmt.js
+++ b/js/test/date/testdatefmt.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt.js - test the date formatter object
  *
- * Copyright © 2012-2015, 2017, 2020-2023 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2020-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -2763,7 +2763,7 @@ module.exports.testdatefmt = {
             millisecond: 0
         });
 
-        test.equal(fmt.format(date), "Tuesday, 20 September 2011 at 1:45 pm");
+        test.equal(fmt.format(date), "Tuesday 20 September 2011 at 1:45 pm");
         test.done();
     },
     testDateFmtenZA: function(test) {
@@ -2838,7 +2838,7 @@ module.exports.testdatefmt = {
             millisecond: 0
         });
 
-        test.equal(fmt.format(date), "martes, 20 de septiembre de 2011, 13:45");
+        test.equal(fmt.format(date), 'martes, 20 de septiembre de 2011, 1:45 p.m.');
         test.done();
     },
     testDateFmtesAR: function(test) {
@@ -2863,7 +2863,7 @@ module.exports.testdatefmt = {
             millisecond: 0
         });
 
-        test.equal(fmt.format(date), "martes, 20 de septiembre de 2011, 13:45");
+        test.equal(fmt.format(date), 'martes, 20 de septiembre de 2011, 1:45 p. m.');
         test.done();
     },
     testDateFmttrTR: function(test) {
@@ -3556,7 +3556,7 @@ module.exports.testdatefmt = {
         var fmt = DateFmt.getMeridiemsRange({locale: "ta-IN"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "முற்பகல்");
+        test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "பிற்பகல்");
         test.done();
     },
diff --git a/js/test/date/testdatefmt_bg.js b/js/test/date/testdatefmt_bg.js
index dcdce55ed5..8ed91e7d51 100644
--- a/js/test/date/testdatefmt_bg.js
+++ b/js/test/date/testdatefmt_bg.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_bg_BG.js - test the date formatter object in bulgarian
  *
- * Copyright © 2012-2015,2017,2021,2023 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2021, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -129,7 +129,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч.');
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
     testDateFmtSimpleTimeMedium_bg_BG: function(test) {
@@ -147,7 +147,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч.');
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
     testDateFmtSimpleTimeLong_bg_BG: function(test) {
@@ -165,7 +165,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч.');
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
     testDateFmtSimpleTimeFull_bg_BG: function(test) {
@@ -183,7 +183,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч.');
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
     testDateFmtDateTimeSimpleShort_bg_BG: function(test) {
@@ -201,7 +201,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29.09.11 г., 13:45 ч.');
+        test.equal(fmt.format(date), '29.09.11 г., 13:45');
         test.done();
     },
     testDateFmtDateTimeSimpleMedium_bg_BG: function(test) {
@@ -219,7 +219,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29.09.2011 г., 13:45 ч.');
+        test.equal(fmt.format(date), '29.09.2011 г., 13:45');
         test.done();
     },
     testDateFmtDateTimeSimpleLong_bg_BG: function(test) {
@@ -237,7 +237,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 септември 2011 г. в 13:45 ч.');
+        test.equal(fmt.format(date), '29 септември 2011 г. в 13:45');
         test.done();
     },
     testDateFmtDateTimeSimpleFull_bg_BG: function(test) {
@@ -255,7 +255,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 септември 2011 г. в 13:45 ч.');
+        test.equal(fmt.format(date), '29 септември 2011 г. в 13:45');
         test.done();
     },
     testDateFmtTemplateCalendar_bg_BG: function(test) {
@@ -453,7 +453,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч.');
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
     testDateFmtTypeDateTime_bg_BG: function(test) {
@@ -471,7 +471,7 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29.09.11 г., 13:45 ч.');
+        test.equal(fmt.format(date), '29.09.11 г., 13:45');
         test.done();
     },
     testDateFmtShortDateComponentsY_bg_BG: function(test) {
@@ -874,7 +874,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч.');
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
     testDateFmtShortTimeComponentsHMS_bg_BG: function(test) {
@@ -892,7 +892,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45:37 ч.');
+        test.equal(fmt.format(date), '13:45:37');
         test.done();
     },
     testDateFmtShortTimeComponentsHMA_bg_BG: function(test) {
@@ -910,7 +910,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч.');
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
     testDateFmtShortTimeComponentsHMZ_bg_BG: function(test) {
@@ -933,7 +933,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч. EEST');
+        test.equal(fmt.format(date), '13:45 EEST');
         test.done();
     },
     testDateFmtShortTimeComponentsHMAZ_bg_BG: function(test) {
@@ -956,7 +956,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч. EEST');
+        test.equal(fmt.format(date), '13:45 EEST');
         test.done();
     },
     testDateFmtShortTimeComponentsHMSA_bg_BG: function(test) {
@@ -974,7 +974,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45:37 ч.');
+        test.equal(fmt.format(date), '13:45:37');
         test.done();
     },
     testDateFmtShortTimeComponentsHMSZ_bg_BG: function(test) {
@@ -997,7 +997,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45:37 ч. EEST');
+        test.equal(fmt.format(date), '13:45:37 EEST');
         test.done();
     },
     testDateFmtShortTimeComponentsHMSAZ_bg_BG: function(test) {
@@ -1020,7 +1020,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45:37 ч. EEST');
+        test.equal(fmt.format(date), '13:45:37 EEST');
         test.done();
     },
     testDateFmtFullTimeComponentsS_bg_BG: function(test) {
@@ -1110,7 +1110,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч.');
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
     testDateFmtFullTimeComponentsHMS_bg_BG: function(test) {
@@ -1128,7 +1128,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45:37 ч.');
+        test.equal(fmt.format(date), '13:45:37');
         test.done();
     },
     testDateFmtFullTimeComponentsHMA_bg_BG: function(test) {
@@ -1146,7 +1146,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч.');
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
     testDateFmtFullTimeComponentsHMZ_bg_BG: function(test) {
@@ -1170,7 +1170,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч. EEST');
+        test.equal(fmt.format(date), '13:45 EEST');
         test.done();
     },
     testDateFmtFullTimeComponentsHMAZ_bg_BG: function(test) {
@@ -1194,7 +1194,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45 ч. EEST');
+        test.equal(fmt.format(date), '13:45 EEST');
         test.done();
     },
     testDateFmtFullTimeComponentsHMSA_bg_BG: function(test) {
@@ -1212,7 +1212,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45:37 ч.');
+        test.equal(fmt.format(date), '13:45:37');
         test.done();
     },
     testDateFmtFullTimeComponentsHMSZ_bg_BG: function(test) {
@@ -1236,7 +1236,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45:37 ч. EEST');
+        test.equal(fmt.format(date), '13:45:37 EEST');
         test.done();
     },
     testDateFmtFullTimeComponentsHMSAZ_bg_BG: function(test) {
@@ -1260,7 +1260,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45:37 ч. EEST');
+        test.equal(fmt.format(date), '13:45:37 EEST');
         test.done();
     },
     testDateFmtWithTimeZoneAndNoDST_bg_BG: function(test) {
@@ -1284,7 +1284,7 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '13:45:37 ч. EET');
+        test.equal(fmt.format(date), '13:45:37 EET');
         test.done();
     },
     /*
diff --git a/js/test/date/testdatefmt_bs_Latn_BA.js b/js/test/date/testdatefmt_bs_Latn_BA.js
index 8cbd9f2787..4cfae35c65 100644
--- a/js/test/date/testdatefmt_bs_Latn_BA.js
+++ b/js/test/date/testdatefmt_bs_Latn_BA.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_bs_Latn_BA.js - test the date formatter object in Latin Bosnian
  *
- * Copyright © 2012-2015,2017-2018,2020,2023 JEDLSoft
+ * Copyright © 2012-2015, 2017-2018, 2020, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -202,7 +202,7 @@ module.exports.testdatefmt_bs_Latn_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. 9. 2011. 13:45");
+        test.equal(fmt.format(date), "29. 9. 2011. u 13:45");
         test.done();
     },
     testDateFmtDateTimeSimpleMedium_bs_Latn_BA: function(test) {
@@ -220,7 +220,7 @@ module.exports.testdatefmt_bs_Latn_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. sep 2011. 13:45");
+        test.equal(fmt.format(date), "29. sep 2011. u 13:45");
         test.done();
     },
     testDateFmtDateTimeSimpleLong_bs_Latn_BA: function(test) {
@@ -473,7 +473,7 @@ module.exports.testdatefmt_bs_Latn_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. 9. 2011. 13:45");
+        test.equal(fmt.format(date), "29. 9. 2011. u 13:45");
         test.done();
     },
     testDateFmtShortDateComponentsY_bs_Latn_BA: function(test) {
diff --git a/js/test/date/testdatefmt_ca.js b/js/test/date/testdatefmt_ca.js
index 418bf25908..85b4e845fd 100644
--- a/js/test/date/testdatefmt_ca.js
+++ b/js/test/date/testdatefmt_ca.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_ca.js - test the date formatter object in Catalan
  *
- * Copyright © 2020-2021,2023 JEDLSoft
+ * Copyright © 2020-2021, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 de setembre de 2011");
+        test.equal(fmt.format(date), "29 de setembre del 2011");
         test.done();
     },
     testDateFmtSimpleFull_ca_AD: function(test) {
@@ -112,7 +112,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 de setembre de 2011');
+        test.equal(fmt.format(date), '29 de setembre del 2011');
         test.done();
     },
     testDateFmtSimpleTimeShort_ca_AD: function(test) {
@@ -238,7 +238,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 de setembre de 2011, a les 13:45');
+        test.equal(fmt.format(date), '29 de setembre del 2011, a les 13:45');
         test.done();
     },
     testDateFmtDateTimeSimpleFull_ca_AD: function(test) {
@@ -256,7 +256,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 de setembre de 2011, a les 13:45');
+        test.equal(fmt.format(date), '29 de setembre del 2011, a les 13:45');
         test.done();
     },
     testDateFmtTemplateCalendar_ca_AD: function(test) {
@@ -635,7 +635,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'dj, 29/9');
+        test.equal(fmt.format(date), 'dj., 29/9');
         test.done();
     },
     testDateFmtShortDateComponentsWDMY_ca_AD: function(test) {
@@ -653,7 +653,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'dj, 29/9/11');
+        test.equal(fmt.format(date), 'dj., 29/9/11');
         test.done();
     },
     testDateFmtLongDateComponentsWDM_ca_AD: function(test) {
@@ -761,7 +761,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'setembre de 2011');
+        test.equal(fmt.format(date), 'setembre del 2011');
         test.done();
     },
     testDateFmtFullDateComponentsDMY_ca_AD: function(test) {
@@ -779,7 +779,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 de setembre de 2011');
+        test.equal(fmt.format(date), '29 de setembre del 2011');
         test.done();
     },
     testDateFmtFullDateComponentsWDM_ca_AD: function(test) {
@@ -815,7 +815,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'dijous, 29 de setembre de 2011');
+        test.equal(fmt.format(date), 'dijous, 29 de setembre del 2011');
         test.done();
     },
     testDateFmtShortTimeComponentsS_ca_AD: function(test) {
@@ -1769,7 +1769,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 de setembre de 2011");
+        test.equal(fmt.format(date), "29 de setembre del 2011");
         test.done();
     },
     testDateFmtSimpleFull_ca_ES: function(test) {
@@ -1787,7 +1787,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 de setembre de 2011');
+        test.equal(fmt.format(date), '29 de setembre del 2011');
         test.done();
     },
     testDateFmtSimpleTimeShort_ca_ES: function(test) {
@@ -1913,7 +1913,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 de setembre de 2011, a les 13:45');
+        test.equal(fmt.format(date), '29 de setembre del 2011, a les 13:45');
         test.done();
     },
     testDateFmtDateTimeSimpleFull_ca_ES: function(test) {
@@ -1931,7 +1931,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 de setembre de 2011, a les 13:45');
+        test.equal(fmt.format(date), '29 de setembre del 2011, a les 13:45');
         test.done();
     },
     testDateFmtTemplateCalendar_ca_ES: function(test) {
@@ -2310,7 +2310,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'dj, 29/9');
+        test.equal(fmt.format(date), 'dj., 29/9');
         test.done();
     },
     testDateFmtShortDateComponentsWDMY_ca_ES: function(test) {
@@ -2328,7 +2328,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'dj, 29/9/11');
+        test.equal(fmt.format(date), 'dj., 29/9/11');
         test.done();
     },
     testDateFmtLongDateComponentsWDM_ca_ES: function(test) {
@@ -2436,7 +2436,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'setembre de 2011');
+        test.equal(fmt.format(date), 'setembre del 2011');
         test.done();
     },
     testDateFmtFullDateComponentsDMY_ca_ES: function(test) {
@@ -2454,7 +2454,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '29 de setembre de 2011');
+        test.equal(fmt.format(date), '29 de setembre del 2011');
         test.done();
     },
     testDateFmtFullDateComponentsWDM_ca_ES: function(test) {
@@ -2490,7 +2490,7 @@ module.exports.testdatefmt_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'dijous, 29 de setembre de 2011');
+        test.equal(fmt.format(date), 'dijous, 29 de setembre del 2011');
         test.done();
     },
     testDateFmtShortTimeComponentsS_ca_ES: function(test) {
diff --git a/js/test/date/testdatefmt_da_DK.js b/js/test/date/testdatefmt_da_DK.js
index ecd155a8a8..5fc22cf930 100644
--- a/js/test/date/testdatefmt_da_DK.js
+++ b/js/test/date/testdatefmt_da_DK.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_da_DK.js - test the date formatter object in Danish
  *
- * Copyright © 2012-2015,2017,2023 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -201,7 +201,7 @@ module.exports.testdatefmt_da_DK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29.09.2011 13.45");
+        test.equal(fmt.format(date), "29.09.2011, 13.45");
         test.done();
     },
     testDateFmtDADKDateTimeSimpleMedium: function(test) {
@@ -219,7 +219,7 @@ module.exports.testdatefmt_da_DK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. sep. 2011 13.45");
+        test.equal(fmt.format(date), "29. sep. 2011, 13.45");
         test.done();
     },
     testDateFmtDADKDateTimeSimpleLong: function(test) {
@@ -489,7 +489,7 @@ module.exports.testdatefmt_da_DK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29.09.2011 13.45");
+        test.equal(fmt.format(date), "29.09.2011, 13.45");
         test.done();
     },
     testDateFmtDADKShortDateComponentsY: function(test) {
diff --git a/js/test/date/testdatefmt_en_GB.js b/js/test/date/testdatefmt_en_GB.js
index d3a7e9f277..fff133bc29 100644
--- a/js/test/date/testdatefmt_en_GB.js
+++ b/js/test/date/testdatefmt_en_GB.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_en_GB.js - test the date formatter object in British English
  *
- * Copyright © 2012-2015,2017,2021-2022-2023 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2021-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -825,7 +825,7 @@ module.exports.testdatefmt_en_GB = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "T, 29/09");
+        test.equal(fmt.format(date), "T 29/09");
         test.done();
     },
     testDateFmtGBShortDateComponentsWDMY: function(test) {
@@ -843,7 +843,7 @@ module.exports.testdatefmt_en_GB = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "T, 29/09/2011");
+        test.equal(fmt.format(date), "T 29/09/2011");
         test.done();
     },
     testDateFmtGBFullDateComponentsY: function(test) {
@@ -969,7 +969,7 @@ module.exports.testdatefmt_en_GB = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "Thursday, 29 September");
+        test.equal(fmt.format(date), "Thursday 29 September");
         test.done();
     },
     testDateFmtGBFullDateComponentsWDMY: function(test) {
@@ -987,7 +987,7 @@ module.exports.testdatefmt_en_GB = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "Thursday, 29 September 2011");
+        test.equal(fmt.format(date), "Thursday 29 September 2011");
         test.done();
     },
     testDateFmtGBShortTimeComponentsS: function(test) {
diff --git a/js/test/date/testdatefmt_en_IN.js b/js/test/date/testdatefmt_en_IN.js
index 43893719e4..4ea3c295e8 100644
--- a/js/test/date/testdatefmt_en_IN.js
+++ b/js/test/date/testdatefmt_en_IN.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_en_IN.js - test the date formatter object in Indian English
  *
- * Copyright © 2012-2015,2017,2021,2023 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2021, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ module.exports.testdatefmt_en_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29-Sept-2011");
+        test.equal(fmt.format(date), "29 Sept 2011");
         test.done();
     },
     testDateFmtINSimpleLong: function(test) {
@@ -218,7 +218,7 @@ module.exports.testdatefmt_en_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29-Sept-2011, 1:45 pm");
+        test.equal(fmt.format(date), "29 Sept 2011, 1:45 pm");
         test.done();
     },
     testDateFmtINDateTimeSimpleLong: function(test) {
@@ -633,7 +633,7 @@ module.exports.testdatefmt_en_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "T, 29/09");
+        test.equal(fmt.format(date), "T 29/09");
         test.done();
     },
     testDateFmtINShortDateComponentsWDMY: function(test) {
@@ -651,7 +651,7 @@ module.exports.testdatefmt_en_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "T, 29/09/11");
+        test.equal(fmt.format(date), "T 29/09/11");
         test.done();
     },
     testDateFmtINFullDateComponentsY: function(test) {
@@ -777,7 +777,7 @@ module.exports.testdatefmt_en_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "Thursday, 29 September");
+        test.equal(fmt.format(date), "Thursday 29 September");
         test.done();
     },
     testDateFmtINFullDateComponentsWDMY: function(test) {
@@ -795,7 +795,7 @@ module.exports.testdatefmt_en_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "Thursday, 29 September, 2011");
+        test.equal(fmt.format(date), "Thursday 29 September, 2011");
         test.done();
     },
     testDateFmtINShortTimeComponentsS: function(test) {
diff --git a/js/test/date/testdatefmt_eu_ES.js b/js/test/date/testdatefmt_eu_ES.js
index 8721efd459..ce23f9d1aa 100644
--- a/js/test/date/testdatefmt_eu_ES.js
+++ b/js/test/date/testdatefmt_eu_ES.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_eu_ES.js - test the date formatter object in Basque/Spain
  *
- * Copyright © 2020-2021,2023 JEDLSoft
+ * Copyright © 2020-2021, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -201,7 +201,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '11/9/29, 13:45');
+        test.equal(fmt.format(date), '11/9/29 (13:45)');
         test.done();
     },
     testDateFmtDateTimeSimpleMedium_eu_ES: function(test) {
@@ -219,7 +219,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '2011(e)ko ira. 29(a), 13:45');
+        test.equal(fmt.format(date), '2011(e)ko ira. 29(a) (13:45)');
         test.done();
     },
     testDateFmtDateTimeSimpleLong_eu_ES: function(test) {
@@ -490,7 +490,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), '11/9/29, 13:45');
+        test.equal(fmt.format(date), '11/9/29 (13:45)');
         test.done();
     },
     testDateFmtShortDateComponentsY_eu_ES: function(test) {
@@ -1370,7 +1370,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 30,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "Duela 30 segundo");
+        test.equal(fmt.formatRelative(reference, date), "duela 30 segundo");
         test.done();
     },
     testDateFmtFormatRelativeWithinHourAfter_eu_ES: function(test) {
@@ -1426,7 +1426,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), 'Duela 10 minutu');
+        test.equal(fmt.formatRelative(reference, date), 'duela 10 minutu');
         test.done();
     },
     testDateFmtFormatRelativeWithinDayAfter_eu_ES: function(test) {
@@ -1482,7 +1482,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), 'Duela 4 ordu');
+        test.equal(fmt.formatRelative(reference, date), 'duela 4 ordu');
         test.done();
     },
     testDateFmtFormatRelativeWithinFortnightAfter_eu_ES: function(test) {
@@ -1538,7 +1538,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date),  'Duela 4 egun');
+        test.equal(fmt.formatRelative(reference, date),  'duela 4 egun');
         test.done();
     },
     testDateFmtFormatRelativeWithinQuarterAfter_eu_ES: function(test) {
@@ -1594,7 +1594,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), 'Duela 9 aste');
+        test.equal(fmt.formatRelative(reference, date), 'duela 9 aste');
         test.done();
     },
     testDateFmtFormatRelativeWithinTwoYearsAfter_eu_ES: function(test) {
@@ -1650,7 +1650,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), 'Duela 14 hilabete');
+        test.equal(fmt.formatRelative(reference, date), 'duela 14 hilabete');
         test.done();
     },
     testDateFmtFormatRelativeYearsAfter_eu_ES: function(test) {
@@ -1706,7 +1706,7 @@ module.exports.testdatefmt_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), 'Duela 21 urte');
+        test.equal(fmt.formatRelative(reference, date), 'duela 21 urte');
         test.done();
     }
 };
\ No newline at end of file
diff --git a/js/test/date/testdatefmt_fi_FI.js b/js/test/date/testdatefmt_fi_FI.js
index 9149d08521..0f1da72ee7 100644
--- a/js/test/date/testdatefmt_fi_FI.js
+++ b/js/test/date/testdatefmt_fi_FI.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_fi_FI.js - test the date formatter object in Finnish
  *
- * Copyright © 2012-2015,2017-2018,2023 JEDLSoft
+ * Copyright © 2012-2015, 2017-2018, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -201,7 +201,7 @@ module.exports.testdatefmt_fi_FI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29.9.2011 13.45");
+        test.equal(fmt.format(date), "29.9.2011 klo 13.45");
         test.done();
     },
     testDateFmtDateTimeSimpleMedium_fi_FI: function(test) {
@@ -471,7 +471,7 @@ module.exports.testdatefmt_fi_FI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29.9.2011 13.45");
+        test.equal(fmt.format(date), "29.9.2011 klo 13.45");
         test.done();
     },
     testDateFmtShortDateComponentsY_fi_FI: function(test) {
diff --git a/js/test/date/testdatefmt_gl_ES.js b/js/test/date/testdatefmt_gl_ES.js
index 5ad6e54d6d..b1c395a6b7 100644
--- a/js/test/date/testdatefmt_gl_ES.js
+++ b/js/test/date/testdatefmt_gl_ES.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_gl_ES.js - test the date formatter object in Galician-Spain
  *
- * Copyright © 2020,2023 JEDLSoft
+ * Copyright © 2020, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -526,7 +526,7 @@ module.exports.testdatefmt_gl_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "Se");
+        test.equal(fmt.format(date), "se");
         test.done();
     },
     testDateFmtShortDateComponentsN_gl_ES: function(test) {
@@ -706,7 +706,7 @@ module.exports.testdatefmt_gl_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "Setembro");
+        test.equal(fmt.format(date), "setembro");
         test.done();
     },
     testDateFmtFullDateComponentsD_gl_ES: function(test) {
diff --git a/js/test/date/testdatefmt_kk_Cyrl_KZ.js b/js/test/date/testdatefmt_kk_Cyrl_KZ.js
index b1131d3fe5..0b00d69391 100644
--- a/js/test/date/testdatefmt_kk_Cyrl_KZ.js
+++ b/js/test/date/testdatefmt_kk_Cyrl_KZ.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_kk_cyrl_KZ.js - test the date formatter object in Cyrillic Kazakhstan
  *
- * Copyright © 2012-2015,2017,2020,2023 JEDLSoft
+ * Copyright © 2012-2015,2017,2020,2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -853,7 +853,7 @@ module.exports.testdatefmt_kk_Cyrl_KZ = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 +06");
+        test.equal(fmt.format(date), "13:45 +05");
         test.done();
     },
     testDateFmtShortTimeComponentsHMAZ_kk_Cyrl_KZ: function(test) {
@@ -875,7 +875,7 @@ module.exports.testdatefmt_kk_Cyrl_KZ = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 +06");
+        test.equal(fmt.format(date), "13:45:37 +05");
         test.done();
     },
     testDateFmtShortTimeComponentsHMSA_kk_Cyrl_KZ: function(test) {
@@ -915,7 +915,7 @@ module.exports.testdatefmt_kk_Cyrl_KZ = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 +06");
+        test.equal(fmt.format(date), "13:45:37 +05");
         test.done();
     },
     testDateFmtShortTimeComponentsHMSAZ_kk_Cyrl_KZ: function(test) {
@@ -937,7 +937,7 @@ module.exports.testdatefmt_kk_Cyrl_KZ = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 +06");
+        test.equal(fmt.format(date), "13:45:37 +05");
         test.done();
     },
     testDateFmtFullTimeComponentsS_kk_Cyrl_KZ: function(test) {
@@ -1068,7 +1068,7 @@ module.exports.testdatefmt_kk_Cyrl_KZ = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 +06");
+        test.equal(fmt.format(date), "13:45 +05");
         test.done();
     },
     testDateFmtFullTimeComponentsHMSA_kk_Cyrl_KZ: function(test) {
@@ -1109,7 +1109,7 @@ module.exports.testdatefmt_kk_Cyrl_KZ = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 +06");
+        test.equal(fmt.format(date), "13:45:37 +05");
         test.done();
     },
     testDateFmtFullTimeComponentsHMSAZ_kk_Cyrl_KZ: function(test) {
@@ -1132,7 +1132,7 @@ module.exports.testdatefmt_kk_Cyrl_KZ = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 +06");
+        test.equal(fmt.format(date), "13:45:37 +05");
         test.done();
     },
     testDateFmtWithTimeZoneAndNoDST_kk_Cyrl_KZ: function(test) {
@@ -1156,7 +1156,7 @@ module.exports.testdatefmt_kk_Cyrl_KZ = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 +06");
+        test.equal(fmt.format(date), "13:45:37 +05");
         test.done();
     },
     /*function testDateFmtFormatRelativeWithinMinuteAfter_kk_Cyrl_KZ() {
diff --git a/js/test/date/testdatefmt_ko_KR.js b/js/test/date/testdatefmt_ko_KR.js
index c0ac9aefb5..1f09e0aabd 100644
--- a/js/test/date/testdatefmt_ko_KR.js
+++ b/js/test/date/testdatefmt_ko_KR.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_ko_KR.js - test the date formatter object in Korean
  *
- * Copyright © 2012-2015,2017,2022 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -718,7 +718,7 @@ module.exports.testdatefmt_ko_KR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "9");
+        test.equal(fmt.format(date), "9월");
         test.done();
     },
     testDateFmtShortDateComponentsD_ko_KR: function(test) {
diff --git a/js/test/date/testdatefmt_nl_NL.js b/js/test/date/testdatefmt_nl_NL.js
index d8c79c09ea..79ff462a85 100644
--- a/js/test/date/testdatefmt_nl_NL.js
+++ b/js/test/date/testdatefmt_nl_NL.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_nl_NL.js - test the date formatter object in the Netherlands
  *
- * Copyright © 2012-2015,2017,2023 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -201,7 +201,7 @@ module.exports.testdatefmt_nl_NL = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29-09-2011 13:45");
+        test.equal(fmt.format(date), "29-09-2011, 13:45");
         test.done();
     },
     testDateFmtDateTimeSimpleMedium_nl_NL: function(test) {
@@ -219,7 +219,7 @@ module.exports.testdatefmt_nl_NL = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 sep 2011 13:45");
+        test.equal(fmt.format(date), "29 sep 2011, 13:45");
         test.done();
     },
     testDateFmtDateTimeSimpleLong_nl_NL: function(test) {
@@ -490,7 +490,7 @@ module.exports.testdatefmt_nl_NL = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29-09-2011 13:45");
+        test.equal(fmt.format(date), "29-09-2011, 13:45");
         test.done();
     },
     testDateFmtShortDateComponentsY_nl_NL: function(test) {
diff --git a/js/test/date/testdatefmt_ps_PK.js b/js/test/date/testdatefmt_ps_PK.js
index a328dc3773..fdcc796779 100644
--- a/js/test/date/testdatefmt_ps_PK.js
+++ b/js/test/date/testdatefmt_ps_PK.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_ps_PK.js - test the date formatter object in Pashto-Pakistan
  *
- * Copyright © 2022, JEDLSoft
+ * Copyright © 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'د 2021 د سېپتمبر 29');
+        test.equal(fmt.format(date), '‏2021 سېپتمبر 29');
         test.done();
     },
     testDateFmtSimpleFull_ps_PK: function(test) {
@@ -111,7 +111,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'د 2021 د سېپتمبر 29');
+        test.equal(fmt.format(date), '‏2021 د سېپتمبر 29');
         test.done();
     },
     testDateFmtSimpleTimeShort_ps_PK: function(test) {
@@ -237,7 +237,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'د 2021 د سېپتمبر 29 ‏1:45 غ.و.');
+        test.equal(fmt.format(date), '‏2021 سېپتمبر 29 ‏1:45 غ.و.');
         test.done();
     },
     testDateFmtDateTimeSimpleFull_ps_PK: function(test) {
@@ -255,7 +255,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'د 2021 د سېپتمبر 29 ‏1:45 غ.و.');
+        test.equal(fmt.format(date), '‏2021 د سېپتمبر 29 ‏1:45 غ.و.');
         test.done();
     },
     testDateFmtTemplateCalendar_ps_PK: function(test) {
@@ -616,7 +616,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'W ‏9/29');
+        test.equal(fmt.format(date), 'W د ‏9/29');
         test.done();
     },
     testDateFmtShortDateComponentsWDMY_ps_PK: function(test) {
@@ -634,7 +634,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'W 2021/9/29');
+        test.equal(fmt.format(date), 'W د 2021/9/29');
         test.done();
     },
     testDateFmtLongDateComponentsWDM_ps_PK: function(test) {
@@ -652,7 +652,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date),'څلرنۍ سېپتمبر 29');
+        test.equal(fmt.format(date), 'څلرنۍ د سېپتمبر 29');
         test.done();
     },
     testDateFmtFullDateComponentsY_ps_PK: function(test) {
@@ -742,7 +742,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'د 2021 د سېپتمبر');
+        test.equal(fmt.format(date), '‏2021 د سېپتمبر');
         test.done();
     },
     testDateFmtFullDateComponentsDMY_ps_PK: function(test) {
@@ -760,7 +760,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'د 2021 د سېپتمبر 29');
+        test.equal(fmt.format(date), '‏2021 د سېپتمبر 29');
         test.done();
     },
     testDateFmtFullDateComponentsWDM_ps_PK: function(test) {
@@ -778,7 +778,7 @@ module.exports.testdatefmt_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), 'څلرنۍ سېپتمبر 29');
+        test.equal(fmt.format(date), 'څلرنۍ د سېپتمبر 29');
         test.done();
     },
     testDateFmtFullDateComponentsWDMY_ps_PK: function(test) {
diff --git a/js/test/date/testdatefmt_sl_SI.js b/js/test/date/testdatefmt_sl_SI.js
index 14ac274b0e..348c5574e8 100644
--- a/js/test/date/testdatefmt_sl_SI.js
+++ b/js/test/date/testdatefmt_sl_SI.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmt_sl_SI.js - test the date formatter object in Slovenian/Slovenia
  *
- * Copyright © 2012-2015,2017,2021,2023 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2021, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. 09. 11");
+        test.equal(fmt.format(date), "29. 9. 11");
         test.done();
     },
     testDateFmtSimpleMedium_sl_SI: function(test) {
@@ -201,7 +201,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. 09. 11, 13:45");
+        test.equal(fmt.format(date), "29. 9. 11, 13:45");
         test.done();
     },
     testDateFmtDateTimeSimpleMedium_sl_SI: function(test) {
@@ -435,7 +435,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. 09. 11");
+        test.equal(fmt.format(date), "29. 9. 11");
         test.done();
     },
     testDateFmtTypeTime_sl_SI: function(test) {
@@ -471,7 +471,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. 09. 11, 13:45");
+        test.equal(fmt.format(date), "29. 9. 11, 13:45");
         test.done();
     },
     testDateFmtShortDateComponentsY_sl_SI: function(test) {
@@ -507,7 +507,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "09");
+        test.equal(fmt.format(date), "9");
         test.done();
     },
     testDateFmtShortDateComponentsN_sl_SI: function(test) {
@@ -561,7 +561,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. 09");
+        test.equal(fmt.format(date), "29. 9");
         test.done();
     },
     testDateFmtShortDateComponentsMY_sl_SI: function(test) {
@@ -579,7 +579,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "09. 11");
+        test.equal(fmt.format(date), "9. 11");
         test.done();
     },
     testDateFmtShortDateComponentsDMY_sl_SI: function(test) {
@@ -597,7 +597,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29. 09. 11");
+        test.equal(fmt.format(date), "29. 9. 11");
         test.done();
     },
     testDateFmtShortDateComponentsWDM_sl_SI: function(test) {
@@ -615,7 +615,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "č, 29. 09");
+        test.equal(fmt.format(date), "č, 29. 9");
         test.done();
     },
     testDateFmtShortDateComponentsWDMY_sl_SI: function(test) {
@@ -633,7 +633,7 @@ module.exports.testdatefmt_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "č, 29. 09. 11");
+        test.equal(fmt.format(date), "č, 29. 9. 11");
         test.done();
     },
     testDateFmtFullDateComponentsY_sl_SI: function(test) {
diff --git a/js/test/date/testdatefmt_vi_VN.js b/js/test/date/testdatefmt_vi_VN.js
index 94ae54c353..77fad8a99d 100644
--- a/js/test/date/testdatefmt_vi_VN.js
+++ b/js/test/date/testdatefmt_vi_VN.js
@@ -1,7 +1,7 @@
 /*
- * testdatefmt_de_DE.js - test the date formatter object in German
+ * testdatefmt_vi_VN.js - test the date formatter object in Vietnamese-Vietnam
  *
- * Copyright © 2012-2015,2017,2020 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2020, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29/09/2011");
+        test.equal(fmt.format(date), "29/9/11");
         test.done();
     },
     testDateFmtSimpleMedium_vi_VN: function(test) {
@@ -129,7 +129,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "T5, 29/09/2011");
+        test.equal(fmt.format(date), "T5, 29/9/11");
         test.done();
     },
     testDateFmtAllComponentsMedium_vi_VN: function(test) {
@@ -273,7 +273,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 29/09/2011");
+        test.equal(fmt.format(date), "13:45 29/9/11");
         test.done();
     },
     testDateFmtDateTimeSimpleMedium_vi_VN: function(test) {
@@ -507,7 +507,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29/09/2011");
+        test.equal(fmt.format(date), "29/9/11");
         test.done();
     },
     testDateFmtTypeTime_vi_VN: function(test) {
@@ -543,7 +543,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 29/09/2011");
+        test.equal(fmt.format(date), "13:45 29/9/11");
         test.done();
     },
     testDateFmtShortDateComponentsY_vi_VN: function(test) {
@@ -561,7 +561,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "2011");
+        test.equal(fmt.format(date), "11");
         test.done();
     },
     testDateFmtShortDateComponentsM_vi_VN: function(test) {
@@ -579,7 +579,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "Th9");
+        test.equal(fmt.format(date), "T9");
         test.done();
     },
     testDateFmtShortDateComponentsN_vi_VN: function(test) {
@@ -633,7 +633,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29/09");
+        test.equal(fmt.format(date), "29/9");
         test.done();
     },
     testDateFmtShortDateComponentsMY_vi_VN: function(test) {
@@ -651,7 +651,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "09/2011");
+        test.equal(fmt.format(date), "9/11");
         test.done();
     },
     testDateFmtShortDateComponentsDMY_vi_VN: function(test) {
@@ -669,7 +669,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29/09/2011");
+        test.equal(fmt.format(date), "29/9/11");
         test.done();
     },
     testDateFmtShortDateComponentsWDM_vi_VN: function(test) {
@@ -687,7 +687,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "T5, 29/09");
+        test.equal(fmt.format(date), "T5, 29/9");
         test.done();
     },
     testDateFmtShortDateComponentsWDMY_vi_VN: function(test) {
@@ -705,7 +705,7 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "T5, 29/09/2011");
+        test.equal(fmt.format(date), "T5, 29/9/11");
         test.done();
     },
     testDateFmtFullDateComponentsY_vi_VN: function(test) {
diff --git a/js/test/date/testdatetimefmt.js b/js/test/date/testdatetimefmt.js
index 7ba91d63f5..dbc6918c2c 100644
--- a/js/test/date/testdatetimefmt.js
+++ b/js/test/date/testdatetimefmt.js
@@ -1,7 +1,7 @@
  /*
  * datetimefmt.js - test the date formatter template
  *
- * Copyright © 2019-2023, JEDLSoft
+ * Copyright © 2019-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -152,11 +152,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"bg-BG", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"bg-BG", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM yyyy 'г'. 'в' H:mm 'ч'.");
-        test.equal(result2, "E, d.MM.yy 'г'., H:mm 'ч'.");
+        test.equal(result1, "EEEE, d MMMM yyyy 'г'. 'в' H:mm");
+        test.equal(result2, "E, d.MM.yy 'г'., H:mm");
 
         result1 = new DateFmt({locale:"bg-BG", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, 'H:mm:ss \'ч\'. z');
+        test.equal(result1, 'H:mm:ss z');
 
         test.done();
     },
@@ -205,7 +205,7 @@ module.exports.testdatetimeformat = {
         result2 = new DateFmt({locale:"bs-Latn-BA", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "EEEE, d. MMMM yyyy. 'u' HH:mm");
-        test.equal(result2, "E, d. M. yyyy. HH:mm");
+        test.equal(result2, "E, d. M. yyyy. 'u' HH:mm");
 
         result1 = new DateFmt({locale:"bs-Latn-BA", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -231,7 +231,7 @@ module.exports.testdatetimeformat = {
         result2 = new DateFmt({locale:"bs-Latn-ME", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "EEEE, d. MMMM yyyy. 'u' HH:mm");
-        test.equal(result2, "E, d. M. yyyy. HH:mm");
+        test.equal(result2, "E, d. M. yyyy. 'u' HH:mm");
 
         result1 = new DateFmt({locale:"bs-Latn-ME", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -283,7 +283,7 @@ module.exports.testdatetimeformat = {
         result2 = new DateFmt({locale:"da-DK", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "EEEE 'den' d. MMMM yyyy 'kl'. HH.mm");
-        test.equal(result2, "E 'den' dd.MM.yyyy HH.mm");
+        test.equal(result2, "E 'den' dd.MM.yyyy, HH.mm");
 
         result1 = new DateFmt({locale:"da-DK", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH.mm.ss z");
@@ -481,16 +481,16 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"en-AU", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"en-AU", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM yyyy");
-        test.equal(result2, "EEE, d MMMM yyyy");
-        test.equal(result3, "EE, d MMM yyyy");
-        test.equal(result4, "E, d/M/yy");
+        test.equal(result1, "EEEE d MMMM yyyy");
+        test.equal(result2, "EEE d MMMM yyyy");
+        test.equal(result3, "EE d MMM yyyy");
+        test.equal(result4, "E d/M/yy");
 
         result1 = new DateFmt({locale:"en-AU", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"en-AU", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM yyyy 'at' h:mm a");
-        test.equal(result2, "E, d/M/yy, h:mm a");
+        test.equal(result1, "EEEE d MMMM yyyy 'at' h:mm a");
+        test.equal(result2, "E d/M/yy, h:mm a");
 
         result1 = new DateFmt({locale:"en-AU", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "h:mm:ss a z");
@@ -558,16 +558,16 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"en-GB", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"en-GB", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM yyyy");
-        test.equal(result2, "EEE, d MMMM yyyy");
-        test.equal(result3, "EE, d MMM yyyy");
-        test.equal(result4, "E, dd/MM/yyyy");
+        test.equal(result1, "EEEE d MMMM yyyy");
+        test.equal(result2, "EEE d MMMM yyyy");
+        test.equal(result3, "EE d MMM yyyy");
+        test.equal(result4, "E dd/MM/yyyy");
 
         result1 = new DateFmt({locale:"en-GB", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"en-GB", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM yyyy 'at' HH:mm");
-        test.equal(result2, "E, dd/MM/yyyy, HH:mm");
+        test.equal(result1, "EEEE d MMMM yyyy 'at' HH:mm");
+        test.equal(result2, "E dd/MM/yyyy, HH:mm");
 
         result1 = new DateFmt({locale:"en-GB", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -662,16 +662,16 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"en-IN", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"en-IN", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM, yyyy");
-        test.equal(result2, "EEE, d MMMM yyyy");
-        test.equal(result3, "EE, dd-MMM-yyyy");
-        test.equal(result4, "E, dd/MM/yy");
+        test.equal(result1, "EEEE d MMMM, yyyy");
+        test.equal(result2, "EEE d MMMM yyyy");
+        test.equal(result3, "EE d MMM yyyy");
+        test.equal(result4, "E dd/MM/yy");
 
         result1 = new DateFmt({locale:"en-IN", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"en-IN", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM, yyyy 'at' h:mm a");
-        test.equal(result2, "E, dd/MM/yy, h:mm a");
+        test.equal(result1, "EEEE d MMMM, yyyy 'at' h:mm a");
+        test.equal(result2, "E dd/MM/yy, h:mm a");
 
         result1 = new DateFmt({locale:"en-IN", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "h:mm:ss a z");
@@ -920,14 +920,14 @@ module.exports.testdatetimeformat = {
 
         test.equal(result1, "EEEE, d MMMM yyyy");
         test.equal(result2, "EEE, d MMMM yyyy");
-        test.equal(result3, "EE, d/MM/yyyy");
-        test.equal(result4, "E, d/MM/yy");
+        test.equal(result3, "EE, d MMM yyyy");
+        test.equal(result4, "E, dd/MM/yyyy");
 
         result1 = new DateFmt({locale:"en-NZ", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"en-NZ", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "EEEE, d MMMM yyyy 'at' h:mm a");
-        test.equal(result2, "E, d/MM/yy, h:mm a");
+        test.equal(result2, "E, dd/MM/yyyy, h:mm a");
 
         result1 = new DateFmt({locale:"en-NZ", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "h:mm:ss a z");
@@ -1134,11 +1134,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-AR", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-AR", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/M/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, d/M/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-AR", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1160,11 +1160,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-BO", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-BO", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/M/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, d/M/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-BO", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1186,11 +1186,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-CL", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-CL", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, dd-MM-yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, dd-MM-yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-CL", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1264,11 +1264,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-EC", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-EC", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/M/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, d/M/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-EC", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1316,11 +1316,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-GT", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-GT", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/MM/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, d/MM/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-GT", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1342,11 +1342,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-HN", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-HN", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE dd \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E d/M/yy, HH:mm");
+        test.equal(result1, "EEEE dd 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E d/M/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-HN", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1368,11 +1368,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-MX", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-MX", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, dd/MM/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, dd/MM/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-MX", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1394,11 +1394,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-NI", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-NI", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/M/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, d/M/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-NI", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1445,11 +1445,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-PE", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-PE", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/MM/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, d/MM/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-PE", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1497,11 +1497,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-PY", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-PY", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/M/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, d/M/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-PY", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1523,11 +1523,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-SV", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-SV", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/M/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, d/M/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-SV", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1575,11 +1575,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-UY", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-UY", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/M/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, 'E, d/M/yy, h:mm a');
 
         result1 = new DateFmt({locale:"es-UY", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -1706,7 +1706,7 @@ module.exports.testdatetimeformat = {
         result2 = new DateFmt({locale:"fi-FI", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "cccc d. MMMM yyyy 'klo' H.mm");
-        test.equal(result2, "c d.M.yyyy H.mm");
+        test.equal(result2, "c d.M.yyyy 'klo' H.mm");
 
         result1 = new DateFmt({locale:"fi-FI", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "H.mm.ss z");
@@ -2217,15 +2217,15 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"ko-KR", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"ko-KR", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "yyyy년 M월 d일 EEEE");
-        test.equal(result2, "yyyy년 M월 d일 EEE");
+        test.equal(result1, "yyyy년 MMMM d일 EEEE");
+        test.equal(result2, "yyyy년 MMMM d일 EEE");
         test.equal(result3, "yyyy. M. d. EE");
         test.equal(result4, "yy. M. d. E");
 
         result1 = new DateFmt({locale:"ko-KR", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"ko-KR", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "yyyy년 M월 d일 EEEE a h:mm");
+        test.equal(result1, "yyyy년 MMMM d일 EEEE a h:mm");
         test.equal(result2, "yy. M. d. E a h:mm");
 
         result1 = new DateFmt({locale:"ko-KR", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -2508,7 +2508,7 @@ module.exports.testdatetimeformat = {
         result2 = new DateFmt({locale:"nl-BE", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "EEEE d MMMM yyyy 'om' HH:mm");
-        test.equal(result2, "E d/MM/yyyy HH:mm");
+        test.equal(result2, "E d/MM/yyyy, HH:mm");
 
         result1 = new DateFmt({locale:"nl-BE", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -2534,7 +2534,7 @@ module.exports.testdatetimeformat = {
         result2 = new DateFmt({locale:"nl-NL", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "EEEE d MMMM yyyy 'om' HH:mm");
-        test.equal(result2, "E dd-MM-yyyy HH:mm");
+        test.equal(result2, "E dd-MM-yyyy, HH:mm");
 
         result1 = new DateFmt({locale:"nl-NL", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -2919,13 +2919,13 @@ module.exports.testdatetimeformat = {
         test.equal(result1, "EEEE, d. MMMM yyyy");
         test.equal(result2, "EEE, d. MMMM yyyy");
         test.equal(result3, "EE, d. MMM yyyy");
-        test.equal(result4, "E, d. MM. yy");
+        test.equal(result4, "E, d. M. yy");
 
         result1 = new DateFmt({locale:"sl-SI", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"sl-SI", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "EEEE, d. MMMM yyyy 'ob' HH:mm");
-        test.equal(result2, "E, d. MM. yy, HH:mm");
+        test.equal(result2, "E, d. M. yy, HH:mm");
 
         result1 = new DateFmt({locale:"sl-SI", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -3310,13 +3310,13 @@ module.exports.testdatetimeformat = {
         test.equal(result1, "EEEE, d MMMM, yyyy");
         test.equal(result2, "EEE, d MMMM, yyyy");
         test.equal(result3, "EE, d MMM, yyyy");
-        test.equal(result4, "E, dd/MM/yyyy");
+        test.equal(result4, "E, d/M/yy");
 
         result1 = new DateFmt({locale:"vi-VN", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"vi-VN", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "'lúc' HH:mm EEEE, d MMMM, yyyy");
-        test.equal(result2, "HH:mm E, dd/MM/yyyy");
+        test.equal(result2, "HH:mm E, d/M/yy");
 
         result1 = new DateFmt({locale:"vi-VN", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -3468,11 +3468,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"en-MX", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"en-MX", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, MMMM d, yyyy 'at' HH:mm");
-        test.equal(result2, "E, M/d/yy, HH:mm");
+        test.equal(result1, "EEEE, MMMM d, yyyy 'at' h:mm a");
+        test.equal(result2, 'E, M/d/yy, h:mm a');
 
         result1 = new DateFmt({locale:"en-MX", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, 'h:mm:ss a z');
 
         test.done();
     },
@@ -4374,11 +4374,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-CR", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-CR", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy, HH:mm');
-        test.equal(result2, "E, d/M/yy, HH:mm");
+        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result2, "E, d/M/yy, h:mm a");
 
         result1 = new DateFmt({locale:"es-CR", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "HH:mm:ss z");
+        test.equal(result1, "h:mm:ss a z");
 
         test.done();
     },
@@ -5195,15 +5195,15 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"ca-AD", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"ca-AD", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM \'de\' yyyy");
-        test.equal(result2, "EEE, d MMMM \'de\' yyyy");
+        test.equal(result1, "EEEE, d MMMM 'del' yyyy");
+        test.equal(result2, "EEE, d MMMM 'del' yyyy");
         test.equal(result3, "EE, d MMM yyyy");
         test.equal(result4, "E, d/M/yy");
 
         result1 = new DateFmt({locale:"ca-AD", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"ca-AD", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM 'de' yyyy, 'a' 'les' H:mm");
+        test.equal(result1, "EEEE, d MMMM 'del' yyyy, 'a' 'les' H:mm");
         test.equal(result2, "E, d/M/yy H:mm");
 
         result1 = new DateFmt({locale:"ca-AD", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -5220,15 +5220,15 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"ca-ES", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"ca-ES", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM \'de\' yyyy");
-        test.equal(result2, "EEE, d MMMM \'de\' yyyy");
+        test.equal(result1, "EEEE, d MMMM 'del' yyyy");
+        test.equal(result2, "EEE, d MMMM 'del' yyyy");
         test.equal(result3, "EE, d MMM yyyy");
         test.equal(result4, "E, d/M/yy");
 
         result1 = new DateFmt({locale:"ca-ES", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"ca-ES", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM 'de' yyyy, 'a' 'les' H:mm");
+        test.equal(result1, "EEEE, d MMMM 'del' yyyy, 'a' 'les' H:mm");
         test.equal(result2, "E, d/M/yy H:mm");
 
         result1 = new DateFmt({locale:"ca-ES", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -5277,7 +5277,7 @@ module.exports.testdatetimeformat = {
         result2 = new DateFmt({locale:"eu-ES", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "yyyy('e')'ko' MMMM'ren' d('a'), EEEE (HH:mm)");
-        test.equal(result2, "yy/M/d, E, HH:mm");
+        test.equal(result2, "yy/M/d, E (HH:mm)");
 
         result1 = new DateFmt({locale:"eu-ES", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1,  "HH:mm:ss (z)");
diff --git a/js/test/daterange/testdatefmtrange_bg_BG.js b/js/test/daterange/testdatefmtrange_bg_BG.js
index 4f5cc1b641..ef4f09c0f0 100644
--- a/js/test/daterange/testdatefmtrange_bg_BG.js
+++ b/js/test/daterange/testdatefmtrange_bg_BG.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_bg_BG.js - test the date range formatter object in Bulgarian/Bulgaria
  *
- * Copyright © 2012-2017,2021,2023 JEDLSoft
+ * Copyright © 2012-2017, 2021, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31.12.11 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31.12.11 г., 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeinDayMedium: function(test) {
@@ -81,7 +81,7 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31.12.2011 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31.12.2011 г., 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeinDayLong: function(test) {
@@ -107,7 +107,7 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31 декември 2011 г. в 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31 декември 2011 г. в 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeinDayFull: function(test) {
@@ -133,7 +133,7 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31 декември 2011 г. в 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31 декември 2011 г. в 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayShort: function(test) {
@@ -159,7 +159,7 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30.12.11 г., 13:45 ч. – 31.12.11 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30.12.11 г., 13:45 – 31.12.11 г., 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayMedium: function(test) {
@@ -185,7 +185,7 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30.12.2011 г., 13:45 ч. – 31.12.2011 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30.12.2011 г., 13:45 – 31.12.2011 г., 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayLong: function(test) {
@@ -211,7 +211,7 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30 декември 2011 г. в 13:45 ч. – 31 декември 2011 г. в 14:30 ч.');
+        test.equal(fmt.format(start, end), '30 декември 2011 г. в 13:45 – 31 декември 2011 г. в 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayFull: function(test) {
@@ -237,7 +237,7 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30 декември 2011 г. в 13:45 ч. – 31 декември 2011 г. в 14:30 ч.');
+        test.equal(fmt.format(start, end), '30 декември 2011 г. в 13:45 – 31 декември 2011 г. в 14:30');
         test.done();
     },
     testDateRngFmtBGRangeMultiDayShort: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_bs_Latn_BA.js b/js/test/daterange/testdatefmtrange_bs_Latn_BA.js
index 72ce16e8dc..4c4184b74d 100644
--- a/js/test/daterange/testdatefmtrange_bs_Latn_BA.js
+++ b/js/test/daterange/testdatefmtrange_bs_Latn_BA.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_bs_Latn_BA.js - test the date range formatter object in Bosnian/Herzegovina
  *
- * Copyright © 2012-2017, JEDLSoft
+ * Copyright © 2012-2017, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ module.exports.testdatefmtrange_bs_Latn_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31. 12. 2011. 13:45 – 14:30');
+        test.equal(fmt.format(start, end), '31. 12. 2011. u 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBARangeInDayMedium: function(test) {
@@ -81,7 +81,7 @@ module.exports.testdatefmtrange_bs_Latn_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31. dec 2011. 13:45 – 14:30');
+        test.equal(fmt.format(start, end), '31. dec 2011. u 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBARangeInDayLong: function(test) {
@@ -159,7 +159,7 @@ module.exports.testdatefmtrange_bs_Latn_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30. 12. 2011. 13:45 – 31. 12. 2011. 14:30');
+        test.equal(fmt.format(start, end), '30. 12. 2011. u 13:45 – 31. 12. 2011. u 14:30');
         test.done();
     },
     testDateRngFmtBARangeNextDayMedium: function(test) {
@@ -185,7 +185,7 @@ module.exports.testdatefmtrange_bs_Latn_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30. dec 2011. 13:45 – 31. dec 2011. 14:30');
+        test.equal(fmt.format(start, end), '30. dec 2011. u 13:45 – 31. dec 2011. u 14:30');
         test.done();
     },
     testDateRngFmtBARangeNextDayLong: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_ca.js b/js/test/daterange/testdatefmtrange_ca.js
index 9552952621..412f545484 100644
--- a/js/test/daterange/testdatefmtrange_ca.js
+++ b/js/test/daterange/testdatefmtrange_ca.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_ca.js - test the date range formatter object Catalan
  *
- * Copyright © 2020-2021, JEDLSoft
+ * Copyright © 2020-2021, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -108,7 +108,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de desembre de 2011, a les 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de desembre del 2011, a les 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtcaADRangeInDayFull: function(test) {
@@ -134,7 +134,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de desembre de 2011, a les 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de desembre del 2011, a les 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtcaADRangeNextDayShort: function(test) {
@@ -212,7 +212,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de desembre de 2011, a les 13:45 – 31 de desembre de 2011, a les 14:30");
+        test.equal(fmt.format(start, end), "30 de desembre del 2011, a les 13:45 – 31 de desembre del 2011, a les 14:30");
         test.done();
     },
     testDateRngFmtcaADRangeNextDayFull: function(test) {
@@ -238,7 +238,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de desembre de 2011, a les 13:45 – 31 de desembre de 2011, a les 14:30");
+        test.equal(fmt.format(start, end), "30 de desembre del 2011, a les 13:45 – 31 de desembre del 2011, a les 14:30");
         test.done();
     },
     testDateRngFmtcaADRangeMultiDayShort: function(test) {
@@ -316,7 +316,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 – 31 de desembre de 2011");
+        test.equal(fmt.format(start, end), "20 – 31 de desembre del 2011");
         test.done();
     },
     testDateRngFmtcaADRangeMultiDayFull: function(test) {
@@ -342,7 +342,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 – 31 de desembre de 2011");
+        test.equal(fmt.format(start, end), "20 – 31 de desembre del 2011");
         test.done();
     },
     testDateRngFmtcaADRangeNextMonthShort: function(test) {
@@ -420,7 +420,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de novembre – 31 de desembre de 2011");
+        test.equal(fmt.format(start, end), "20 de novembre – 31 de desembre del 2011");
         test.done();
     },
     testDateRngFmtcaADRangeNextMonthFull: function(test) {
@@ -446,7 +446,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de novembre – 31 de desembre de 2011");
+        test.equal(fmt.format(start, end), "20 de novembre – 31 de desembre del 2011");
         test.done();
     },
     testDateRngFmtcaADRangeNextYearShort: function(test) {
@@ -524,7 +524,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de novembre de 2011 – 31 de gener de 2012");
+        test.equal(fmt.format(start, end), "20 de novembre del 2011 – 31 de gener del 2012");
         test.done();
     },
     testDateRngFmtcaADRangeNextYearFull: function(test) {
@@ -550,7 +550,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de novembre de 2011 – 31 de gener de 2012");
+        test.equal(fmt.format(start, end), "20 de novembre del 2011 – 31 de gener del 2012");
         test.done();
     },
     testDateRngFmtcaADRangeMultiYearShort: function(test) {
@@ -628,7 +628,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "novembre de 2011 – gener de 2014");
+        test.equal(fmt.format(start, end), "novembre del 2011 – gener del 2014");
         test.done();
     },
     testDateRngFmtcaADRangeMultiYearFull: function(test) {
@@ -654,7 +654,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "novembre de 2011 – gener de 2014");
+        test.equal(fmt.format(start, end), "novembre del 2011 – gener del 2014");
         test.done();
     },
     testDateRngFmtcaADManyYearsFull: function(test) {
@@ -759,7 +759,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de desembre de 2011, a les 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de desembre del 2011, a les 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtcaESRangeInDayFull: function(test) {
@@ -785,7 +785,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de desembre de 2011, a les 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de desembre del 2011, a les 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtcaESRangeNextDayShort: function(test) {
@@ -863,7 +863,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de desembre de 2011, a les 13:45 – 31 de desembre de 2011, a les 14:30");
+        test.equal(fmt.format(start, end), "30 de desembre del 2011, a les 13:45 – 31 de desembre del 2011, a les 14:30");
         test.done();
     },
     testDateRngFmtcaESRangeNextDayFull: function(test) {
@@ -889,7 +889,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de desembre de 2011, a les 13:45 – 31 de desembre de 2011, a les 14:30");
+        test.equal(fmt.format(start, end), "30 de desembre del 2011, a les 13:45 – 31 de desembre del 2011, a les 14:30");
         test.done();
     },
     testDateRngFmtcaESRangeMultiDayShort: function(test) {
@@ -967,7 +967,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 – 31 de desembre de 2011");
+        test.equal(fmt.format(start, end), "20 – 31 de desembre del 2011");
         test.done();
     },
     testDateRngFmtcaESRangeMultiDayFull: function(test) {
@@ -993,7 +993,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 – 31 de desembre de 2011");
+        test.equal(fmt.format(start, end), "20 – 31 de desembre del 2011");
         test.done();
     },
     testDateRngFmtcaESRangeNextMonthShort: function(test) {
@@ -1071,7 +1071,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de novembre – 31 de desembre de 2011");
+        test.equal(fmt.format(start, end), "20 de novembre – 31 de desembre del 2011");
         test.done();
     },
     testDateRngFmtcaESRangeNextMonthFull: function(test) {
@@ -1097,7 +1097,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de novembre – 31 de desembre de 2011");
+        test.equal(fmt.format(start, end), "20 de novembre – 31 de desembre del 2011");
         test.done();
     },
     testDateRngFmtcaESRangeNextYearShort: function(test) {
@@ -1175,7 +1175,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de novembre de 2011 – 31 de gener de 2012");
+        test.equal(fmt.format(start, end), "20 de novembre del 2011 – 31 de gener del 2012");
         test.done();
     },
     testDateRngFmtcaESRangeNextYearFull: function(test) {
@@ -1201,7 +1201,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de novembre de 2011 – 31 de gener de 2012");
+        test.equal(fmt.format(start, end), "20 de novembre del 2011 – 31 de gener del 2012");
         test.done();
     },
     testDateRngFmtcaESRangeMultiYearShort: function(test) {
@@ -1279,7 +1279,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "novembre de 2011 – gener de 2014");
+        test.equal(fmt.format(start, end), "novembre del 2011 – gener del 2014");
         test.done();
     },
     testDateRngFmtcaESRangeMultiYearFull: function(test) {
@@ -1305,7 +1305,7 @@ module.exports.testdatefmtrange_ca = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "novembre de 2011 – gener de 2014");
+        test.equal(fmt.format(start, end), "novembre del 2011 – gener del 2014");
         test.done();
     },
     testDateRngFmtcaESManyYearsFull: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_da_DK.js b/js/test/daterange/testdatefmtrange_da_DK.js
index eb2255ca9e..84a2192277 100644
--- a/js/test/daterange/testdatefmtrange_da_DK.js
+++ b/js/test/daterange/testdatefmtrange_da_DK.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_da_DK.js - test the date range formatter object in Danish/Denmark
  *
- * Copyright © 2012-2017, JEDLSoft
+ * Copyright © 2012-2017, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ module.exports.testdatefmtrange_da_DK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31.12.2011 13.45 – 14.30');
+        test.equal(fmt.format(start, end), '31.12.2011, 13.45 – 14.30');
         test.done();
     },
     testDateRngFmtDKRangeInDayMedium: function(test) {
@@ -81,7 +81,7 @@ module.exports.testdatefmtrange_da_DK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31. dec. 2011 13.45 – 14.30");
+        test.equal(fmt.format(start, end), "31. dec. 2011, 13.45 – 14.30");
         test.done();
     },
     testDateRngFmtDKRangeInDayLong: function(test) {
@@ -159,7 +159,7 @@ module.exports.testdatefmtrange_da_DK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30.12.2011 13.45 – 31.12.2011 14.30');
+        test.equal(fmt.format(start, end), '30.12.2011, 13.45 – 31.12.2011, 14.30');
         test.done();
     },
     testDateRngFmtDKRangeNextDayMedium: function(test) {
@@ -185,7 +185,7 @@ module.exports.testdatefmtrange_da_DK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30. dec. 2011 13.45 – 31. dec. 2011 14.30");
+        test.equal(fmt.format(start, end), "30. dec. 2011, 13.45 – 31. dec. 2011, 14.30");
         test.done();
     },
     testDateRngFmtDKRangeNextDayLong: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_es_UY.js b/js/test/daterange/testdatefmtrange_es_UY.js
index fcfed9cee0..373eb46cae 100644
--- a/js/test/daterange/testdatefmtrange_es_UY.js
+++ b/js/test/daterange/testdatefmtrange_es_UY.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_es_UY.js - test the date range formatter object in Spanish/Uruguay
  *
- * Copyright © 2012-2017, 2020-2021,2023 JEDLSoft
+ * Copyright © 2012-2017, 2020-2021,2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/11, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), '31/12/11, 1:45 p. m. – 2:30 p. m.');
         test.done();
     },
     testDateRngFmtUYRangeinDayMedium: function(test) {
@@ -81,7 +81,7 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 dic. 2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), '31 dic. 2011, 1:45 p. m. – 2:30 p. m.');
         test.done();
     },
     testDateRngFmtUYRangeinDayLong: function(test) {
@@ -107,7 +107,7 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), '31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.');
         test.done();
     },
     testDateRngFmtUYRangeinDayFull: function(test) {
@@ -133,7 +133,7 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), '31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.');
         test.done();
     },
     testDateRngFmtUYRangeNextDayShort: function(test) {
@@ -159,7 +159,7 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/11, 13:45 – 31/12/11, 14:30");
+        test.equal(fmt.format(start, end), '30/12/11, 1:45 p. m. – 31/12/11, 2:30 p. m.');
         test.done();
     },
     testDateRngFmtUYRangeNextDayMedium: function(test) {
@@ -185,7 +185,7 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 dic. 2011, 13:45 – 31 dic. 2011, 14:30");
+        test.equal(fmt.format(start, end), '30 dic. 2011, 1:45 p. m. – 31 dic. 2011, 2:30 p. m.');
         test.done();
     },
     testDateRngFmtUYRangeNextDayLong: function(test) {
@@ -211,7 +211,7 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 13:45 – 31 de diciembre de 2011, 14:30");
+        test.equal(fmt.format(start, end), '30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.');
         test.done();
     },
     testDateRngFmtUYRangeNextDayFull: function(test) {
@@ -237,7 +237,7 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 13:45 – 31 de diciembre de 2011, 14:30");
+        test.equal(fmt.format(start, end), '30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.');
         test.done();
     },
     testDateRngFmtUYRangeMultiDayShort: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_eu_ES.js b/js/test/daterange/testdatefmtrange_eu_ES.js
index 13d46f9203..39b99c09f2 100644
--- a/js/test/daterange/testdatefmtrange_eu_ES.js
+++ b/js/test/daterange/testdatefmtrange_eu_ES.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_eu_ES.js - test the date range formatter object Basque-Spain
  *
- * Copyright © 2020-2021,2023 JEDLSoft
+ * Copyright © 2020-2021, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ module.exports.testdatefmtrange_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11/12/31, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "11/12/31 (13:45) – (14:30)");
         test.done();
     },
     testDateRngFmteuESRangeInDayMedium: function(test) {
@@ -81,7 +81,7 @@ module.exports.testdatefmtrange_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "2011(e)ko abe. 31(a), 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "2011(e)ko abe. 31(a) (13:45) – (14:30)");
         test.done();
     },
     testDateRngFmteuESRangeInDayLong: function(test) {
@@ -159,7 +159,7 @@ module.exports.testdatefmtrange_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11/12/30, 13:45 – 11/12/31, 14:30");
+        test.equal(fmt.format(start, end), "11/12/30 (13:45) – 11/12/31 (14:30)");
         test.done();
     },
     testDateRngFmteuESRangeNextDayMedium: function(test) {
@@ -185,7 +185,7 @@ module.exports.testdatefmtrange_eu_ES = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "2011(e)ko abe. 30(a), 13:45 – 2011(e)ko abe. 31(a), 14:30");
+        test.equal(fmt.format(start, end), "2011(e)ko abe. 30(a) (13:45) – 2011(e)ko abe. 31(a) (14:30)");
         test.done();
     },
     testDateRngFmteuESRangeNextDayLong: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_fi_FI.js b/js/test/daterange/testdatefmtrange_fi_FI.js
index a92cb0c9f2..5798db3d4e 100644
--- a/js/test/daterange/testdatefmtrange_fi_FI.js
+++ b/js/test/daterange/testdatefmtrange_fi_FI.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_fi_FI.js - test the date range formatter object in Finnish/Finland
  *
- * Copyright © 2012-2017, 2020 JEDLSoft
+ * Copyright © 2012-2017, 2020, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ module.exports.testdatefmtrange_fi_FI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31.12.2011 13.45 – 14.30");
+        test.equal(fmt.format(start, end), "31.12.2011 klo 13.45 – 14.30");
         test.done();
     },
     testDateRngFmtFIRangeInDayMedium: function(test) {
@@ -159,7 +159,7 @@ module.exports.testdatefmtrange_fi_FI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30.12.2011 13.45 – 31.12.2011 14.30");
+        test.equal(fmt.format(start, end), "30.12.2011 klo 13.45 – 31.12.2011 klo 14.30");
         test.done();
     },
     testDateRngFmtFIRangeNextDayMedium: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_fmttemplate.js b/js/test/daterange/testdatefmtrange_fmttemplate.js
index 21eee57657..5c3900a7ed 100644
--- a/js/test/daterange/testdatefmtrange_fmttemplate.js
+++ b/js/test/daterange/testdatefmtrange_fmttemplate.js
@@ -1,7 +1,7 @@
  /*
- * testWeekdayTranslation.js
+ * testdatefmtrange_fmttemplate.js
  *
- * Copyright © 2019-2023, JEDLSoft
+ * Copyright © 2019-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -498,23 +498,23 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec00[0], '{sd}. {sm} {sy}. u {st} – {et}');
         test.equal(templatec00[1], '{sd}. {sm} {sy}. u {st} – {et}');
-        test.equal(templatec00[2], '{sd}. {sm} {sy}. {st} – {et}');
-        test.equal(templatec00[3], '{sd}. {sm}. {sy}. {st} – {et}');
+        test.equal(templatec00[2], '{sd}. {sm} {sy}. u {st} – {et}');
+        test.equal(templatec00[3], '{sd}. {sm}. {sy}. u {st} – {et}');
 
         test.equal(templatec01[0], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
         test.equal(templatec01[1], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
-        test.equal(templatec01[2], '{sd}. {sm} {sy}. {st} – {ed}. {em} {ey}. {et}');
-        test.equal(templatec01[3], '{sd}. {sm}. {sy}. {st} – {ed}. {em}. {ey}. {et}');
+        test.equal(templatec01[2], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
+        test.equal(templatec01[3], '{sd}. {sm}. {sy}. u {st} – {ed}. {em}. {ey}. u {et}');
 
         test.equal(templatec02[1], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
         test.equal(templatec02[0], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
-        test.equal(templatec02[2], '{sd}. {sm} {sy}. {st} – {ed}. {em} {ey}. {et}');
-        test.equal(templatec02[3], '{sd}. {sm}. {sy}. {st} – {ed}. {em}. {ey}. {et}');
+        test.equal(templatec02[2], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
+        test.equal(templatec02[3], '{sd}. {sm}. {sy}. u {st} – {ed}. {em}. {ey}. u {et}');
 
         test.equal(templatec03[0], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
         test.equal(templatec03[1], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
-        test.equal(templatec03[2], '{sd}. {sm} {sy}. {st} – {ed}. {em} {ey}. {et}');
-        test.equal(templatec03[3], '{sd}. {sm}. {sy}. {st} – {ed}. {em}. {ey}. {et}');
+        test.equal(templatec03[2], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
+        test.equal(templatec03[3], '{sd}. {sm}. {sy}. u {st} – {ed}. {em}. {ey}. u {et}');
 
         test.equal(templatec10[0], '{sd} – {ed}. {em} {ey}.');
         test.equal(templatec10[1], '{sd} – {ed}. {em} {ey}.');
@@ -568,23 +568,23 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec00[0], '{sd}. {sm} {sy}. u {st} – {et}');
         test.equal(templatec00[1], '{sd}. {sm} {sy}. u {st} – {et}');
-        test.equal(templatec00[2], '{sd}. {sm} {sy}. {st} – {et}');
-        test.equal(templatec00[3], '{sd}. {sm}. {sy}. {st} – {et}');
+        test.equal(templatec00[2], '{sd}. {sm} {sy}. u {st} – {et}');
+        test.equal(templatec00[3], '{sd}. {sm}. {sy}. u {st} – {et}');
 
         test.equal(templatec01[0], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
         test.equal(templatec01[1], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
-        test.equal(templatec01[2], '{sd}. {sm} {sy}. {st} – {ed}. {em} {ey}. {et}');
-        test.equal(templatec01[3], '{sd}. {sm}. {sy}. {st} – {ed}. {em}. {ey}. {et}');
+        test.equal(templatec01[2], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
+        test.equal(templatec01[3], '{sd}. {sm}. {sy}. u {st} – {ed}. {em}. {ey}. u {et}');
 
         test.equal(templatec02[1], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
         test.equal(templatec02[0], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
-        test.equal(templatec02[2], '{sd}. {sm} {sy}. {st} – {ed}. {em} {ey}. {et}');
-        test.equal(templatec02[3], '{sd}. {sm}. {sy}. {st} – {ed}. {em}. {ey}. {et}');
+        test.equal(templatec02[2], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
+        test.equal(templatec02[3], '{sd}. {sm}. {sy}. u {st} – {ed}. {em}. {ey}. u {et}');
 
         test.equal(templatec03[0], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
         test.equal(templatec03[1], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
-        test.equal(templatec03[2], '{sd}. {sm} {sy}. {st} – {ed}. {em} {ey}. {et}');
-        test.equal(templatec03[3], '{sd}. {sm}. {sy}. {st} – {ed}. {em}. {ey}. {et}');
+        test.equal(templatec03[2], '{sd}. {sm} {sy}. u {st} – {ed}. {em} {ey}. u {et}');
+        test.equal(templatec03[3], '{sd}. {sm}. {sy}. u {st} – {ed}. {em}. {ey}. u {et}');
 
         test.equal(templatec10[0], '{sd} – {ed}. {em} {ey}.');
         test.equal(templatec10[1], '{sd} – {ed}. {em} {ey}.');
@@ -710,23 +710,23 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec00[0], '{sd}. {sm} {sy} kl. {st} – {et}');
         test.equal(templatec00[1], '{sd}. {sm} {sy} kl. {st} – {et}');
-        test.equal(templatec00[2], '{sd}. {sm} {sy} {st} – {et}');
-        test.equal(templatec00[3], '{sd}.{sm}.{sy} {st} – {et}'); // CLDR 34 change
+        test.equal(templatec00[2], '{sd}. {sm} {sy}, {st} – {et}');
+        test.equal(templatec00[3], '{sd}.{sm}.{sy}, {st} – {et}');
 
         test.equal(templatec01[0], '{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}');
         test.equal(templatec01[1], '{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}');
-        test.equal(templatec01[2], '{sd}. {sm} {sy} {st} – {ed}. {em} {ey} {et}');
-        test.equal(templatec01[3], '{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}');
+        test.equal(templatec01[2], '{sd}. {sm} {sy}, {st} – {ed}. {em} {ey}, {et}');
+        test.equal(templatec01[3], '{sd}.{sm}.{sy}, {st} – {ed}.{em}.{ey}, {et}');
 
         test.equal(templatec02[1], '{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}');
         test.equal(templatec02[0], '{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}');
-        test.equal(templatec02[2], '{sd}. {sm} {sy} {st} – {ed}. {em} {ey} {et}');
-        test.equal(templatec02[3], '{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}');
+        test.equal(templatec02[2], '{sd}. {sm} {sy}, {st} – {ed}. {em} {ey}, {et}');
+        test.equal(templatec02[3], '{sd}.{sm}.{sy}, {st} – {ed}.{em}.{ey}, {et}');
 
         test.equal(templatec03[0], '{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}');
         test.equal(templatec03[1], '{sd}. {sm} {sy} kl. {st} – {ed}. {em} {ey} kl. {et}');
-        test.equal(templatec03[2], '{sd}. {sm} {sy} {st} – {ed}. {em} {ey} {et}');
-        test.equal(templatec03[3], '{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}');
+        test.equal(templatec03[2], '{sd}. {sm} {sy}, {st} – {ed}. {em} {ey}, {et}');
+        test.equal(templatec03[3], '{sd}.{sm}.{sy}, {st} – {ed}.{em}.{ey}, {et}');
 
         test.equal(templatec10[0], '{sd} – {ed}. {em} {ey}');
         test.equal(templatec10[1], '{sd} – {ed}. {em} {ey}');
@@ -1779,42 +1779,42 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec00[0], '{sd} {sm}, {sy} at {st} – {et}');
         test.equal(templatec00[1], '{sd} {sm} {sy} at {st} – {et}');
-        test.equal(templatec00[2], '{sd}-{sm}-{sy}, {st} – {et}');
+        test.equal(templatec00[2], '{sd} {sm} {sy}, {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy}, {st} – {et}');
 
         test.equal(templatec01[0], '{sd} {sm}, {sy} at {st} – {ed} {em}, {ey} at {et}');
         test.equal(templatec01[1], '{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}');
-        test.equal(templatec01[2], '{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}');
+        test.equal(templatec01[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
         test.equal(templatec02[0], '{sd} {sm}, {sy} at {st} – {ed} {em}, {ey} at {et}');
         test.equal(templatec02[1], '{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}');
-        test.equal(templatec02[2], '{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}');
+        test.equal(templatec02[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
         test.equal(templatec03[0], '{sd} {sm}, {sy} at {st} – {ed} {em}, {ey} at {et}');
         test.equal(templatec03[1], '{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}');
-        test.equal(templatec03[2], '{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}');
+        test.equal(templatec03[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
         test.equal(templatec10[0], '{sd} – {ed} {em}, {ey}');
         test.equal(templatec10[1], '{sd} – {ed} {em} {ey}');
-        test.equal(templatec10[2], '{sd} – {ed}-{em}-{ey}');
+        test.equal(templatec10[2], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[3], '{sd} – {ed}/{em}/{ey}');
 
         test.equal(templatec11[0], '{sd} {sm} – {ed} {em}, {ey}');
         test.equal(templatec11[1], '{sd} {sm} – {ed} {em} {ey}');
-        test.equal(templatec11[2], '{sd}-{sm} – {ed}-{em}-{ey}');
+        test.equal(templatec11[2], '{sd} {sm} – {ed} {em} {ey}');
         test.equal(templatec11[3], '{sd}/{sm} – {ed}/{em}/{ey}');
 
         test.equal(templatec12[0], '{sd} {sm}, {sy} – {ed} {em}, {ey}');
         test.equal(templatec12[1], '{sd} {sm} {sy} – {ed} {em} {ey}');
-        test.equal(templatec12[2], '{sd}-{sm}-{sy} – {ed}-{em}-{ey}');
+        test.equal(templatec12[2], '{sd} {sm} {sy} – {ed} {em} {ey}');
         test.equal(templatec12[3], '{sd}/{sm}/{sy} – {ed}/{em}/{ey}');
 
         test.equal(templatec20[0], '{sm}, {sy} – {em}, {ey}');
         test.equal(templatec20[1], '{sm} {sy} – {em} {ey}');
-        test.equal(templatec20[2], '{sm}-{sy} – {em}-{ey}');
+        test.equal(templatec20[2], '{sm} {sy} – {em} {ey}');
         test.equal(templatec20[3], '{sm}/{sy} – {em}/{ey}');
 
         test.equal(templatec30[0], "{sy} – {ey}");
@@ -2489,42 +2489,42 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec00[0], '{sd} {sm} {sy} at {st} – {et}');
         test.equal(templatec00[1], '{sd} {sm} {sy} at {st} – {et}');
-        test.equal(templatec00[2], '{sd}/{sm}/{sy}, {st} – {et}');
+        test.equal(templatec00[2], '{sd} {sm} {sy}, {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy}, {st} – {et}');
 
         test.equal(templatec01[0], '{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}');
         test.equal(templatec01[1], '{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}');
-        test.equal(templatec01[2], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
+        test.equal(templatec01[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
         test.equal(templatec02[1], '{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}');
         test.equal(templatec02[0], '{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}');
-        test.equal(templatec02[2], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
+        test.equal(templatec02[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
         test.equal(templatec03[0], '{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}');
         test.equal(templatec03[1], '{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}');
-        test.equal(templatec03[2], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
+        test.equal(templatec03[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
         test.equal(templatec10[0], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[1], '{sd} – {ed} {em} {ey}');
-        test.equal(templatec10[2], '{sd} – {ed}/{em}/{ey}');
+        test.equal(templatec10[2], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[3], '{sd} – {ed}/{em}/{ey}');
 
         test.equal(templatec11[0], '{sd} {sm} – {ed} {em} {ey}');
         test.equal(templatec11[1], '{sd} {sm} – {ed} {em} {ey}');
-        test.equal(templatec11[2], '{sd}/{sm} – {ed}/{em}/{ey}');
+        test.equal(templatec11[2], '{sd} {sm} – {ed} {em} {ey}');
         test.equal(templatec11[3], '{sd}/{sm} – {ed}/{em}/{ey}');
 
         test.equal(templatec12[0], '{sd} {sm} {sy} – {ed} {em} {ey}');
         test.equal(templatec12[1], '{sd} {sm} {sy} – {ed} {em} {ey}');
-        test.equal(templatec12[2], '{sd}/{sm}/{sy} – {ed}/{em}/{ey}');
+        test.equal(templatec12[2], '{sd} {sm} {sy} – {ed} {em} {ey}');
         test.equal(templatec12[3], '{sd}/{sm}/{sy} – {ed}/{em}/{ey}');
 
         test.equal(templatec20[0], '{sm} {sy} – {em} {ey}');
         test.equal(templatec20[1], '{sm} {sy} – {em} {ey}');
-        test.equal(templatec20[2], '{sm}/{sy} – {em}/{ey}');
+        test.equal(templatec20[2], '{sm} {sy} – {em} {ey}');
         test.equal(templatec20[3], '{sm}/{sy} – {em}/{ey}');
 
         test.equal(templatec30[0], "{sy} – {ey}");
@@ -4632,22 +4632,22 @@ module.exports.testdaterangefmt = {
         test.equal(templatec00[0], '{sd}. {sm} {sy} klo {st} – {et}');
         test.equal(templatec00[1], '{sd}. {sm} {sy} klo {st} – {et}');
         test.equal(templatec00[2], '{sd}.{sm}.{sy} klo {st} – {et}');
-        test.equal(templatec00[3], '{sd}.{sm}.{sy} {st} – {et}');
+        test.equal(templatec00[3], '{sd}.{sm}.{sy} klo {st} – {et}');
 
         test.equal(templatec01[0], '{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}');
         test.equal(templatec01[1], '{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}');
         test.equal(templatec01[2], '{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}');
-        test.equal(templatec01[3], '{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}');
+        test.equal(templatec01[3], '{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}');
 
         test.equal(templatec02[1], '{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}');
         test.equal(templatec02[0], '{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}');
         test.equal(templatec02[2], '{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}');
-        test.equal(templatec02[3], '{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}');
+        test.equal(templatec02[3], '{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}');
 
         test.equal(templatec03[0], '{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}');
         test.equal(templatec03[1], '{sd}. {sm} {sy} klo {st} – {ed}. {em} {ey} klo {et}');
         test.equal(templatec03[2], '{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}');
-        test.equal(templatec03[3], '{sd}.{sm}.{sy} {st} – {ed}.{em}.{ey} {et}');
+        test.equal(templatec03[3], '{sd}.{sm}.{sy} klo {st} – {ed}.{em}.{ey} klo {et}');
 
         test.equal(templatec10[0], '{sd} – {ed}. {em} {ey}');
         test.equal(templatec10[1], '{sd} – {ed}. {em} {ey}');
@@ -6058,43 +6058,43 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sy}년 {sm}월 {sd}일 {st} – {et}');
-        test.equal(templatec00[1], '{sy}년 {sm}월 {sd}일 {st} – {et}');
+        test.equal(templatec00[0], '{sy}년 {sm} {sd}일 {st} – {et}');
+        test.equal(templatec00[1], '{sy}년 {sm} {sd}일 {st} – {et}');
         test.equal(templatec00[2], '{sy}. {sm}. {sd}. {st} – {et}');
         test.equal(templatec00[3], '{sy}. {sm}. {sd}. {st} – {et}');
 
-        test.equal(templatec01[0], '{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}');
-        test.equal(templatec01[1], '{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}');
+        test.equal(templatec01[0], '{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}');
+        test.equal(templatec01[1], '{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}');
         test.equal(templatec01[2], '{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}');
         test.equal(templatec01[3], '{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}');
 
-        test.equal(templatec02[1], '{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}');
-        test.equal(templatec02[0], '{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}');
+        test.equal(templatec02[1], '{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}');
+        test.equal(templatec02[0], '{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}');
         test.equal(templatec02[2], '{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}');
         test.equal(templatec02[3], '{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}');
 
-        test.equal(templatec03[0], '{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}');
-        test.equal(templatec03[1], '{sy}년 {sm}월 {sd}일 {st} – {ey}년 {em}월 {ed}일 {et}');
+        test.equal(templatec03[0], '{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}');
+        test.equal(templatec03[1], '{sy}년 {sm} {sd}일 {st} – {ey}년 {em} {ed}일 {et}');
         test.equal(templatec03[2], '{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}');
         test.equal(templatec03[3], '{sy}. {sm}. {sd}. {st} – {ey}. {em}. {ed}. {et}');
 
-        test.equal(templatec10[0], '{sy}년 {sm}월 {sd}일 – {ed}일');
-        test.equal(templatec10[1], '{sy}년 {sm}월 {sd}일 – {ed}일');
+        test.equal(templatec10[0], '{sy}년 {sm} {sd}일 – {ed}일');
+        test.equal(templatec10[1], '{sy}년 {sm} {sd}일 – {ed}일');
         test.equal(templatec10[2], '{sy}. {sm}. {sd}. – {ed}');
         test.equal(templatec10[3], '{sy}. {sm}. {sd}. – {ed}');
 
-        test.equal(templatec11[0], '{sy}년 {sm}월 {sd}일 – {em}월 {ed}일');
-        test.equal(templatec11[1], '{sy}년 {sm}월 {sd}일 – {em}월 {ed}일');
+        test.equal(templatec11[0], '{sy}년 {sm} {sd}일 – {em} {ed}일');
+        test.equal(templatec11[1], '{sy}년 {sm} {sd}일 – {em} {ed}일');
         test.equal(templatec11[2], '{sy}. {sm}. {sd}. – {ey}. {em}. {ed}.');
         test.equal(templatec11[3], '{sy}. {sm}. {sd}. – {ey}. {em}. {ed}.');
 
-        test.equal(templatec12[0], '{sy}년 {sm}월 {sd}일 – {ey}년 {em}월 {ed}일');
-        test.equal(templatec12[1], '{sy}년 {sm}월 {sd}일 – {ey}년 {em}월 {ed}일');
+        test.equal(templatec12[0], '{sy}년 {sm} {sd}일 – {ey}년 {em} {ed}일');
+        test.equal(templatec12[1], '{sy}년 {sm} {sd}일 – {ey}년 {em} {ed}일');
         test.equal(templatec12[2], '{sy}. {sm}. {sd}. – {ey}. {em}. {ed}.');
         test.equal(templatec12[3], '{sy}. {sm}. {sd}. – {ey}. {em}. {ed}.');
 
-        test.equal(templatec20[0], '{sy}년 {sm}월 – {ey}년 {em}월');
-        test.equal(templatec20[1], '{sy}년 {sm}월 – {ey}년 {em}월');
+        test.equal(templatec20[0], '{sy}년 {sm} – {ey}년 {em}');
+        test.equal(templatec20[1], '{sy}년 {sm} – {ey}년 {em}');
         test.equal(templatec20[2], '{sy}. {sm}. – {ey}. {em}.');
         test.equal(templatec20[3], '{sy}. {sm}. – {ey}. {em}.');
 
@@ -6131,8 +6131,8 @@ module.exports.testdaterangefmt = {
         }
 
         //Check if data that is not overridden comes out well
-        test.equal(templatec20[0], '{sy}년 {sm}월 – {ey}년 {em}월');
-        test.equal(templatec20[1], '{sy}년 {sm}월 – {ey}년 {em}월');
+        test.equal(templatec20[0], '{sy}년 {sm} – {ey}년 {em}');
+        test.equal(templatec20[1], '{sy}년 {sm} – {ey}년 {em}');
         test.equal(templatec20[2], '{sy}. {sm}. – {ey}. {em}.');
         test.equal(templatec20[3], '{sy}. {sm}. – {ey}. {em}.');
 
@@ -6746,23 +6746,23 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec00[0], '{sd} {sm} {sy} om {st} – {et}');
         test.equal(templatec00[1], '{sd} {sm} {sy} om {st} – {et}');
-        test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
-        test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
+        test.equal(templatec00[2], '{sd} {sm} {sy}, {st} – {et}');
+        test.equal(templatec00[3], '{sd}/{sm}/{sy}, {st} – {et}');
 
         test.equal(templatec01[0], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
         test.equal(templatec01[1], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
-        test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
+        test.equal(templatec01[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
+        test.equal(templatec01[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
         test.equal(templatec02[1], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
         test.equal(templatec02[0], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
-        test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
+        test.equal(templatec02[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
+        test.equal(templatec02[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
         test.equal(templatec03[0], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
         test.equal(templatec03[1], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
-        test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
+        test.equal(templatec03[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
+        test.equal(templatec03[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
         test.equal(templatec10[0], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[1], '{sd} – {ed} {em} {ey}');
@@ -6817,23 +6817,23 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec00[0], '{sd} {sm} {sy} om {st} – {et}');
         test.equal(templatec00[1], '{sd} {sm} {sy} om {st} – {et}');
-        test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
-        test.equal(templatec00[3], '{sd}-{sm}-{sy} {st} – {et}');
+        test.equal(templatec00[2], '{sd} {sm} {sy}, {st} – {et}');
+        test.equal(templatec00[3], '{sd}-{sm}-{sy}, {st} – {et}');
 
         test.equal(templatec01[0], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
         test.equal(templatec01[1], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
-        test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec01[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
+        test.equal(templatec01[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
+        test.equal(templatec01[3], '{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}');
 
         test.equal(templatec02[1], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
         test.equal(templatec02[0], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
-        test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec02[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
+        test.equal(templatec02[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
+        test.equal(templatec02[3], '{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}');
 
         test.equal(templatec03[0], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
         test.equal(templatec03[1], '{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}');
-        test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec03[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
+        test.equal(templatec03[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
+        test.equal(templatec03[3], '{sd}-{sm}-{sy}, {st} – {ed}-{em}-{ey}, {et}');
 
         test.equal(templatec10[0], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[1], '{sd} – {ed} {em} {ey}');
@@ -14145,43 +14145,43 @@ module.exports.testdaterangefmt = {
             templatec20.push(fmt.dateFmt.formats.range["c20"][abbrLength[i]]);
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
-        test.equal(templatec00[0], '{sd} {sm} de {sy}, a les {st} – {et}');
-        test.equal(templatec00[1], '{sd} {sm} de {sy}, a les {st} – {et}');
+        test.equal(templatec00[0], '{sd} {sm} del {sy}, a les {st} – {et}');
+        test.equal(templatec00[1], '{sd} {sm} del {sy}, a les {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy}, {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
-        test.equal(templatec01[1], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
+        test.equal(templatec01[0], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
+        test.equal(templatec01[1], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
-        test.equal(templatec02[0], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
+        test.equal(templatec02[1], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
+        test.equal(templatec02[0], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
-        test.equal(templatec03[1], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
+        test.equal(templatec03[0], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
+        test.equal(templatec03[1], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec10[0], '{sd} – {ed} {em} de {ey}');
-        test.equal(templatec10[1], '{sd} – {ed} {em} de {ey}');
+        test.equal(templatec10[0], '{sd} – {ed} {em} del {ey}');
+        test.equal(templatec10[1], '{sd} – {ed} {em} del {ey}');
         test.equal(templatec10[2], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[3], '{sd} – {ed}/{em}/{ey}');
 
-        test.equal(templatec11[0], '{sd} {sm} – {ed} {em} de {ey}');
-        test.equal(templatec11[1], '{sd} {sm} – {ed} {em} de {ey}');
+        test.equal(templatec11[0], '{sd} {sm} – {ed} {em} del {ey}');
+        test.equal(templatec11[1], '{sd} {sm} – {ed} {em} del {ey}');
         test.equal(templatec11[2], '{sd} {sm} – {ed} {em} {ey}');
         test.equal(templatec11[3], '{sd}/{sm} – {ed}/{em}/{ey}');
 
-        test.equal(templatec12[0], '{sd} {sm} de {sy} – {ed} {em} de {ey}');
-        test.equal(templatec12[1], '{sd} {sm} de {sy} – {ed} {em} de {ey}');
+        test.equal(templatec12[0], '{sd} {sm} del {sy} – {ed} {em} del {ey}');
+        test.equal(templatec12[1], '{sd} {sm} del {sy} – {ed} {em} del {ey}');
         test.equal(templatec12[2], '{sd} {sm} {sy} – {ed} {em} {ey}');
         test.equal(templatec12[3], '{sd}/{sm}/{sy} – {ed}/{em}/{ey}');
 
-        test.equal(templatec20[0], '{sm} de {sy} – {em} de {ey}');
-        test.equal(templatec20[1], '{sm} de {sy} – {em} de {ey}');
+        test.equal(templatec20[0], '{sm} del {sy} – {em} del {ey}');
+        test.equal(templatec20[1], '{sm} del {sy} – {em} del {ey}');
         test.equal(templatec20[2], '{sm} {sy} – {em} {ey}');
         test.equal(templatec20[3], '{sm}/{sy} – {em}/{ey}');
 
@@ -14216,43 +14216,43 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} {sm} de {sy}, a les {st} – {et}');
-        test.equal(templatec00[1], '{sd} {sm} de {sy}, a les {st} – {et}');
+        test.equal(templatec00[0], '{sd} {sm} del {sy}, a les {st} – {et}');
+        test.equal(templatec00[1], '{sd} {sm} del {sy}, a les {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy}, {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
-        test.equal(templatec01[1], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
+        test.equal(templatec01[0], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
+        test.equal(templatec01[1], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
-        test.equal(templatec02[0], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
+        test.equal(templatec02[1], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
+        test.equal(templatec02[0], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
-        test.equal(templatec03[1], '{sd} {sm} de {sy}, a les {st} – {ed} {em} de {ey}, a les {et}');
+        test.equal(templatec03[0], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
+        test.equal(templatec03[1], '{sd} {sm} del {sy}, a les {st} – {ed} {em} del {ey}, a les {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec10[0], '{sd} – {ed} {em} de {ey}');
-        test.equal(templatec10[1], '{sd} – {ed} {em} de {ey}');
+        test.equal(templatec10[0], '{sd} – {ed} {em} del {ey}');
+        test.equal(templatec10[1], '{sd} – {ed} {em} del {ey}');
         test.equal(templatec10[2], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[3], '{sd} – {ed}/{em}/{ey}');
 
-        test.equal(templatec11[0], '{sd} {sm} – {ed} {em} de {ey}');
-        test.equal(templatec11[1], '{sd} {sm} – {ed} {em} de {ey}');
+        test.equal(templatec11[0], '{sd} {sm} – {ed} {em} del {ey}');
+        test.equal(templatec11[1], '{sd} {sm} – {ed} {em} del {ey}');
         test.equal(templatec11[2], '{sd} {sm} – {ed} {em} {ey}');
         test.equal(templatec11[3], '{sd}/{sm} – {ed}/{em}/{ey}');
 
-        test.equal(templatec12[0], '{sd} {sm} de {sy} – {ed} {em} de {ey}');
-        test.equal(templatec12[1], '{sd} {sm} de {sy} – {ed} {em} de {ey}');
+        test.equal(templatec12[0], '{sd} {sm} del {sy} – {ed} {em} del {ey}');
+        test.equal(templatec12[1], '{sd} {sm} del {sy} – {ed} {em} del {ey}');
         test.equal(templatec12[2], '{sd} {sm} {sy} – {ed} {em} {ey}');
         test.equal(templatec12[3], '{sd}/{sm}/{sy} – {ed}/{em}/{ey}');
 
-        test.equal(templatec20[0], '{sm} de {sy} – {em} de {ey}');
-        test.equal(templatec20[1], '{sm} de {sy} – {em} de {ey}');
+        test.equal(templatec20[0],  '{sm} del {sy} – {em} del {ey}');
+        test.equal(templatec20[1],  '{sm} del {sy} – {em} del {ey}' );
         test.equal(templatec20[2], '{sm} {sy} – {em} {ey}');
         test.equal(templatec20[3], '{sm}/{sy} – {em}/{ey}');
 
@@ -14431,23 +14431,23 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec00[0], '{sy}(e)ko {sm}ren {sd}(a) ({st}) – ({et})');
         test.equal(templatec00[1], '{sy}(e)ko {sm}ren {sd}(a) ({st}) – ({et})');
-        test.equal(templatec00[2], '{sy}(e)ko {sm} {sd}(a), {st} – {et}');
-        test.equal(templatec00[3], '{sy}/{sm}/{sd}, {st} – {et}');
+        test.equal(templatec00[2], '{sy}(e)ko {sm} {sd}(a) ({st}) – ({et})');
+        test.equal(templatec00[3], '{sy}/{sm}/{sd} ({st}) – ({et})');
 
         test.equal(templatec01[0], '{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})');
         test.equal(templatec01[1], '{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})');
-        test.equal(templatec01[2], '{sy}(e)ko {sm} {sd}(a), {st} – {ey}(e)ko {em} {ed}(a), {et}');
-        test.equal(templatec01[3], '{sy}/{sm}/{sd}, {st} – {ey}/{em}/{ed}, {et}');
+        test.equal(templatec01[2], '{sy}(e)ko {sm} {sd}(a) ({st}) – {ey}(e)ko {em} {ed}(a) ({et})');
+        test.equal(templatec01[3], '{sy}/{sm}/{sd} ({st}) – {ey}/{em}/{ed} ({et})');
 
         test.equal(templatec02[1], '{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})');
         test.equal(templatec02[0], '{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})');
-        test.equal(templatec02[2], '{sy}(e)ko {sm} {sd}(a), {st} – {ey}(e)ko {em} {ed}(a), {et}');
-        test.equal(templatec02[3], '{sy}/{sm}/{sd}, {st} – {ey}/{em}/{ed}, {et}');
+        test.equal(templatec02[2], '{sy}(e)ko {sm} {sd}(a) ({st}) – {ey}(e)ko {em} {ed}(a) ({et})');
+        test.equal(templatec02[3], '{sy}/{sm}/{sd} ({st}) – {ey}/{em}/{ed} ({et})');
 
         test.equal(templatec03[0], '{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})');
         test.equal(templatec03[1], '{sy}(e)ko {sm}ren {sd}(a) ({st}) – {ey}(e)ko {em}ren {ed}(a) ({et})');
-        test.equal(templatec03[2], '{sy}(e)ko {sm} {sd}(a), {st} – {ey}(e)ko {em} {ed}(a), {et}');
-        test.equal(templatec03[3], '{sy}/{sm}/{sd}, {st} – {ey}/{em}/{ed}, {et}');
+        test.equal(templatec03[2], '{sy}(e)ko {sm} {sd}(a) ({st}) – {ey}(e)ko {em} {ed}(a) ({et})');
+        test.equal(templatec03[3], '{sy}/{sm}/{sd} ({st}) – {ey}/{em}/{ed} ({et})');
 
         test.equal(templatec10[0], '{sy}(e)ko {sm}ren {sd}(a) – {ed}');
         test.equal(templatec10[1], '{sy}(e)ko {sm}ren {sd}(a) – {ed}');
@@ -15211,43 +15211,43 @@ module.exports.testdaterangefmt = {
             templatec20.push(fmt.dateFmt.formats.range["c20"][abbrLength[i]]);
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
-        test.equal(templatec00[0], 'د {sy} د {sm} {sd} {st} – {et}');
-        test.equal(templatec00[1], 'د {sy} د {sm} {sd} {st} – {et}');
+        test.equal(templatec00[0], '‏{sy} د {sm} {sd} {st} – {et}');
+        test.equal(templatec00[1], '‏{sy} {sm} {sd} {st} – {et}');
         test.equal(templatec00[2], '‏{sy} {sm} {sd} {st} – {et}');
         test.equal(templatec00[3], '‏{sy}/{sm}/{sd} {st} – {et}');
 
-        test.equal(templatec01[0], 'د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}');
-        test.equal(templatec01[1], 'د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}');
+        test.equal(templatec01[0], '‏{sy} د {sm} {sd} {st} – ‏{ey} د {em} {ed} {et}');
+        test.equal(templatec01[1], '‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}' );
         test.equal(templatec01[2], '‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}');
         test.equal(templatec01[3], '‏{sy}/{sm}/{sd} {st} – ‏{ey}/{em}/{ed} {et}');
 
-        test.equal(templatec02[1], 'د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}');
-        test.equal(templatec02[0], 'د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}');
+        test.equal(templatec02[1], '‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}');
+        test.equal(templatec02[0], '‏{sy} د {sm} {sd} {st} – ‏{ey} د {em} {ed} {et}');
         test.equal(templatec02[2], '‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}');
         test.equal(templatec02[3], '‏{sy}/{sm}/{sd} {st} – ‏{ey}/{em}/{ed} {et}');
 
-        test.equal(templatec03[0], 'د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}');
-        test.equal(templatec03[1], 'د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}');
+        test.equal(templatec03[0], '‏{sy} د {sm} {sd} {st} – ‏{ey} د {em} {ed} {et}');
+        test.equal(templatec03[1], '‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}');
         test.equal(templatec03[2], '‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}');
         test.equal(templatec03[3], '‏{sy}/{sm}/{sd} {st} – ‏{ey}/{em}/{ed} {et}');
 
-        test.equal(templatec10[0], 'د {sy} د {sm} {sd} – {ed}');
-        test.equal(templatec10[1], 'د {sy} د {sm} {sd} – {ed}');
+        test.equal(templatec10[0], '‏{sy} د {sm} {sd} – {ed}');
+        test.equal(templatec10[1], '‏{sy} {sm} {sd} – {ed}');
         test.equal(templatec10[2], '‏{sy} {sm} {sd} – {ed}');
         test.equal(templatec10[3], '‏{sy}/{sm}/{sd} – {ed}');
 
-        test.equal(templatec11[0], 'د {sy} د {sm} {sd} – د {em} {ed}');
-        test.equal(templatec11[1], 'د {sy} د {sm} {sd} – د {em} {ed}');
+        test.equal(templatec11[0], '‏{sy} د {sm} {sd} – ‏{em} {ed}');
+        test.equal(templatec11[1], '‏{sy} {sm} {sd} – ‏{em} {ed}');
         test.equal(templatec11[2], '‏{sy} {sm} {sd} – ‏{ey} {em} {ed}');
         test.equal(templatec11[3], '‏{sy}/{sm}/{sd} – ‏{ey}/{em}/{ed}');
 
-        test.equal(templatec12[0], 'د {sy} د {sm} {sd} – د {ey} د {em} {ed}');
-        test.equal(templatec12[1], 'د {sy} د {sm} {sd} – د {ey} د {em} {ed}');
+        test.equal(templatec12[0], '‏{sy} د {sm} {sd} – ‏{ey} د {em} {ed}');
+        test.equal(templatec12[1], '‏{sy} {sm} {sd} – ‏{ey} {em} {ed}');
         test.equal(templatec12[2], '‏{sy} {sm} {sd} – ‏{ey} {em} {ed}');
         test.equal(templatec12[3], '‏{sy}/{sm}/{sd} – ‏{ey}/{em}/{ed}');
 
-        test.equal(templatec20[0], 'د {sy} د {sm} – د {ey} د {em}');
-        test.equal(templatec20[1], 'د {sy} د {sm} – د {ey} د {em}');
+        test.equal(templatec20[0], '‏{sy} د {sm} – ‏{ey} د {em}');
+        test.equal(templatec20[1], '‏{sy} {sm} – ‏{ey} {em}');
         test.equal(templatec20[2], '‏{sy} {sm} – ‏{ey} {em}');
         test.equal(templatec20[3], '‏{sy}/{sm} – ‏{ey}/{em}');
 
diff --git a/js/test/daterange/testdatefmtrange_nl_NL.js b/js/test/daterange/testdatefmtrange_nl_NL.js
index 39a2010238..5b73a199d3 100644
--- a/js/test/daterange/testdatefmtrange_nl_NL.js
+++ b/js/test/daterange/testdatefmtrange_nl_NL.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_nl_NL.js – test the date range formatter object in Dutch/Netherlands
  *
- * Copyright © 2012-2017,2023 JEDLSoft
+ * Copyright © 2012-2017, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ module.exports.testdatefmtrange_nl_NL = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31-12-2011 13:45 – 14:30');
+        test.equal(fmt.format(start, end), '31-12-2011, 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtNLRangeInDayMedium: function(test) {
@@ -81,7 +81,7 @@ module.exports.testdatefmtrange_nl_NL = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 dec 2011 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 dec 2011, 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtNLRangeInDayLong: function(test) {
@@ -159,7 +159,7 @@ module.exports.testdatefmtrange_nl_NL = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30-12-2011 13:45 – 31-12-2011 14:30');
+        test.equal(fmt.format(start, end), '30-12-2011, 13:45 – 31-12-2011, 14:30');
         test.done();
     },
     testDateRngFmtNLRangeNextDayMedium: function(test) {
@@ -185,7 +185,7 @@ module.exports.testdatefmtrange_nl_NL = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 dec 2011 13:45 – 31 dec 2011 14:30");
+        test.equal(fmt.format(start, end), "30 dec 2011, 13:45 – 31 dec 2011, 14:30");
         test.done();
     },
     testDateRngFmtNLRangeNextDayLong: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_ps_PK.js b/js/test/daterange/testdatefmtrange_ps_PK.js
index 412e9afd88..ab4affcb5b 100644
--- a/js/test/daterange/testdatefmtrange_ps_PK.js
+++ b/js/test/daterange/testdatefmtrange_ps_PK.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_ps_PK.js - test the date range formatter object Pashto-Pakistan
  *
- * Copyright © 2022, JEDLSoft
+ * Copyright © 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,7 +107,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د دسمبر 31 ‏1:45 غ.و. – ‏2:30 غ.و.');
+        test.equal(fmt.format(start, end), '‏2011 دسمبر 31 ‏1:45 غ.و. – ‏2:30 غ.و.');
         test.done();
     },
     testDateRngFmtRangeInDayFull_ps_PK: function(test) {
@@ -133,7 +133,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د دسمبر 31 ‏1:45 غ.و. – ‏2:30 غ.و.');
+        test.equal(fmt.format(start, end), '‏2011 د دسمبر 31 ‏1:45 غ.و. – ‏2:30 غ.و.');
         test.done();
     },
     testDateRngFmtRangeNextDayShort_ps_PK: function(test) {
@@ -211,7 +211,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د دسمبر 30 ‏1:45 غ.و. – د 2011 د دسمبر 31 ‏2:30 غ.و.');
+        test.equal(fmt.format(start, end), '‏2011 دسمبر 30 ‏1:45 غ.و. – ‏2011 دسمبر 31 ‏2:30 غ.و.');
         test.done();
     },
     testDateRngFmtRangeNextDayFull_ps_PK: function(test) {
@@ -237,7 +237,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د دسمبر 30 ‏1:45 غ.و. – د 2011 د دسمبر 31 ‏2:30 غ.و.');
+        test.equal(fmt.format(start, end), '‏2011 د دسمبر 30 ‏1:45 غ.و. – ‏2011 د دسمبر 31 ‏2:30 غ.و.');
         test.done();
     },
     testDateRngFmtRangeMultiDayShort_ps_PK: function(test) {
@@ -315,7 +315,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د دسمبر 20 – 31');
+        test.equal(fmt.format(start, end), '‏2011 دسمبر 20 – 31');
         test.done();
     },
     testDateRngFmtRangeMultiDayFull_ps_PK: function(test) {
@@ -341,7 +341,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د دسمبر 20 – 31');
+        test.equal(fmt.format(start, end), '‏2011 د دسمبر 20 – 31' );
         test.done();
     },
     testDateRngFmtRangeNextMonthShort_ps_PK: function(test) {
@@ -419,7 +419,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د نومبر 20 – د دسمبر 31');
+        test.equal(fmt.format(start, end), '‏2011 نومبر 20 – ‏دسمبر 31');
         test.done();
     },
     testDateRngFmtRangeNextMonthFull_ps_PK: function(test) {
@@ -445,7 +445,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د نومبر 20 – د دسمبر 31');
+        test.equal(fmt.format(start, end), '‏2011 د نومبر 20 – ‏دسمبر 31');
         test.done();
     },
     testDateRngFmtRangeNextYearShort_ps_PK: function(test) {
@@ -523,7 +523,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د نومبر 20 – د 2012 د جنوري 31');
+        test.equal(fmt.format(start, end), '‏2011 نومبر 20 – ‏2012 جنوري 31');
         test.done();
     },
     testDateRngFmtRangeNextYearFull_ps_PK: function(test) {
@@ -549,7 +549,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د نومبر 20 – د 2012 د جنوري 31');
+        test.equal(fmt.format(start, end), '‏2011 د نومبر 20 – ‏2012 د جنوري 31');
         test.done();
     },
     testDateRngFmtRangeMultiYearShort_ps_PK: function(test) {
@@ -627,7 +627,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), 'د 2011 د نومبر – د 2014 د جنوري');
+        test.equal(fmt.format(start, end), '‏2011 نومبر – ‏2014 جنوري');
         test.done();
     },
     testDateRngFmtRangeMultiYearFull_ps_PK: function(test) {
@@ -653,7 +653,7 @@ module.exports.testdatefmtrange_ps_PK = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end),  'د 2011 د نومبر – د 2014 د جنوري');
+        test.equal(fmt.format(start, end), '‏2011 د نومبر – ‏2014 د جنوري');
         test.done();
     },
     testDateRngFmtManyYearsFull_ps_PK: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_sl_SI.js b/js/test/daterange/testdatefmtrange_sl_SI.js
index 4bfe514c78..8430b9ce45 100644
--- a/js/test/daterange/testdatefmtrange_sl_SI.js
+++ b/js/test/daterange/testdatefmtrange_sl_SI.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_sl_SI.js - test the date range formatter object in Slovenian/Slovenia
  *
- * Copyright © 2012-2017,2021,2023 JEDLSoft
+ * Copyright © 2012-2017, 2021, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -471,7 +471,7 @@ module.exports.testdatefmtrange_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20. 11. 11 – 31. 01. 12");
+        test.equal(fmt.format(start, end), "20. 11. 11 – 31. 1. 12");
         test.done();
     },
     testDateRngFmtSIRangeNextYearMedium: function(test) {
@@ -575,7 +575,7 @@ module.exports.testdatefmtrange_sl_SI = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11. 11 – 01. 14");
+        test.equal(fmt.format(start, end), "11. 11 – 1. 14");
         test.done();
     },
     testDateRngFmtSIRangeMultiYearMedium: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_uk_UA.js b/js/test/daterange/testdatefmtrange_uk_UA.js
index 2789e0edda..cfedb40067 100644
--- a/js/test/daterange/testdatefmtrange_uk_UA.js
+++ b/js/test/daterange/testdatefmtrange_uk_UA.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_uk_UA.js - test the date range formatter object Ukrainian/Ukraine
  *
- * Copyright © 2012-2017, 2020,2023 JEDLSoft
+ * Copyright © 2012-2017, 2020, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -601,7 +601,7 @@ module.exports.testdatefmtrange_uk_UA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "лис 2011 р. – січ 2014 р.");
+        test.equal(fmt.format(start, end), "лист. 2011 р. – січ. 2014 р.");
         test.done();
     },
     testDateRngFmtUARangeMultiYearLong: function(test) {
diff --git a/js/test/daterange/testdatefmtrange_vi_VN.js b/js/test/daterange/testdatefmtrange_vi_VN.js
index cfb62ff7f6..127082a751 100644
--- a/js/test/daterange/testdatefmtrange_vi_VN.js
+++ b/js/test/daterange/testdatefmtrange_vi_VN.js
@@ -1,7 +1,7 @@
 /*
  * testdatefmtrange_vi_VN.js - test the date range formatter object Vietnamese/Vietnam
  *
- * Copyright © 2012-2017, 2020,2023 JEDLSoft
+ * Copyright © 2012-2017, 2020, 2023-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ module.exports.testdatefmtrange_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "13:45 – 14:30 31/12/2011");
+        test.equal(fmt.format(start, end), '13:45 – 14:30 31/12/11');
         test.done();
     },
     testDateRngFmtVNRangeInDayMedium: function(test) {
@@ -159,7 +159,7 @@ module.exports.testdatefmtrange_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "13:45 30/12/2011 – 14:30 31/12/2011");
+        test.equal(fmt.format(start, end), '13:45 30/12/11 – 14:30 31/12/11');
         test.done();
     },
     testDateRngFmtVNRangeNextDayMedium: function(test) {
@@ -263,7 +263,7 @@ module.exports.testdatefmtrange_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 – 31/12/2011");
+        test.equal(fmt.format(start, end), '20 – 31/12/11');
         test.done();
     },
     testDateRngFmtVNRangeMultiDayMedium: function(test) {
@@ -367,7 +367,7 @@ module.exports.testdatefmtrange_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20/11 – 31/12/2011");
+        test.equal(fmt.format(start, end), '20/11 – 31/12/11');
         test.done();
     },
     testDateRngFmtVNRangeNextMonthMedium: function(test) {
@@ -471,7 +471,7 @@ module.exports.testdatefmtrange_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20/11/2011 – 31/01/2012");
+        test.equal(fmt.format(start, end), '20/11/11 – 31/1/12');
         test.done();
     },
     testDateRngFmtVNRangeNextYearMedium: function(test) {
@@ -575,7 +575,7 @@ module.exports.testdatefmtrange_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11/2011 – 01/2014");
+        test.equal(fmt.format(start, end), '11/11 – 1/14');
         test.done();
     },
     testDateRngFmtVNRangeMultiYearMedium: function(test) {
diff --git a/js/test/durfmt/testdurfmt.js b/js/test/durfmt/testdurfmt.js
index 72e0b76bfa..c539cd5841 100644
--- a/js/test/durfmt/testdurfmt.js
+++ b/js/test/durfmt/testdurfmt.js
@@ -1,7 +1,7 @@
 /*
  * testdurfmt.js - test the duration formatter object
  *
- * Copyright © 2012-2023, JEDLSoft
+ * Copyright © 2012-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -910,7 +910,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 г., 1 мес., 1 седм., 1 д, 1:01:01 ч.');
+        test.equal(duration.toString(), '1 г., 1 мес., 1 седм., 1 д, 1:01:01');
         test.done();
     },
     testDurFmtBGFormatMedium: function(test) {
@@ -1474,8 +1474,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for es-CO
-
-
     testDurFmtESFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -1598,10 +1596,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 año, 1 mes, 1 semana, 1 día, 1 hora, 1 minuto y 1 segundo");
         test.done();
     },
-
-
     //test cases for estonian
-
     testDurFmtETFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -1725,7 +1720,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for fa-IR
-
     testDurFmtFAFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -1849,8 +1843,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for fi-FI
-
-
     testDurFmtFIFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -1974,7 +1966,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for fr-CA
-
     testDurFmtFRCAFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -2094,11 +2085,10 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 an, 1 mois, 1 semaine, 1 jour, 1 heure, 1 minute et 1 seconde');
+        test.equal(duration.toString(), '1 an, 1 mois, 1 semaine, 1 jour, 1 heure, 1 minute et 1 seconde');
         test.done();
     },
     //test cases for ga-IE
-
     testDurFmtGAFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -2116,7 +2106,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1b 1m 1s 1l 1u 1n 1s");
+        test.equal(duration.toString(), '1 bl 1m 1 scht 1 lá 1 u 1 nóim 1 soic');
         test.done();
     },
     testDurFmtGAFormatShortText: function(test) {
@@ -2137,7 +2127,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1b 1m 1s 1l 1u 1n 1s");
+        test.equal(duration.toString(), '1 bl 1m 1 scht 1 lá 1 u 1 nóim 1 soic');
         test.done();
     },
     testDurFmtGAFormatShortClock: function(test) {
@@ -2158,7 +2148,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1b 1m 1s 1l 01:01:01");
+        test.equal(duration.toString(), '1 bl 1m 1 scht 1 lá 01:01:01');
         test.done();
     },
     testDurFmtGAFormatMedium: function(test) {
@@ -2178,7 +2168,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1b, 1m, 1s, 1l, 1u, 1n, 1s");
+        test.equal(duration.toString(), '1 bl, 1m, 1 scht, 1 lá, 1 u, 1 nóim, 1 soic');
         test.done();
     },
     testDurFmtGAFormatLong: function(test) {
@@ -2198,7 +2188,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 bhl, 1 mhí, 1 scht, 1 lá, 1 u, 1 nóim, 1 soic");
+        test.equal(duration.toString(), '1 bl, 1 mí, 1 scht, 1 lá, 1 u, 1 nóim, 1 soic');
         test.done();
     },
     testDurFmtGAFormatFull: function(test) {
@@ -2218,11 +2208,10 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 bhliain, 1 mhí, 1 seachtain, 1 lá, 1 uair, 1 nóiméad agus 1 soicind");
+        test.equal(duration.toString(), '1 bhliain, 1 mhí, 1 scht, 1 lá, 1 u, 1 nóim agus 1 soic');
         test.done();
     },
     //test cases for hebrew
-
     testDurFmtHEFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -2527,7 +2516,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for hi-IN
-
     testDurFmtHIFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -2545,7 +2533,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1वर्ष, 1माह, 1 सप्ताह, 1 दि, 1घं॰, 1 मि, 1 से');
+        test.equal(duration.toString(), '1 व, 1 माह, 1 सप्ताह, 1 दि, 1 घं, 1 मि, 1 से');
         test.done();
     },
     testDurFmtHIFormatShortText: function(test) {
@@ -2566,7 +2554,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1वर्ष, 1माह, 1 सप्ताह, 1 दि, 1घं॰, 1 मि, 1 से');
+        test.equal(duration.toString(), '1 व, 1 माह, 1 सप्ताह, 1 दि, 1 घं, 1 मि, 1 से');
         test.done();
     },
     testDurFmtHIFormatShortClock: function(test) {
@@ -2587,7 +2575,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1वर्ष, 1माह, 1 सप्ताह, 1 दि, 1:01:01");
+        test.equal(duration.toString(), '1 व, 1 माह, 1 सप्ताह, 1 दि, 1:01:01');
         test.done();
     },
     testDurFmtHIFormatMedium: function(test) {
@@ -2607,7 +2595,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1वर्ष, 1माह, 1 सप्ताह, 1 दि, 1घं॰, 1 मि, 1 से');
+        test.equal(duration.toString(), '1 व, 1 माह, 1 सप्ताह, 1 दि, 1 घं, 1 मि, 1 से');
         test.done();
     },
     testDurFmtHIFormatLong: function(test) {
@@ -2650,10 +2638,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 वर्ष, 1 महीना, 1 सप्ताह, 1 दिन, 1 घंटा, 1 मिनट, और 1 सेकंड");
         test.done();
     },
-
-
     //test cases for marathi mr-IN
-
     testDurFmtMRFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -2776,11 +2761,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "१ वर्ष, १ महिना, १ आठवडा, १ दिवस, १ तास, १ मिनिट, १ सेकंद");
         test.done();
     },
-
-
-
     //testa cases for Telugu (te-IN)
-
     testDurFmtTEFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -2843,8 +2824,6 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1సం, 1నె, 1వా, 1రో, 1:01:01");
         test.done();
     },
-
-
     testDurFmtTEFormatMedium: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -2905,10 +2884,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 సంవత్సరం, 1 నెల, 1 వారం, 1 రోజు, 1 గంట, 1 నిమిషం, 1 సెకను");
         test.done();
     },
-
-
     //test cases for kannada(kn-IN)
-
     testDurFmtKNFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -3032,7 +3008,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for tamil(ta-IN)
-
     testDurFmtTAFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -3156,7 +3131,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for Malaylam(ml-IN)
-
     testDurFmtMLFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -3280,7 +3254,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for Gujrati(gu-IN)
-
     testDurFmtGUFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -3403,10 +3376,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 વર્ષ, 1 મહિનો, 1 અઠવાડિયું, 1 દિવસ, 1 કલાક, 1 મિનિટ, 1 સેકંડ");
         test.done();
     },
-
-
     //test cases for Bengali(bn-IN)
-
     testDurFmtBNFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -3594,8 +3564,6 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "১ বছর, ১ মাস, ১ সপ্তাহ, ১ দিন, ১ ঘন্টা, ১ মিনিট, ১ সেকেন্ড");
         test.done();
     },
-
-
     //test cases for Assamese(as-IN)
     /*
     testDurFmtASFormatShortDefaultStyle: function(test) {
@@ -3721,9 +3689,7 @@ module.exports.testdurfmt = {
         test.done();
     },
     */
-
     //test cases for Punjabi(pa-Guru-IN)
-
     testDurFmtPAFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -3847,7 +3813,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for Urdu(ur-IN)
-
     testDurFmtURFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -3993,7 +3958,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for croation
-
     testDurFmtHRFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -4240,7 +4204,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for indonesia
-
     testDurFmtIDFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -4364,7 +4327,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for Italy
-
     testDurFmtITFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -4488,7 +4450,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for japanese
-
     testDurFmtJAFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -4617,10 +4578,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 年 1 か月 1 週間 1 日 1 時間 1 分 1 秒 1 ミリ秒");
         test.done();
     },
-
-
     //test cases for kk-Cyrl-KZ
-
     testDurFmtKKFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -4683,8 +4641,6 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 ж. 1 ай 1 ап. 1 к. 01:01:01");
         test.done();
     },
-
-
     testDurFmtKKFormatLong: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -4725,9 +4681,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 жыл 1 ай 1 апта 1 күн 1 сағат 1 минут 1 секунд");
         test.done();
     },
-
     //test cases for ko-KR
-
     testDurFmtKOFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -4980,7 +4934,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for lt-LT
-
     testDurFmtLTFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -5104,7 +5057,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for lv-LV
-
     testDurFmtLVFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -5228,7 +5180,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for mk-MK
-
     testDurFmtMKFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -5351,10 +5302,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 година, 1 месец, 1 седмица, 1 ден, 1 час, 1 минута и 1 секунда");
         test.done();
     },
-
-
     //test cases for mn-Cyrl-MN
-
     testDurFmtMNFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -5478,7 +5426,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for ms-Latn-MY
-
     testDurFmtMSFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -5601,11 +5548,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 tahun, 1 bulan, 1 minggu, 1 hari, 1 jam, 1 minit, 1 saat");
         test.done();
     },
-
-
     //test cases for nb-NO
-
-
     testDurFmtNBFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -5729,7 +5672,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for nl-NL
-
     testDurFmtNLFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -5853,7 +5795,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for pl-PL
-
     testDurFmtPLFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -5871,7 +5812,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 r., 1 m-c, 1 tydz., 1 d., 1 h, 1 min, 1 s');
+        test.equal(duration.toString(), '1 r., 1 m-c, 1 t., 1 d., 1 h, 1 min, 1 s');
         test.done();
     },
     testDurFmtPLFormatShortText: function(test) {
@@ -5892,7 +5833,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 r., 1 m-c, 1 tydz., 1 d., 1 h, 1 min, 1 s');
+        test.equal(duration.toString(), '1 r., 1 m-c, 1 t., 1 d., 1 h, 1 min, 1 s');
         test.done();
     },
     testDurFmtPLFormatShortClock: function(test) {
@@ -5913,7 +5854,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 r., 1 m-c, 1 tydz., 1 d., 01:01:01");
+        test.equal(duration.toString(), '1 r., 1 m-c, 1 t., 1 d., 01:01:01');
         test.done();
     },
     testDurFmtPLFormatMedium: function(test) {
@@ -5933,7 +5874,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 r., 1 m-c, 1 tydz., 1 d., 1 h, 1 min, 1 s');
+        test.equal(duration.toString(), '1 r., 1 m-c, 1 t., 1 d., 1 h, 1 min, 1 s');
         test.done();
     },
     testDurFmtPLFormatLong: function(test) {
@@ -5977,7 +5918,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for pt-BR
-
     testDurFmtPTFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -6101,7 +6041,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for ro-RO
-
     testDurFmtROFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -6225,7 +6164,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for ru-RU
-
     testDurFmtRUFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -6348,10 +6286,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), '1 год 1 месяц 1 неделя 1 день 1 час 1 минута 1 секунда');
         test.done();
     },
-
-
     //test cases for sk-SK
-
     testDurFmtSKFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -6475,7 +6410,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for sq-AL
-
     testDurFmtSQFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -6598,10 +6532,7 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 vit, 1 muaj, 1 javë, 1 ditë, 1 orë, 1 minutë e 1 sekondë");
         test.done();
     },
-
-
     //test cases for sr-Latn-RS
-
     testDurFmtSRFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -6664,8 +6595,6 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1 g, 1 m, 1 n, 1 d, 01:01:01");
         test.done();
     },
-
-
     testDurFmtSRFormatLong: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -6707,7 +6636,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for th-TH
-
     testDurFmtTHFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -6831,7 +6759,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for uk-UA
-
     testDurFmtUKUAFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -6849,7 +6776,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1р, 1м, 1т, 1д, 1 год., 1х, 1с");
+        test.equal(duration.toString(), '1р, 1м, 1т, 1д, 1г, 1х, 1с');
         test.done();
     },
     testDurFmtUKUAFormatShortText: function(test) {
@@ -6870,7 +6797,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1р, 1м, 1т, 1д, 1 год., 1х, 1с");
+        test.equal(duration.toString(), '1р, 1м, 1т, 1д, 1г, 1х, 1с');
         test.done();
     },
     testDurFmtUKUAFormatShortClock: function(test) {
@@ -6911,7 +6838,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1р, 1м, 1т, 1д, 1 год., 1х, 1с');
+        test.equal(duration.toString(), '1р, 1м, 1т, 1д, 1г, 1х, 1с');
         test.done();
     },
     testDurFmtUKUAFormatLong: function(test) {
@@ -6955,7 +6882,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for uz-Cyrl-UZ
-
     testDurFmtUZFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -7079,7 +7005,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for uz-Latn-UZ
-
     testDurFmtUZLATNFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -7203,7 +7128,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for vietnemese
-
     testDurFmtVIFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -7327,7 +7251,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for zh-Hant-TW
-
     testDurFmtZHFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -7452,7 +7375,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for zh-Hank-HK
-
     testDurFmtZHHKFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -7473,8 +7395,6 @@ module.exports.testdurfmt = {
         test.equal(duration.toString(), "1年1個月1週1日1小時1分1秒");
         test.done();
     },
-
-
     testDurFmtZHHKFormatShortText: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -7578,7 +7498,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for tr-TR
-
     testDurFmtTRFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -7702,7 +7621,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for swedish
-
     testDurFmtSVFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -7826,7 +7744,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for sl-SI
-
     testDurFmtSLFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
@@ -7950,7 +7867,6 @@ module.exports.testdurfmt = {
         test.done();
     },
     //test cases for portuguese pt-PU
-
     testDurFmtPTPTFormatShortDefaultStyle: function(test) {
         test.expect(2);
         var fmt = new DurationFmt({
diff --git a/js/test/durfmt/testdurfmt2.js b/js/test/durfmt/testdurfmt2.js
index 13fcc88c2b..993e8fe816 100644
--- a/js/test/durfmt/testdurfmt2.js
+++ b/js/test/durfmt/testdurfmt2.js
@@ -1,7 +1,7 @@
 /*
  * testdurfmt2.js - test the duration formatter object
  *
- * Copyright © 2019-2023, JEDLSoft
+ * Copyright © 2019-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -924,14 +924,14 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_16[3], '16y 16m 16w 16d');
 
         test.equal(clockformatted_1[0], '1 hour, 1 minute, 1 second');
-        test.equal(clockformatted_1[1], '1 hr, 1 min., 1 sec.');
-        test.equal(clockformatted_1[2], '1h, 1min., 1s.');
-        test.equal(clockformatted_1[3], '1h 1min. 1s.');
+        test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec.');
+        test.equal(clockformatted_1[2], '1h, 1m, 1s.');
+        test.equal(clockformatted_1[3], '1h 1m 1s.');
 
         test.equal(clockformatted_16[0], '16 hours, 16 minutes, 16 seconds');
         test.equal(clockformatted_16[1], '16 hrs, 16 mins, 16 secs');
-        test.equal(clockformatted_16[3], '16h 16min. 16s.');
-        test.equal(clockformatted_16[3], '16h 16min. 16s.');
+        test.equal(clockformatted_16[3], '16h 16m 16s.');
+        test.equal(clockformatted_16[3], '16h 16m 16s.');
 
         test.done();
     },
@@ -1938,13 +1938,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 seg.');
-        test.equal(clockformatted_1[2], '1h, 1m, 1seg.');
-        test.equal(clockformatted_1[3], '1h 1m 1seg.');
+        test.equal(clockformatted_1[2], '1h, 1min, 1seg.');
+        test.equal(clockformatted_1[3], '1h 1min 1seg.');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 seg.');
-        test.equal(clockformatted_2[2], '2h, 2m, 2seg.');
-        test.equal(clockformatted_2[3], '2h 2m 2seg.');
+        test.equal(clockformatted_2[2], '2h, 2min, 2seg.');
+        test.equal(clockformatted_2[3], '2h 2min 2seg.');
 
         test.done();
     },
@@ -1979,13 +1979,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_16[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_16[2], '2h, 2m, 2s');
-        test.equal(clockformatted_16[3], '2h 2m 2s');
+        test.equal(clockformatted_16[2], '2h, 2min, 2s');
+        test.equal(clockformatted_16[3], '2h 2min 2s');
 
         test.done();
     },
@@ -2019,13 +2019,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2m, 2s');
-        test.equal(clockformatted_2[3], '2h 2m 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -2100,13 +2100,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 seg.');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 seg.');
-        test.equal(clockformatted_2[2], '2h, 2m, 2s');
-        test.equal(clockformatted_2[3], '2h 2m 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -2141,13 +2141,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16m, 16s');
-        test.equal(clockformatted_16[3], '16h 16m 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -2222,13 +2222,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16m, 16s');
-        test.equal(clockformatted_16[3], '16h 16m 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -2263,13 +2263,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17m, 17s');
-        test.equal(clockformatted_17[3], '17h 17m 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -2292,7 +2292,7 @@ module.exports.testdurfmt2 = {
         }
 
         test.equal(textformatted_1[0], '1 año, 1 mes, 1 semana y 1 día');
-        test.equal(textformatted_1[1], '1 a, 1 m, 1 sem, 1 día');
+        test.equal(textformatted_1[1], '1 a, 1 m., 1 sem., 1 día');
         test.equal(textformatted_1[2], '1a, 1m, 1sem, 1d');
         test.equal(textformatted_1[3], '1a 1m 1sem 1d');
 
@@ -2303,13 +2303,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2m, 2s');
-        test.equal(clockformatted_2[3], '2h 2m 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -2344,13 +2344,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16m, 16s');
-        test.equal(clockformatted_16[3], '16h 16m 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -2385,13 +2385,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17m, 17s');
-        test.equal(clockformatted_17[3], '17h 17m 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -2426,13 +2426,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16m, 16s');
-        test.equal(clockformatted_16[3], '16h 16m 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -2466,13 +2466,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2m, 2s');
-        test.equal(clockformatted_2[3], '2h 2m 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -2506,13 +2506,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 seg.');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 seg.');
-        test.equal(clockformatted_2[2], '2h, 2m, 2s');
-        test.equal(clockformatted_2[3], '2h 2m 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -2547,13 +2547,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17m, 17s');
-        test.equal(clockformatted_17[3], '17h 17m 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -2588,13 +2588,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17m, 17s');
-        test.equal(clockformatted_17[3], '17h 17m 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -2628,13 +2628,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2m, 2s');
-        test.equal(clockformatted_2[3], '2h 2m 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -2669,13 +2669,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16m, 16s');
-        test.equal(clockformatted_16[3], '16h 16m 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -2905,7 +2905,7 @@ module.exports.testdurfmt2 = {
             clockformatted_17.push(textfmt.format({hour: 17,minute: 17,second: 17}).toString());
         }
 
-        test.equal(textformatted_1[0], '1 an, 1 mois, 1 semaine et 1 jour');
+        test.equal(textformatted_1[0], '1 an, 1 mois, 1 semaine et 1 jour');
         test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m, 1sem, 1j');
         test.equal(textformatted_1[3], '1a 1m 1sem 1j');
@@ -3080,55 +3080,55 @@ module.exports.testdurfmt2 = {
             clockformatted_11.push(textfmt.format({hour: 11,minute: 11,second: 11}).toString());
         }
 
-        test.equal(textformatted_1[0], '1 bhliain, 1 mhí, 1 seachtain agus 1 lá');
-        test.equal(textformatted_1[1], '1 bhl, 1 mhí, 1 scht, 1 lá');
-        test.equal(textformatted_1[2], '1b, 1m, 1s, 1l');
-        test.equal(textformatted_1[3], '1b 1m 1s 1l');
+        test.equal(textformatted_1[0], '1 bhliain, 1 mhí, 1 scht agus 1 lá');
+        test.equal(textformatted_1[1], '1 bl, 1 mí, 1 scht, 1 lá');
+        test.equal(textformatted_1[2], '1 bl, 1m, 1 scht, 1 lá');
+        test.equal(textformatted_1[3], '1 bl 1m 1 scht 1 lá');
 
-        test.equal(textformatted_2[0], '2 bhliain, 2 mhí, 2 sheachtain agus 2 lá');
-        test.equal(textformatted_2[1], '2 bhl, 2 mhí, 2 scht, 2 lá');
-        test.equal(textformatted_2[2], '2b, 2m, 2s, 2l');
-        test.equal(textformatted_2[3], '2b 2m 2s 2l');
+        test.equal(textformatted_2[0], '2 bhl, 2 mhí, 2 scht agus 2 lá');
+        test.equal(textformatted_2[1], '2 bl, 2 mí, 2 scht, 2 lá');
+        test.equal(textformatted_2[2], '2 bl, 2m, 2 scht, 2 lá');
+        test.equal(textformatted_2[3], '2 bl 2m 2 scht 2 lá');
 
-        test.equal(textformatted_3[0], '3 bliana, 3 mhí, 3 seachtaine agus 3 lá');
-        test.equal(textformatted_3[1], '3 bl, 3 mhí, 3 scht, 3 lá');
-        test.equal(textformatted_3[2], '3b, 3m, 3s, 3l');
-        test.equal(textformatted_3[3], '3b 3m 3s 3l');
+        test.equal(textformatted_3[0], '3 bl, 3 mhí, 3 scht agus 3 lá');
+        test.equal(textformatted_3[1], '3 bl, 3 mí, 3 scht, 3 lá');
+        test.equal(textformatted_3[2], '3 bl, 3m, 3 scht, 3 lá');
+        test.equal(textformatted_3[3], '3 bl 3m 3 scht 3 lá');
 
-        test.equal(textformatted_7[0], '7 mbliana, 7 mí, 7 seachtaine agus 7 lá');
-        test.equal(textformatted_7[1], '7 mbl, 7 mí, 7 scht, 7 lá');
-        test.equal(textformatted_7[2], '7b, 7m, 7s, 7l');
-        test.equal(textformatted_7[3], '7b 7m 7s 7l');
+        test.equal(textformatted_7[0], '7 mbl, 7 mí, 7 scht agus 7 lá');
+        test.equal(textformatted_7[1], '7 bl, 7 mí, 7 scht, 7 lá');
+        test.equal(textformatted_7[2], '7 bl, 7m, 7 scht, 7 lá');
+        test.equal(textformatted_7[3], '7 bl 7m 7 scht 7 lá');
 
-        test.equal(textformatted_11[0], '11 bliain, 11 mí, 11 seachtain agus 11 lá');
-        test.equal(textformatted_11[1], '11 bl, 11 mí, 11 scht, 11 lá');
-        test.equal(textformatted_11[2], '11b, 11m, 11s, 11l');
-        test.equal(textformatted_11[3], '11b 11m 11s 11l');
+        test.equal(textformatted_11[0], '11 bl, 11 mí, 11 scht agus 11 lá');
+        test.equal(textformatted_11[1], '11 bl, 11 m, 11 scht, 11 lá');
+        test.equal(textformatted_11[2], '11 bl, 11 m, 11 scht, 11 lá');
+        test.equal(textformatted_11[3], '11 bl 11 m 11 scht 11 lá');
 
-        test.equal(clockformatted_1[0], '1 uair, 1 nóiméad agus 1 soicind');
+        test.equal(clockformatted_1[0], '1 u, 1 nóim agus 1 soic');
         test.equal(clockformatted_1[1], '1 u, 1 nóim, 1 soic');
-        test.equal(clockformatted_1[2], '1u, 1n, 1s');
-        test.equal(clockformatted_1[3], '1u 1n 1s');
+        test.equal(clockformatted_1[2], '1 u, 1 nóim, 1 soic' );
+        test.equal(clockformatted_1[3], '1 u 1 nóim 1 soic');
 
-        test.equal(clockformatted_2[0], '2 uair, 2 nóiméad agus 2 shoicind');
-        test.equal(clockformatted_2[1], '2 u, 2 nóim, 2 shoic');
-        test.equal(clockformatted_2[2], '2u, 2n, 2s');
-        test.equal(clockformatted_2[3], '2u 2n 2s');
+        test.equal(clockformatted_2[0], '2 u, 2 nóim agus 2 shoic');
+        test.equal(clockformatted_2[1], '2 u, 2 nóim, 2 soic');
+        test.equal(clockformatted_2[2], '2 u, 2 nóim, 2 soic');
+        test.equal(clockformatted_2[3], '2 u 2 nóim 2 soic');
 
-        test.equal(clockformatted_3[0], '3 huaire, 3 nóiméad agus 3 shoicind');
-        test.equal(clockformatted_3[1], '3 u, 3 nóim, 3 shoic');
-        test.equal(clockformatted_3[2], '3u, 3n, 3s');
-        test.equal(clockformatted_3[3], '3u 3n 3s');
+        test.equal(clockformatted_3[0], '3 u, 3 nóim agus 3 shoic');
+        test.equal(clockformatted_3[1], '3 u, 3 nóim, 3 soic');
+        test.equal(clockformatted_3[2], '3 u, 3 nóim, 3 soic');
+        test.equal(clockformatted_3[3], '3 u 3 nóim 3 soic');
 
-        test.equal(clockformatted_7[0], '7 n-uaire, 7 nóiméad agus 7 soicind');
+        test.equal(clockformatted_7[0], '7 u, 7 nóim agus 7 soic');
         test.equal(clockformatted_7[1], '7 u, 7 nóim, 7 soic');
-        test.equal(clockformatted_7[2], '7u, 7n, 7s');
-        test.equal(clockformatted_7[3], '7u 7n 7s');
+        test.equal(clockformatted_7[2], '7 u, 7n, 7 soic');
+        test.equal(clockformatted_7[3], '7 u 7n 7 soic');
 
-        test.equal(clockformatted_11[0], '11 uair, 11 nóiméad agus 11 soicind');
+        test.equal(clockformatted_11[0], '11 u, 11 nóim agus 11 soic');
         test.equal(clockformatted_11[1], '11 u, 11 nóim, 11 soic');
-        test.equal(clockformatted_11[2], '11u, 11n, 11s');
-        test.equal(clockformatted_11[3], '11u 11n 11s');
+        test.equal(clockformatted_11[2], '11 u, 11 nóim, 11 soic');
+        test.equal(clockformatted_11[3], '11 u 11 nóim 11 soic');
 
         test.done();
     },
@@ -3320,18 +3320,18 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '1 वर्ष, 1 महीना, 1 सप्ताह, और 1 दिन');
         test.equal(textformatted_1[1], '1 वर्ष, 1 माह, 1 सप्ताह, 1 दिन');
-        test.equal(textformatted_1[2], '1वर्ष, 1माह, 1 सप्ताह, 1 दि');
-        test.equal(textformatted_1[3], '1वर्ष, 1माह, 1 सप्ताह, 1 दि');
+        test.equal(textformatted_1[2], '1 व, 1 माह, 1 सप्ताह, 1 दि');
+        test.equal(textformatted_1[3], '1 व, 1 माह, 1 सप्ताह, 1 दि');
 
         test.equal(textformatted_2[0], '2 वर्ष, 2 महीने, 2 सप्ताह, और 2 दिन');
         test.equal(textformatted_2[1], '2 वर्ष, 2 माह, 2 सप्ताह, 2 दिन');
-        test.equal(textformatted_2[2], '2वर्ष, 2माह, 2 सप्ताह, 2 दि');
-        test.equal(textformatted_2[3], '2वर्ष, 2माह, 2 सप्ताह, 2 दि');
+        test.equal(textformatted_2[2], '2 व, 2 माह, 2 सप्ताह, 2 दि');
+        test.equal(textformatted_2[3], '2 व, 2 माह, 2 सप्ताह, 2 दि');
 
         test.equal(clockformatted_1[0], '1 घंटा, 1 मिनट, और 1 सेकंड');
         test.equal(clockformatted_1[1], '1 घं॰, 1 मि॰, 1 से॰');
-        test.equal(clockformatted_1[2], '1घं॰, 1 मि, 1 से');
-        test.equal(clockformatted_1[3], '1घं॰, 1 मि, 1 से');
+        test.equal(clockformatted_1[2], '1 घं, 1 मि, 1 से');
+        test.equal(clockformatted_1[3], '1 घं, 1 मि, 1 से');
 
         test.equal(clockformatted_2[0], '2 घंटे, 2 मिनट, और 2 सेकंड');
         test.equal(clockformatted_2[1], '2 घं॰, 2 मि॰, 2 से॰');
@@ -4351,8 +4351,8 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '1 rok, 1 miesiąc, 1 tydzień i 1 doba');
         test.equal(textformatted_1[1], '1 rok, 1 mies., 1 tydz., 1 doba');
-        test.equal(textformatted_1[2], '1 r., 1 m-c, 1 tydz., 1 d.');
-        test.equal(textformatted_1[3], '1 r., 1 m-c, 1 tydz., 1 d.');
+        test.equal(textformatted_1[2], '1 r., 1 m-c, 1 t., 1 d.');
+        test.equal(textformatted_1[3], '1 r., 1 m-c, 1 t., 1 d.');
 
         test.equal(textformatted_2[0], '2 lata, 2 miesiące, 2 tygodnie i 2 doby');
         test.equal(textformatted_2[1], '2 lata, 2 mies., 2 tyg., 2 doby');
@@ -4361,8 +4361,8 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_5[0], '5 lat, 5 miesięcy, 5 tygodni i 5 dób');
         test.equal(textformatted_5[1], '5 lat, 5 mies., 5 tyg., 5 dób');
-        test.equal(textformatted_5[2], '5 l., 5 m-cy, 5 tyg., 5 d.');
-        test.equal(textformatted_5[3], '5 l., 5 m-cy, 5 tyg., 5 d.');
+        test.equal(textformatted_5[2], '5 l., 5 m-cy, 5 t., 5 d.');
+        test.equal(textformatted_5[3], '5 l., 5 m-cy, 5 t., 5 d.');
 
         test.equal(clockformatted_1[0], '1 godzina, 1 minuta i 1 sekunda');
         test.equal(clockformatted_1[1], '1 godz., 1 min, 1 sek.');
@@ -5572,18 +5572,18 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 година, 1 хвилина і 1 секунда');
         test.equal(clockformatted_1[1], '1 год, 1 хв, 1 с');
-        test.equal(clockformatted_1[2], '1 год., 1х, 1с');
-        test.equal(clockformatted_1[3], '1 год., 1х, 1с');
+        test.equal(clockformatted_1[2], '1г, 1х, 1с');
+        test.equal(clockformatted_1[3], '1г, 1х, 1с');
 
         test.equal(clockformatted_2[0], '2 години, 2 хвилини і 2 секунди');
         test.equal(clockformatted_2[1], '2 год, 2 хв, 2 с');
-        test.equal(clockformatted_2[2], '2 год., 2х, 2с');
-        test.equal(clockformatted_2[3], '2 год., 2х, 2с');
+        test.equal(clockformatted_2[2], '2г, 2х, 2с');
+        test.equal(clockformatted_2[3], '2г, 2х, 2с');
 
         test.equal(clockformatted_5[0], '5 годин, 5 хвилин і 5 секунд');
         test.equal(clockformatted_5[1], '5 год, 5 хв, 5 с');
-        test.equal(clockformatted_5[2], '5 год., 5х, 5с');
-        test.equal(clockformatted_5[3], '5 год., 5х, 5с');
+        test.equal(clockformatted_5[2], '5г, 5х, 5с');
+        test.equal(clockformatted_5[3], '5г, 5х, 5с');
 
         test.done();
     },
@@ -7953,13 +7953,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1m, 1s');
-        test.equal(clockformatted_1[3], '1h 1m 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17m, 17s');
-        test.equal(clockformatted_17[3], '17h 17m 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -9113,19 +9113,19 @@ module.exports.testdurfmt2 = {
         }
 
         test.equal(textformatted_1[0], '1 год 1 месяц 1 тыдзень 1 суткі');
-        test.equal(textformatted_1[1], '1 г. 1 мес. 1 тыдз. 1 сут');
-        test.equal(textformatted_1[2], '1 г. 1 мес. 1 тыдз. 1 сут');
-        test.equal(textformatted_1[3], '1 г. 1 мес. 1 тыдз. 1 сут');
+        test.equal(textformatted_1[1], '1 г. 1 мес. 1 тыдз 1 сут');
+        test.equal(textformatted_1[2], '1 г. 1 мес. 1 тыдз 1 сут');
+        test.equal(textformatted_1[3], '1 г. 1 мес. 1 тыдз 1 сут');
 
         test.equal(textformatted_3[0], '3 гады 3 месяца 3 тыдні 3 сутак');
-        test.equal(textformatted_3[1], '3 г. 3 мес. 3 тыдз. 3 сут');
-        test.equal(textformatted_3[2], '3 г. 3 мес. 3 тыдз. 3 сут');
-        test.equal(textformatted_3[3], '3 г. 3 мес. 3 тыдз. 3 сут');
+        test.equal(textformatted_3[1], '3 г. 3 мес. 3 тыдз 3 сут');
+        test.equal(textformatted_3[2], '3 г. 3 мес. 3 тыдз 3 сут');
+        test.equal(textformatted_3[3], '3 г. 3 мес. 3 тыдз 3 сут');
 
         test.equal(textformatted_100[0], '100 гадоў 100 месяцаў 100 тыдняў 100 сутак');
-        test.equal(textformatted_100[1], '100 г. 100 мес. 100 тыдз. 100 сут');
-        test.equal(textformatted_100[2], '100 г. 100 мес. 100 тыдз. 100 сут');
-        test.equal(textformatted_100[3], '100 г. 100 мес. 100 тыдз. 100 сут');
+        test.equal(textformatted_100[1], '100 г. 100 мес. 100 тыдз 100 сут');
+        test.equal(textformatted_100[2], '100 г. 100 мес. 100 тыдз 100 сут');
+        test.equal(textformatted_100[3], '100 г. 100 мес. 100 тыдз 100 сут');
 
         test.equal(clockformatted_1[0], '1 гадзіна 1 хвіліна 1 секунда');
         test.equal(clockformatted_1[1], '1 гадз 1 хв 1 с');
@@ -9478,22 +9478,22 @@ module.exports.testdurfmt2 = {
         }
 
         test.equal(textformatted_1[0], '1 နှစ်- 1 လ- 1 ပတ်နှင့် 1 ရက်');
-        test.equal(textformatted_1[1], '1 နှစ်- 1 လ- 1 ပတ်- 1 ရက်');
+        test.equal(textformatted_1[1], '1 နှစ် - 1 လ - 1 ပတ် - 1 ရက်');
         test.equal(textformatted_1[2], '1 နှစ် 1 လ 1 ပတ် 1 ရက်');
         test.equal(textformatted_1[3], '1 နှစ် 1 လ 1 ပတ် 1 ရက်');
 
         test.equal(textformatted_14[0], '14 နှစ်- 14 လ- 14 ပတ်နှင့် 14 ရက်');
-        test.equal(textformatted_14[1], '14 နှစ်- 14 လ- 14 ပတ်- 14 ရက်');
+        test.equal(textformatted_14[1], '14 နှစ် - 14 လ - 14 ပတ် - 14 ရက်');
         test.equal(textformatted_14[2], '14 နှစ် 14 လ 14 ပတ် 14 ရက်');
         test.equal(textformatted_14[3], '14 နှစ် 14 လ 14 ပတ် 14 ရက်');
 
         test.equal(clockformatted_1[0], '1 နာရီ- 1 မိနစ်နှင့် 1 စက္ကန့်');
-        test.equal(clockformatted_1[1], '1 နာရီ- 1 မိနစ်- 1 စက္ကန့်');
+        test.equal(clockformatted_1[1], '1 နာရီ - 1 မိနစ် - 1 စက္ကန့်');
         test.equal(clockformatted_1[2], '1 နာရီ 1 မိနစ် 1 s');
         test.equal(clockformatted_1[3], '1 နာရီ 1 မိနစ် 1 s');
 
         test.equal(clockformatted_14[0], '14 နာရီ- 14 မိနစ်နှင့် 14 စက္ကန့်');
-        test.equal(clockformatted_14[1], '14 နာရီ- 14 မိနစ်- 14 စက္ကန့်');
+        test.equal(clockformatted_14[1], '14 နာရီ - 14 မိနစ် - 14 စက္ကန့်');
         test.equal(clockformatted_14[2], '14 နာရီ 14 မိနစ် 14 s');
         test.equal(clockformatted_14[3], '14 နာရီ 14 မိနစ် 14 s');
 
@@ -9820,22 +9820,22 @@ module.exports.testdurfmt2 = {
         }
 
         test.equal(textformatted_1[0], '‏1 کال, 1 مياشت, اونۍ, 1 ورځ');
-        test.equal(textformatted_1[1], '‏1 y, 1 m, 1 w, 1 ورځ');
+        test.equal(textformatted_1[1], '‏1/کال, 1 m, 1 w, 1 ورځ');
         test.equal(textformatted_1[2], '‏1 y 1 m 1 w 1 ورځ');
         test.equal(textformatted_1[3], '‏1 y 1 m 1 w 1 ورځ');
 
         test.equal(textformatted_16[0], '‏16 کالونه, 16 مياشتې, 16 اونۍ, 16 ورځې');
-        test.equal(textformatted_16[1], '‏16 y, 16 mths, 16 wks, 16 ورځې');
+        test.equal(textformatted_16[1], '‏16 کالونه, 16 mths, 16 wks, 16 ورځې');
         test.equal(textformatted_16[2], '‏16 y 16 m 16 w 16d');
         test.equal(textformatted_16[3], '‏16 y 16 m 16 w 16d');
 
-        test.equal(clockformatted_1[0], '‏1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[1], '‏1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '‏1 h 1 min 1 s');
-        test.equal(clockformatted_1[3], '‏1 h 1 min 1 s');
+        test.equal(clockformatted_1[0], '‏1 h, 1 دقیقه, 1 s');
+        test.equal(clockformatted_1[1], '‏1 h, 1 دقیقه, 1 sec');
+        test.equal(clockformatted_1[2], '‏1 h 1m 1 s');
+        test.equal(clockformatted_1[3], '‏1 h 1m 1 s');
 
-        test.equal(clockformatted_16[0], '‏16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[1], '‏16 h, 16 min, 16 s');
+        test.equal(clockformatted_16[0], '‏16 h, 16 دقیقې, 16 ثانیې');
+        test.equal(clockformatted_16[1], '‏16 h, 16 دقیقه, 16 sec');
         test.equal(clockformatted_16[2], '‏16 h 16m 16 s');
         test.equal(clockformatted_16[3], '‏16 h 16m 16 s');
         test.done();
@@ -9859,22 +9859,22 @@ module.exports.testdurfmt2 = {
         }
 
         test.equal(textformatted_1[0], '‏1 کال, 1 مياشت, اونۍ, 1 ورځ');
-        test.equal(textformatted_1[1], '‏1 y, 1 m, 1 w, 1 ورځ');
+        test.equal(textformatted_1[1], '‏1/کال, 1 m, 1 w, 1 ورځ');
         test.equal(textformatted_1[2], '‏1 y 1 m 1 w 1 ورځ');
         test.equal(textformatted_1[3], '‏1 y 1 m 1 w 1 ورځ');
 
         test.equal(textformatted_11[0], '‏11 کالونه, 11 مياشتے, 11 اونۍ, 11 ورځے');
-        test.equal(textformatted_11[1], '‏11 y, 11 mths, 11 wks, 11 ورځے');
+        test.equal(textformatted_11[1], '‏11 کالونه, 11 mths, 11 wks, 11 ورځے');
         test.equal(textformatted_11[2], '‏11 y 11 m 11 w 11d');
         test.equal(textformatted_11[3], '‏11 y 11 m 11 w 11d');
 
-        test.equal(clockformatted_1[0], '‏1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[1], '‏1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '‏1 h 1 min 1 s');
-        test.equal(clockformatted_1[3], '‏1 h 1 min 1 s');
+        test.equal(clockformatted_1[0], '‏1 h, 1 دقیقه, 1 s');
+        test.equal(clockformatted_1[1], '‏1 h, 1 دقیقه, 1 sec');
+        test.equal(clockformatted_1[2], '‏1 h 1m 1 s');
+        test.equal(clockformatted_1[3], '‏1 h 1m 1 s');
 
-        test.equal(clockformatted_11[0], '‏11 h, 11 min, 11 s');
-        test.equal(clockformatted_11[1], '‏11 h, 11 min, 11 s');
+        test.equal(clockformatted_11[0], '‏11 h, 11 دقیقې, 11 ثانیې');
+        test.equal(clockformatted_11[1], '‏11 h, 11 دقیقه, 11 sec');
         test.equal(clockformatted_11[2], '‏11 h 11m 11 s');
         test.equal(clockformatted_11[3], '‏11 h 11m 11 s');
         test.done();
diff --git a/js/test/number/testcurrency.js b/js/test/number/testcurrency.js
index dcc6636853..25c4ae541d 100644
--- a/js/test/number/testcurrency.js
+++ b/js/test/number/testcurrency.js
@@ -1,7 +1,7 @@
 /*
  * testcurrency.js - test the currency routines
  *
- * Copyright © 2012-2017, 2020-2023 JEDLSoft
+ * Copyright © 2012-2017, 2020-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@ module.exports.testcurrency = {
         test.expect(7);
         var cur = new Currency();
         test.ok(cur !== null);
-
         test.equal(cur.getCode(), "USD");
         test.equal(cur.getFractionDigits(), 2);
         test.equal(cur.getSign(), "$");
@@ -53,7 +52,6 @@ module.exports.testcurrency = {
             code: "EUR"
         });
         test.ok(cur !== null);
-
         test.equal(cur.getCode(), "EUR");
         test.equal(cur.getFractionDigits(), 2);
         test.equal(cur.getSign(), "€");
@@ -68,7 +66,6 @@ module.exports.testcurrency = {
             code: "JPY"
         });
         test.ok(cur !== null);
-
         test.equal(cur.getCode(), "JPY");
         test.equal(cur.getFractionDigits(), 0);
         test.equal(cur.getSign(), "¥");
@@ -83,7 +80,6 @@ module.exports.testcurrency = {
             locale: "en-PH"
         });
         test.ok(cur !== null);
-
         test.equal(cur.getCode(), "PHP");
         test.equal(cur.getFractionDigits(), 2);
         test.equal(cur.getSign(), '₱');
@@ -98,7 +94,6 @@ module.exports.testcurrency = {
             locale: "ar-QA"
         });
         test.ok(cur !== null);
-
         test.equal(cur.getCode(), "QAR");
         test.equal(cur.getFractionDigits(), 2);
         test.equal(cur.getSign(), 'ر.ق');
@@ -124,7 +119,6 @@ module.exports.testcurrency = {
             sign: "€"
         });
         test.ok(cur !== null);
-
         test.equal(cur.getCode(), "EUR");
         test.equal(cur.getFractionDigits(), 2);
         test.equal(cur.getSign(), "€");
@@ -140,7 +134,6 @@ module.exports.testcurrency = {
             sign: "$"
         });
         test.ok(cur !== null);
-
         test.equal(cur.getCode(), "CAD");
         test.equal(cur.getFractionDigits(), 2);
         test.equal(cur.getSign(), "$");
@@ -156,7 +149,6 @@ module.exports.testcurrency = {
             sign: "$"
         });
         test.ok(cur !== null);
-
         test.equal(cur.getCode(), "USD");
         test.equal(cur.getFractionDigits(), 2);
         test.equal(cur.getSign(), "$");
@@ -171,7 +163,6 @@ module.exports.testcurrency = {
             locale: "ar-IQ"
         });
         test.ok(cur !== null);
-
         test.equal(cur.getCode(), "IQD");
         test.equal(cur.getFractionDigits(), 0);
         test.equal(cur.getSign(), "ﺩ.ﻉ.");
@@ -184,1753 +175,1371 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("ar-EG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EGP");
-
         test.done();
     },
     testCurrency_ar_IQ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-IQ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "IQD");
-
         test.done();
     },
     testCurrency_ar_MA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-MA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MAD");
-
         test.done();
     },
     testCurrency_as_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("as-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_bg_BG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("bg-BG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "BGN");
-
         test.done();
     },
     testCurrency_bn_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("bn-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_bs_Latn_BA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("bs-Latn-BA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "BAM");
-
         test.done();
     },
     testCurrency_bs_Latn_ME: function(test) {
         test.expect(2);
         var info = new LocaleInfo("bs-Latn-ME");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_cs_CZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("cs-CZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CZK");
-
         test.done();
     },
     testCurrency_da_DK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("da-DK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "DKK");
-
         test.done();
     },
     testCurrency_de_AT: function(test) {
         test.expect(2);
         var info = new LocaleInfo("de-AT");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_de_CH: function(test) {
         test.expect(2);
         var info = new LocaleInfo("de-CH");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CHF");
-
         test.done();
     },
     testCurrency_de_DE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("de-DE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_de_LU: function(test) {
         test.expect(2);
         var info = new LocaleInfo("de-LU");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_el_CY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("el-CY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_el_GR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("el-GR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_en_AM: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-AM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AMD");
-
         test.done();
     },
     testCurrency_en_AU: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-AU");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AUD");
-
         test.done();
     },
     testCurrency_en_AZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-AZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AZN");
-
         test.done();
     },
     testCurrency_en_CA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-CA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CAD");
-
         test.done();
     },
     testCurrency_en_GB: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-GB");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "GBP");
-
         test.done();
     },
     testCurrency_en_GH: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-GH");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "GHS");
-
         test.done();
     },
     testCurrency_en_HK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-HK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "HKD");
-
         test.done();
     },
     testCurrency_en_IE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-IE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_en_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_en_IS: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-IS");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ISK");
-
         test.done();
     },
     testCurrency_en_JP: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-JP");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "JPY");
-
         test.done();
     },
     testCurrency_en_KE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-KE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "KES");
-
         test.done();
     },
     testCurrency_en_KR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-KR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "KRW");
-
         test.done();
     },
     testCurrency_en_LK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-LK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "LKR");
-
         test.done();
     },
     testCurrency_en_MM: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-MM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MMK");
-
         test.done();
     },
     testCurrency_en_MW: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-MW");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MWK");
-
         test.done();
     },
     testCurrency_en_MY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-MY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MYR");
-
         test.done();
     },
     testCurrency_en_NG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-NG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "NGN");
-
         test.done();
     },
     testCurrency_en_NZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-NZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "NZD");
-
         test.done();
     },
     testCurrency_en_PH: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-PH");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "PHP");
-
         test.done();
     },
     testCurrency_en_PR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-PR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "USD");
-
         test.done();
     },
     testCurrency_en_SG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-SG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "SGD");
-
         test.done();
     },
     testCurrency_en_US: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-US");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "USD");
-
         test.done();
     },
     testCurrency_en_UG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-UG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "UGX");
-
         test.done();
     },
     testCurrency_en_ZA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-ZA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ZAR");
-
         test.done();
     },
     testCurrency_en_ZM: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-ZM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ZMW");
-
         test.done();
     },
     testCurrency_es_AR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-AR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ARS");
-
         test.done();
     },
     testCurrency_es_BO: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-BO");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "BOB");
-
         test.done();
     },
     testCurrency_es_CL: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-CL");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CLP");
-
         test.done();
     },
     testCurrency_es_CO: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-CO");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "COP");
-
         test.done();
     },
     testCurrency_es_DO: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-DO");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "DOP");
-
         test.done();
     },
     testCurrency_es_EC: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-EC");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "USD");
-
         test.done();
     },
     testCurrency_es_ES: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-ES");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_es_GT: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-GT");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "GTQ");
-
         test.done();
     },
     testCurrency_es_HN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-HN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "HNL");
-
         test.done();
     },
     testCurrency_es_MX: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-MX");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MXN");
-
         test.done();
     },
     testCurrency_es_NI: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-NI");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "NIO");
-
         test.done();
     },
     testCurrency_es_PA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-PA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "USD");
-
         test.done();
     },
     testCurrency_es_PE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-PE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "PEN");
-
         test.done();
     },
     testCurrency_es_PR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-PR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "USD");
-
         test.done();
     },
     testCurrency_es_PY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-PY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "PYG");
-
         test.done();
     },
     testCurrency_es_SV: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-SV");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "USD");
-
         test.done();
     },
     testCurrency_es_US: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-US");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "USD");
-
         test.done();
     },
     testCurrency_es_UY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-UY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "UYU");
-
         test.done();
     },
     testCurrency_es_VE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-VE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "VES");
-
         test.done();
     },
     testCurrency_et_EE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("et-EE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_fa_AF: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fa-AF");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AFN");
-
         test.done();
     },
     testCurrency_fa_IR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fa-IR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "IRR");
-
         test.done();
     },
     testCurrency_fi_FI: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fi-FI");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_fr_BE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-BE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_fr_CA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-CA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CAD");
-
         test.done();
     },
     testCurrency_fr_CH: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-CH");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CHF");
-
         test.done();
     },
     testCurrency_fr_FR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-FR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_fr_LU: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-LU");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_ga_IE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ga-IE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_gu_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("gu-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_he_IL: function(test) {
         test.expect(2);
         var info = new LocaleInfo("he-IL");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ILS");
-
         test.done();
     },
     testCurrency_hi_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("hi-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_hr_HR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("hr-HR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_hr_ME: function(test) {
         test.expect(2);
         var info = new LocaleInfo("hr-ME");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_hr_HU: function(test) {
         test.expect(2);
         var info = new LocaleInfo("hr-HU");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "HUF");
-
         test.done();
     },
     testCurrency_id_ID: function(test) {
         test.expect(2);
         var info = new LocaleInfo("id-ID");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "IDR");
-
         test.done();
     },
     testCurrency_is_IS: function(test) {
         test.expect(2);
         var info = new LocaleInfo("is-IS");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ISK");
-
         test.done();
     },
     testCurrency_it_CH: function(test) {
         test.expect(2);
         var info = new LocaleInfo("it-CH");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CHF");
-
         test.done();
     },
     testCurrency_it_IT: function(test) {
         test.expect(2);
         var info = new LocaleInfo("it-IT");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_ja_JP: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ja-JP");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "JPY");
-
         test.done();
     },
     testCurrency_kk_KZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("kk-KZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "KZT");
-
         test.done();
     },
     testCurrency_kn_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("kn-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_ko_KR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ko-KR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "KRW");
-
         test.done();
     },
     testCurrency_ku_IQ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ku-IQ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "IQD");
-
         test.done();
     },
     testCurrency_lt_LT: function(test) {
         test.expect(2);
         var info = new LocaleInfo("lt-LT");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_lv_LV: function(test) {
         test.expect(2);
         var info = new LocaleInfo("lv-LV");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_mk_MK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("mk-MK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MKD");
-
         test.done();
     },
     testCurrency_ml_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ml-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_mr_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("mr-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_ms_MY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ms-MY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MYR");
-
         test.done();
     },
     testCurrency_nb_NO: function(test) {
         test.expect(2);
         var info = new LocaleInfo("nb-NO");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "NOK");
-
         test.done();
     },
     testCurrency_nl_BE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("nl-BE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_nl_NL: function(test) {
         test.expect(2);
         var info = new LocaleInfo("nl-NL");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_pa_Guru_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("pa-Guru-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_pl_PL: function(test) {
         test.expect(2);
         var info = new LocaleInfo("pl-PL");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "PLN");
-
         test.done();
     },
     testCurrency_pt_BR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("pt-BR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "BRL");
-
         test.done();
     },
     testCurrency_pt_PT: function(test) {
         test.expect(2);
         var info = new LocaleInfo("pt-PT");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_ro_RO: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ro-RO");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "RON");
-
         test.done();
     },
     testCurrency_sr_Cyrl_RS: function(test) {
         test.expect(2);
         var info = new LocaleInfo("sr-Cyrl-RS");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "RSD");
-
         test.done();
     },
     testCurrency_sr_Latn_RS: function(test) {
         test.expect(2);
         var info = new LocaleInfo("sr-Latn-RS");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "RSD");
-
         test.done();
     },
     testCurrency_ru_BY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ru-BY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "BYN");
-
         test.done();
     },
     testCurrency_ru_KG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ru-KG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "KGS");
-
         test.done();
     },
     testCurrency_ru_KZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ru-KZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "KZT");
-
         test.done();
     },
     testCurrency_ru_GE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ru-GE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "GEL");
-
         test.done();
     },
     testCurrency_ru_RU: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ru-RU");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "RUB");
-
         test.done();
     },
     testCurrency_ru_UA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ru-UA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "UAH");
-
         test.done();
     },
     testCurrency_sk_SK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("sk-SK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_sl_SI: function(test) {
         test.expect(2);
         var info = new LocaleInfo("sl-SI");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_sq_AL: function(test) {
         test.expect(2);
         var info = new LocaleInfo("sq-AL");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ALL");
-
         test.done();
     },
     testCurrency_sq_ME: function(test) {
         test.expect(2);
         var info = new LocaleInfo("sq-ME");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_sv_FI: function(test) {
         test.expect(2);
         var info = new LocaleInfo("sv-FI");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_sv_SE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("sv-SE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "SEK");
-
         test.done();
     },
     testCurrency_ta_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ta-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_te_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("te-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_th_TH: function(test) {
         test.expect(2);
         var info = new LocaleInfo("th-TH");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "THB");
-
         test.done();
     },
     testCurrency_tr_AM: function(test) {
         test.expect(2);
         var info = new LocaleInfo("tr-AM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AMD");
-
         test.done();
     },
     testCurrency_tr_AZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("tr-AZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AZN");
-
         test.done();
     },
     testCurrency_tr_CY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("tr-CY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_tr_TR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("tr-TR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "TRY");
-
         test.done();
     },
     testCurrency_uk_UA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("uk-UA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "UAH");
-
         test.done();
     },
     testCurrency_ur_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ur-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_uz_Latn_UZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("uz-Latn-UZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "UZS");
-
         test.done();
     },
     testCurrency_vi_VN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("vi-VN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "VND");
-
         test.done();
     },
     testCurrency_zh_Hans_CN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("zh-Hans-CN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CNY");
-
         test.done();
     },
     testCurrency_zh_Hant_HK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("zh-Hant-HK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "HKD");
-
         test.done();
     },
     testCurrency_zh_Hant_TW: function(test) {
         test.expect(2);
         var info = new LocaleInfo("zh-Hant-TW");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "TWD");
-
         test.done();
     },
     testCurrency_en_GE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-GE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "GEL");
-
         test.done();
     },
     testCurrency_en_CN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-CN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CNY");
-
         test.done();
     },
     testCurrency_en_MX: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-MX");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MXN");
-
         test.done();
     },
     testCurrency_en_TW: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-TW");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "TWD");
-
         test.done();
     },
     testCurrency_mn_MN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("mn-MN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MNT");
-
         test.done();
     },
     testCurrency_es_CA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-CA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CAD");
-
         test.done();
     },
     testCurrency_af_ZA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("af-ZA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ZAR");
-
         test.done();
     },
     testCurrency_am_ET: function(test) {
         test.expect(2);
         var info = new LocaleInfo("am-ET");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ETB");
-
         test.done();
     },
     testCurrency_ha_Latn_NG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ha-Latn-NG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "NGN");
-
         test.done();
     },
     testCurrency_or_IN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("or-IN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "INR");
-
         test.done();
     },
     testCurrency_az_Latn_AZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("az-Latn-AZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AZN");
-
         test.done();
     },
     testCurrency_km_KH: function(test) {
         test.expect(2);
         var info = new LocaleInfo("km-KH");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "KHR");
-
         test.done();
     },
     testCurrency_si_LK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("si-LK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "LKR");
-
         test.done();
     },
     testCurrency_ar_AE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-AE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AED");
-
         test.done();
     },
     testCurrency_ar_BH: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-BH");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "BHD");
-
         test.done();
     },
     testCurrency_ar_DJ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-DJ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "DJF");
-
         test.done();
     },
     testCurrency_ar_DZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-DZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "DZD");
-
         test.done();
     },
     testCurrency_ar_JO: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-JO");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "JOD");
-
         test.done();
     },
     testCurrency_ar_KW: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-KW");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "KWD");
-
         test.done();
     },
     testCurrency_ar_LB: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-LB");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "LBP");
-
         test.done();
     },
     testCurrency_ar_LY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-LY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "LYD");
-
         test.done();
     },
     testCurrency_ar_MR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-MR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MRU");
-
         test.done();
     },
     testCurrency_ar_OM: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-OM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "OMR");
-
         test.done();
     },
     testCurrency_ar_QA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-QA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "QAR");
-
         test.done();
     },
     testCurrency_ar_SA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-SA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "SAR");
-
         test.done();
     },
     testCurrency_ar_SD: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-SD");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "SDG");
-
         test.done();
     },
     testCurrency_ar_SY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-SY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "SYP");
-
         test.done();
     },
     testCurrency_ar_TN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-TN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "TND");
-
         test.done();
     },
     testCurrency_ar_YE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ar-YE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "YER");
-
         test.done();
     },
     testCurrency_en_ET: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-ET");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ETB");
-
         test.done();
     },
     testCurrency_en_GM: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-GM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "GMD");
-
         test.done();
     },
     testCurrency_en_LR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-LR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "LRD");
-
         test.done();
     },
     testCurrency_en_PK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-PK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "PKR");
-
         test.done();
     },
     testCurrency_en_RW: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-RW");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "RWF");
-
         test.done();
     },
     testCurrency_en_SD: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-SD");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "SDG");
-
         test.done();
     },
     testCurrency_en_SL: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-SL");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "SLE");
-
         test.done();
     },
     testCurrency_en_TZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("en-TZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "TZS");
-
         test.done();
     },
     testCurrency_es_CR: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-CR");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CRC");
-
         test.done();
     },
     testCurrency_es_GQ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-GQ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XAF");
-
         test.done();
     },
     testCurrency_es_PH: function(test) {
         test.expect(2);
         var info = new LocaleInfo("es-PH");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "PHP");
-
+        test.done();
+    },
+    testCurrency_es_CU: function(test) {
+        test.expect(2);
+        var info = new LocaleInfo("es-CU");
+        test.ok(info !== null);
+        test.equal(info.getCurrency(), "CUP");
         test.done();
     },
     testCurrency_fr_BF: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-BF");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XOF");
-
         test.done();
     },
     testCurrency_fr_BJ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-BJ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XOF");
-
         test.done();
     },
     testCurrency_fr_CD: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-CD");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CDF");
-
         test.done();
     },
     testCurrency_fr_CF: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-CF");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XAF");
-
         test.done();
     },
     testCurrency_fr_CG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-CG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XAF");
-
         test.done();
     },
     testCurrency_fr_CI: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-CI");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XOF");
-
         test.done();
     },
     testCurrency_fr_CM: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-CM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XAF");
-
         test.done();
     },
     testCurrency_fr_GQ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-GQ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XAF");
-
         test.done();
     },
     testCurrency_fr_DJ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-DJ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "DJF");
-
         test.done();
     },
     testCurrency_fr_DZ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-DZ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "DZD");
-
         test.done();
     },
     testCurrency_fr_GA: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-GA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XAF");
-
         test.done();
     },
     testCurrency_fr_GN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-GN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "GNF");
-
         test.done();
     },
     testCurrency_fr_LB: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-LB");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "LBP");
-
         test.done();
     },
     testCurrency_fr_ML: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-ML");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XOF");
-
         test.done();
     },
     testCurrency_fr_RW: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-RW");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "RWF");
-
         test.done();
     },
     testCurrency_fr_SN: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-SN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XOF");
-
         test.done();
     },
     testCurrency_fr_TG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("fr-TG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XOF");
-
         test.done();
     },
     testCurrency_ms_SG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ms-SG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "SGD");
-
         test.done();
     },
     testCurrency_pa_PK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("pa-PK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "PKR");
-
         test.done();
     },
     testCurrency_pt_AO: function(test) {
         test.expect(2);
         var info = new LocaleInfo("pt-AO");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AOA");
-
         test.done();
     },
     testCurrency_pt_GQ: function(test) {
         test.expect(2);
         var info = new LocaleInfo("pt-GQ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XAF");
-
         test.done();
     },
     testCurrency_pt_CV: function(test) {
         test.expect(2);
         var info = new LocaleInfo("pt-CV");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "CVE");
-
         test.done();
     },
     testCurrency_ur_PK: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ur-PK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "PKR");
-
         test.done();
     },
     testCurrency_zh_Hans_SG: function(test) {
         test.expect(2);
         var info = new LocaleInfo("zh-Hans-SG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "SGD");
-
         test.done();
     },
     testCurrency_zh_Hans_MY: function(test) {
         test.expect(2);
         var info = new LocaleInfo("zh-Hans-MY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MYR");
-
         test.done();
     },
     testCurrency_ka_GE: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ka-GE");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "GEL");
-
         test.done();
     },
     testCurrency_my_MM: function(test) {
         test.expect(2);
         var info = new LocaleInfo("my-MM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "MMK");
         test.done();
     },
@@ -1938,7 +1547,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("be-BY");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "BYN");
         test.done();
     },
@@ -1946,7 +1554,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("ne-NP");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "NPR");
         test.done();
     },
@@ -1954,7 +1561,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("lo-LA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "LAK");
         test.done();
     },
@@ -1962,7 +1568,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("ky-KG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "KGS");
         test.done();
     },
@@ -1970,16 +1575,13 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("ca-AD");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
-
         test.done();
     },
     testCurrency_ca_ES: function(test) {
         test.expect(2);
         var info = new LocaleInfo("ca-ES");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
         test.done();
     },
@@ -1987,7 +1589,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("gl-ES");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
         test.done();
     },
@@ -1995,7 +1596,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("hy-AM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AMD");
         test.done();
     },
@@ -2003,7 +1603,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("wo-SN");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XOF");
         test.done();
     },
@@ -2011,7 +1610,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("tk-TM");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "TMT");
         test.done();
     },
@@ -2019,7 +1617,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("tg-TJ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "TJS");
         test.done();
     },
@@ -2027,7 +1624,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("mt-MT");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
         test.done();
     },
@@ -2035,7 +1631,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("zu-ZA");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "ZAR");
         test.done();
     },
@@ -2043,7 +1638,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("lb-LU");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "EUR");
       test.done();
     },
@@ -2051,7 +1645,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("ig-NG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "NGN");
         test.done();
     },
@@ -2059,7 +1652,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("ps-PK");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "PKR");
       test.done();
     },
@@ -2067,7 +1659,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("ps-AF");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "AFN");
       test.done();
     },
@@ -2075,7 +1666,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("yo-NG");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "NGN");
         test.done();
     },
@@ -2083,7 +1673,6 @@ module.exports.testcurrency = {
         test.expect(2);
         var info = new LocaleInfo("yo-BJ");
         test.ok(info !== null);
-
         test.equal(info.getCurrency(), "XOF");
         test.done();
     }
diff --git a/js/test/number/testnumfmt.js b/js/test/number/testnumfmt.js
index 6ec5e954d9..7f91c4e2e1 100644
--- a/js/test/number/testnumfmt.js
+++ b/js/test/number/testnumfmt.js
@@ -1,7 +1,7 @@
 /*
  * testnumfmt.js - test the number formatter object
  *
- * Copyright © 2012-2018, 2020-2023 JEDLSoft
+ * Copyright © 2012-2018, 2020-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -3174,7 +3174,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(57.0), "57 %");
+        test.equal(fmt.format(57.0), "57%");
         test.done();
     },
     //test cases for ja-JP
@@ -3781,7 +3781,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(57.8), "57,8 %");
+        test.equal(fmt.format(57.8), "57,8%");
         test.done();
     },
     testNumFmtPercentageFormatNegative_bs_Latn_BA: function(test) {
@@ -3792,7 +3792,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(-57.8), "-57,8 %");
+        test.equal(fmt.format(-57.8), "-57,8%");
         test.done();
     },
     //test cases for de-DE
@@ -4316,7 +4316,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(100110.57), "kr 100 110,57");
+        test.equal(fmt.format(100110.57), "100 110,57 kr");
         test.done();
     },
     testNumFmtCurrencyFormatCorrectNegativeCurrencyForLocale_nb_NO: function(test) {
@@ -4328,7 +4328,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(-100110.57), "kr -100 110,57");
+        test.equal(fmt.format(-100110.57), "-100 110,57 kr");
         test.done();
     },
     testNumFmtPercentageFormatRegular_nb_NO: function(test) {
@@ -5212,7 +5212,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(57.8), "57,8 %");
+        test.equal(fmt.format(57.8), "57,8%");
         test.done();
     },
     testNumFmtNegativeCurrencyFormatForLocale_es_CR: function(test) {
@@ -5260,7 +5260,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(57.8), "57.8 %");
+        test.equal(fmt.format(57.8), "57.8%");
         test.done();
     },
     testNumFmtNegativeCurrencyFormatForLocale_es_DO: function(test) {
@@ -5308,7 +5308,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(57.8), "57.8 %");
+        test.equal(fmt.format(57.8), "57.8%");
         test.done();
     },
     testNumFmtNegativeCurrencyFormatForLocale_es_SV: function(test) {
@@ -5404,7 +5404,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(57.8), "57.8 %");
+        test.equal(fmt.format(57.8), "57.8%");
         test.done();
     },
     testNumFmtNegativeCurrencyFormatForLocale_es_GT: function(test) {
@@ -5452,7 +5452,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(57.8), "57.8 %");
+        test.equal(fmt.format(57.8), "57.8%");
         test.done();
     },
     testNumFmtNegativeCurrencyFormatForLocale_es_HN: function(test) {
@@ -5572,7 +5572,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(-123456.785), "-123.456,78");
+        test.equal(fmt.format(-123456.785), "-123,456.78");
         test.done();
     },
     testNumFmtCurrencyFormatCorrectCurrencyForLocale_km_KH: function(test) {
@@ -5585,7 +5585,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(100110.57), "100.110,57៛");
+        test.equal(fmt.format(100110.57), "100,110.57៛");
         test.done();
     },
     testNumFmtPercentageFormatRegular_km_KH: function(test) {
@@ -5608,7 +5608,7 @@ module.exports.testnumfmt = {
         });
 
         test.ok(fmt);
-        test.equal(fmt.format(-100110.57), "-100.110,57៛");
+        test.equal(fmt.format(-100110.57), "-100,110.57៛");
         test.done();
     },
     // test case for si-LK
diff --git a/js/test/number/testnumfmt2.js b/js/test/number/testnumfmt2.js
index c7afd5a8c3..8416bc4957 100644
--- a/js/test/number/testnumfmt2.js
+++ b/js/test/number/testnumfmt2.js
@@ -1,7 +1,7 @@
  /*
  * testnumfmt2.js - test the number formatter object
  *
- * Copyright © 2019-2023, JEDLSoft
+ * Copyright © 2019-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -158,9 +158,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"bs-Latn-BA", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "bs-Latn-BA", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{n} {s}");
@@ -177,9 +177,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"bs-Latn-ME", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "bs-Latn-ME", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{n} {s}");
@@ -853,9 +853,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"es-AR", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-AR", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s} {n}");
@@ -873,9 +873,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"es-BO", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-BO", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -893,9 +893,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"es-CL", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-CL", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -913,9 +913,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"es-CO", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-CO", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s} {n}");
@@ -933,9 +933,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"es-DO", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-DO", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -953,9 +953,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"es-EC", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-EC", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -993,9 +993,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"es-GT", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-GT", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -1013,9 +1013,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"es-HN", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-HN", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -1053,9 +1053,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"es-NI", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-NI", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -1073,9 +1073,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"es-PA", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-PA", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -1093,9 +1093,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"es-PE", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-PE", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s} {n}");
@@ -1113,9 +1113,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"es-PR", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-PR", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -1133,9 +1133,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"es-PY", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-PY", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s} {n}");
@@ -1153,9 +1153,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"es-SV", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-SV", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -1173,9 +1173,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"es-US", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-US", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -1192,9 +1192,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"es-UY", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-UY", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s} {n}");
@@ -1212,9 +1212,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123.456.789,45");
 
         var pctfmt = new NumFmt({locale:"es-VE", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-VE", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -1850,9 +1850,9 @@ module.exports.testnumfmt2 = {
         test.equal(pctfmt.format(34), "34 %");
 
         var curfmt = new NumFmt({locale: "nb-NO", type: "currency", useNative:false, currency:li.getCurrency()});
-        test.equal(li.getCurrencyFormats().common, "{s} {n}");
-        test.equal(li.getCurrencyFormats().commonNegative, "{s} -{n}");
-        test.equal(curfmt.format(57.05), "kr 57,05"); //NOK
+        test.equal(li.getCurrencyFormats().common, "{n} {s}");
+        test.equal(li.getCurrencyFormats().commonNegative, "-{n} {s}");
+        test.equal(curfmt.format(57.05), "57,05 kr"); //NOK
         test.done();
     },
     testNumFmt_nl_BE: function(test) {
@@ -2061,7 +2061,7 @@ module.exports.testnumfmt2 = {
         var curfmt = new NumFmt({locale: "ru-KG", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{n} {s}");
         test.equal(li.getCurrencyFormats().commonNegative, "-{n} {s}");
-        test.equal(curfmt.format(57.05), "57,05 лв"); //KGS
+        test.equal(curfmt.format(57.05), '57,05 ⃀'); //KGS
         test.done();
     },
     testNumFmt_ru_KZ: function(test) {
@@ -2733,9 +2733,9 @@ module.exports.testnumfmt2 = {
         test.expect(9);
         var li = new LocaleInfo("km-KH");
         var fmt = new NumFmt({locale:"km-KH", type:"standard", useNative:false});
-        test.equal(li.getDecimalSeparator(), ",");
-        test.equal(li.getGroupingSeparator(), ".");
-        test.equal(fmt.format(123456789.45), "123.456.789,45");
+        test.equal(li.getDecimalSeparator(), ".");
+        test.equal(li.getGroupingSeparator(), ",");
+        test.equal(fmt.format(123456789.45), "123,456,789.45");
 
         var pctfmt = new NumFmt({locale:"km-KH", type:"percentage", useNative:false});
         test.equal(li.getPercentageFormat(), "{n}%");
@@ -2745,7 +2745,7 @@ module.exports.testnumfmt2 = {
         var curfmt = new NumFmt({locale: "km-KH", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{n}{s}");
         test.equal(li.getCurrencyFormats().commonNegative, "-{n}{s}");
-        test.equal(curfmt.format(57.05), "57,05៛"); //KHR
+        test.equal(curfmt.format(57.05), "57.05៛"); //KHR
         test.done();
     },
     testNumFmt_si_LK: function(test) {
@@ -3232,9 +3232,9 @@ module.exports.testnumfmt2 = {
         test.equal(fmt.format(123456789.45), "123 456 789,45");
 
         var pctfmt = new NumFmt({locale:"es-CR", type:"percentage", useNative:false});
-        test.equal(li.getPercentageFormat(), "{n} %");
-        test.equal(li.getNegativePercentageFormat(), "-{n} %");
-        test.equal(pctfmt.format(34), "34 %");
+        test.equal(li.getPercentageFormat(), "{n}%");
+        test.equal(li.getNegativePercentageFormat(), "-{n}%");
+        test.equal(pctfmt.format(34), "34%");
 
         var curfmt = new NumFmt({locale: "es-CR", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{s}{n}");
@@ -3827,7 +3827,7 @@ module.exports.testnumfmt2 = {
         var curfmt = new NumFmt({locale: "ky-KG", type: "currency", useNative:false, currency:li.getCurrency()});
         test.equal(li.getCurrencyFormats().common, "{n} {s}");
         test.equal(li.getCurrencyFormats().commonNegative, "-{n} {s}");
-        test.equal(curfmt.format(57.05), "57,05 лв"); //KGS
+        test.equal(curfmt.format(57.05), '57,05 ⃀'); //KGS
         test.done();
     },
     testNumFmt_ca_AD: function(test) {
diff --git a/js/test/root/testcountry.js b/js/test/root/testcountry.js
index 9d7a056638..436311d4f7 100644
--- a/js/test/root/testcountry.js
+++ b/js/test/root/testcountry.js
@@ -1,7 +1,7 @@
 /*
  * testcountry.js - test the country routines
  *
- * Copyright © 2017, 2020-2023 JEDLSoft
+ * Copyright © 2017, 2020-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -373,6 +373,45 @@ module.exports.testcountry = {
         test.equal(locale.toString(), "es-ES");
         test.done();
     },
+    testCountryLocale_es_CO: function(test) {
+        test.expect(4);
+        var ctry = new Country({
+            locale: "es-CO"
+        });
+        test.ok(ctry !== null);
+
+        test.equal(ctry.getName("SA"),"Arabia Saudita");
+        test.equal(ctry.getCode("Arabia Saudita"), "SA");
+        var locale = ctry.getLocale();
+        test.equal(locale.toString(), "es-CO");
+        test.done();
+    },
+    testCountryLocale_es_CO2: function(test) {
+        test.expect(4);
+        var ctry = new Country({
+            locale: "es-CO"
+        });
+        test.ok(ctry !== null);
+
+        test.equal(ctry.getName("RO"),"Rumania");
+        test.equal(ctry.getCode("Rumania"), "RO");
+        var locale = ctry.getLocale();
+        test.equal(locale.toString(), "es-CO");
+        test.done();
+    },
+    testCountryLocale_it_IT: function(test) {
+        test.expect(4);
+        var ctry = new Country({
+            locale: "it-IT"
+        });
+        test.ok(ctry !== null);
+
+        test.equal(ctry.getName("SZ"),"Eswatini");
+        test.equal(ctry.getCode("Eswatini"), "SZ");
+        var locale = ctry.getLocale();
+        test.equal(locale.toString(), "it-IT");
+        test.done();
+    },
     testCountryLocale_zu_ZA: function(test) {
         test.expect(4);
         var ctry = new Country({
diff --git a/js/test/root/testglobal.js b/js/test/root/testglobal.js
index c2515d719d..9ceb7f8750 100644
--- a/js/test/root/testglobal.js
+++ b/js/test/root/testglobal.js
@@ -1,7 +1,7 @@
 /*
  * testglobal.js - test the ilib static routines
  *
- * Copyright © 2012-2015, 2017-2023 JEDLSoft
+ * Copyright © 2012-2015, 2017-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,12 +69,12 @@ module.exports.testglobal = {
             return;
         }
         test.expect(1);
-        test.equal(ilib.getVersion().substring(0,5), "14.19");
+        test.equal(ilib.getVersion().substring(0,5), "14.20");
         test.done();
     },
     testGetCldrVersion: function(test) {
         test.expect(1);
-        test.equal(ilib.getCLDRVersion().substring(0,4), "43.1");
+        test.equal(ilib.getCLDRVersion().substring(0,4), "44.1");
         test.done();
     },
     testGetTimeZoneDefault: function(test) {
diff --git a/js/test/root/testlocaleinfo.js b/js/test/root/testlocaleinfo.js
index 39c37e7807..e0b5657b61 100644
--- a/js/test/root/testlocaleinfo.js
+++ b/js/test/root/testlocaleinfo.js
@@ -1,7 +1,7 @@
 /*
  * testlocaleinfo.js - test the locale info object
  *
- * Copyright © 2012-2017, 2020-2023 JEDLSoft
+ * Copyright © 2012-2017, 2020-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1011,7 +1011,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("es-CO");
         test.ok(info !== null);
 
-        test.equal(info.getPercentageFormat(), "{n} %");
+        test.equal(info.getPercentageFormat(), "{n}%");
         test.done();
     },
     testLocaleInfoGetCurrencyFormat_es_CO: function(test) {
@@ -1035,7 +1035,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("es-CO");
         test.ok(info !== null);
 
-        test.equal(info.getNegativePercentageFormat(), "-{n} %");
+        test.equal(info.getNegativePercentageFormat(), "-{n}%");
         test.done();
     },
     testLocaleInfoGetNegativeCurrencyFormat_es_CO: function(test) {
@@ -3095,9 +3095,8 @@ module.exports.testlocaleinfo = {
         test.expect(2);
         var info = new LocaleInfo("bs-BS");
         test.ok(info !== null);
-        test.equal(info.getPercentageFormat(), "{n} %");
+        test.equal(info.getPercentageFormat(), "{n}%");
         test.done();
-
     },
     testLocaleInfoGetNegativeNumberFormat_bs_BS: function(test) {
         test.expect(2);
@@ -3112,7 +3111,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("bs-BS");
         test.ok(info !== null);
 
-        test.equal(info.getNegativePercentageFormat(), "-{n} %");
+        test.equal(info.getNegativePercentageFormat(), "-{n}%");
         test.done();
     },
     testLocaleInfoGetNegativeCurrencyFormat_bs_BS: function(test) {
@@ -3169,7 +3168,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("bs-ME");
         test.ok(info !== null);
 
-        test.equal(info.getPercentageFormat(), "{n} %");
+        test.equal(info.getPercentageFormat(), "{n}%");
         test.done();
     },
     testLocaleInfoGetCurrencyFormat_bs_ME: function(test) {
@@ -3193,7 +3192,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("bs-ME");
         test.ok(info !== null);
 
-        test.equal(info.getNegativePercentageFormat(), "-{n} %");
+        test.equal(info.getNegativePercentageFormat(), "-{n}%");
         test.done();
     },
     testLocaleInfoGetNegativeCurrencyFormat_bs_ME: function(test) {
@@ -6778,7 +6777,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("no-BV");
         test.ok(info !== null);
 
-        test.equal(info.getCurrencyFormats().common, "{s} {n}");
+        test.equal(info.getCurrencyFormats().common, "{n} {s}");
         test.done();
     },
     testLocaleInfoGetNegativeNumberFormat_no_BV: function(test) {
@@ -6802,7 +6801,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("no-BV");
         test.ok(info !== null);
 
-        test.equal(info.getCurrencyFormats().commonNegative, '{s} -{n}');
+        test.equal(info.getCurrencyFormats().commonNegative, '-{n} {s}');
         test.done();
     },
     testLocaleInfoGetPrimaryGroupingDigits_no_BV: function(test) {
@@ -6858,7 +6857,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("no-SJ");
         test.ok(info !== null);
 
-        test.equal(info.getCurrencyFormats().common, "{s} {n}");
+        test.equal(info.getCurrencyFormats().common, "{n} {s}");
         test.done();
     },
     testLocaleInfoGetNegativeNumberFormat_no_SJ: function(test) {
@@ -6882,7 +6881,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("no-SJ");
         test.ok(info !== null);
 
-        test.equal(info.getCurrencyFormats().commonNegative, '{s} -{n}');
+        test.equal(info.getCurrencyFormats().commonNegative, '-{n} {s}');
         test.done();
     },
     testLocaleInfoGetPrimaryGroupingDigits_no_SJ: function(test) {
@@ -10666,7 +10665,7 @@ module.exports.testlocaleinfo = {
         test.expect(2);
         var info = new LocaleInfo("km-KH");
         test.ok(info !== null);
-        test.equal(info.getDecimalSeparator(), ",");
+        test.equal(info.getDecimalSeparator(), ".");
         test.done();
     },
     testLocaleInfoGetGroupingSeparatorfor_km_KH: function(test) {
@@ -10674,7 +10673,7 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("km-KH");
         test.ok(info !== null);
 
-        test.equal(info.getGroupingSeparator(), ".");
+        test.equal(info.getGroupingSeparator(), ",");
         test.done();
     },
     testLocaleInfoGetPercentageFormat_km_KH: function(test) {
@@ -11249,6 +11248,20 @@ module.exports.testlocaleinfo = {
         test.equal(li.getLanguageName(), "Oji-Cree");
         test.done();
     },
+    testLocaleInfoGetLanguageName8: function(test) {
+        test.expect(2);
+        var li = new LocaleInfo("mic");
+        test.ok(typeof(li) !== "undefined");
+        test.equal(li.getLanguageName(), "Mi'kmaw");
+        test.done();
+    },
+    testLocaleInfoGetLanguageName9: function(test) {
+        test.expect(2);
+        var li = new LocaleInfo("kxv");
+        test.ok(typeof(li) !== "undefined");
+        test.equal(li.getLanguageName(), "Kuvi");
+        test.done();
+    },
     testLocaleInfoGetRegionName1: function(test) {
         test.expect(2);
         var li = new LocaleInfo("he-IL");
@@ -11744,8 +11757,8 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("es-ES");
         test.ok(info !== null);
 
-        test.equal(info.getDelimiterQuotationStart(), "«");
-        test.equal(info.getDelimiterQuotationEnd(), "»");
+        test.equal(info.getDelimiterQuotationStart(), "“");
+        test.equal(info.getDelimiterQuotationEnd(), "”");
         test.done();
     },
     testLocaleInfoQuotation_zh_CN: function(test) {
@@ -11998,8 +12011,8 @@ module.exports.testlocaleinfo = {
         var info = new LocaleInfo("tg-TJ");
         test.ok(info !== null);
 
-        test.equal(info.getDelimiterQuotationStart(), "“");
-        test.equal(info.getDelimiterQuotationEnd(), "”");
+        test.equal(info.getDelimiterQuotationStart(), "»");
+        test.equal(info.getDelimiterQuotationEnd(), "«");
         test.equal(info.getPaperSize(), "A4");
         test.done();
     },
diff --git a/js/test/root/testlocalematch.js b/js/test/root/testlocalematch.js
index 69ac319b61..26dbef13fa 100644
--- a/js/test/root/testlocalematch.js
+++ b/js/test/root/testlocalematch.js
@@ -1,7 +1,7 @@
 /*
  * testlocalematch.js - test the locale matcher object
  *
- * Copyright © 2012-2015,2017,2019-2023 JEDLSoft
+ * Copyright © 2012-2015, 2017, 2019-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,17 +92,6 @@ module.exports.testlocalematch = {
         test.equal(locale.getSpec(), "sd-Arab-PK");
         test.done();
     },
-    testLocaleMatcherGetLikelyLocaleByLanguage6: function(test) {
-        test.expect(3);
-        var lm = new LocaleMatcher({
-            locale: "adp"
-        });
-        test.ok(typeof(lm) !== "undefined");
-        var locale = lm.getLikelyLocale();
-        test.ok(typeof(locale) !== "undefined");
-        test.equal(locale.getSpec(), "adp-Tibt-BT");
-        test.done();
-    },
     testLocaleMatcherGetLikelyLocaleByLanguage7: function(test) {
         test.expect(3);
         var lm = new LocaleMatcher({
@@ -125,28 +114,6 @@ module.exports.testlocalematch = {
         test.equal(locale.getSpec(), "tk-Latn-TM");
         test.done();
     },
-    testLocaleMatcherGetLikelyLocaleByLanguage_snb: function(test) {
-        test.expect(3);
-        var lm = new LocaleMatcher({
-            locale: "snb"
-        });
-        test.ok(typeof(lm) !== "undefined");
-        var locale = lm.getLikelyLocale();
-        test.ok(typeof(locale) !== "undefined");
-        test.equal(locale.getSpec(), "snb-Latn-MY");
-        test.done();
-    },
-    testLocaleMatcherGetLikelyLocaleByLanguage_smd: function(test) {
-        test.expect(3);
-        var lm = new LocaleMatcher({
-            locale: "smd"
-        });
-        test.ok(typeof(lm) !== "undefined");
-        var locale = lm.getLikelyLocale();
-        test.ok(typeof(locale) !== "undefined");
-        test.equal(locale.getSpec(), "smd-Latn-AO");
-        test.done();
-    },
     testLocaleMatcherGetLikelyLocaleByLanguage8: function(test) {
         test.expect(3);
         var lm = new LocaleMatcher({
@@ -1103,7 +1070,7 @@ module.exports.testlocalematch = {
         test.ok(typeof(lm) !== "undefined");
         var locale = lm.getLikelyLocale();
         test.ok(typeof(locale) !== "undefined");
-        test.equal(locale.getSpec(), "hr-Latn-ME");
+        test.equal(locale.getSpec(), "sr-Latn-ME");
         test.done();
     },
     testLocaleMatcherGetLikelyLocaleByLocaleCode60: function(test) {
@@ -1271,6 +1238,17 @@ module.exports.testlocalematch = {
         test.equal(locale.getSpec(), "ky-Cyrl-KG");
         test.done();
     },
+    testLocaleMatcherGetLikelyLocaleByLocaleCode_AQ: function(test) {
+        test.expect(3);
+        var lm = new LocaleMatcher({
+            locale: "AQ"
+        });
+        test.ok(typeof(lm) !== "undefined");
+        var locale = lm.getLikelyLocale();
+        test.ok(typeof(locale) !== "undefined");
+        test.equal(locale.getSpec(), "en-Latn-AQ");
+        test.done();
+    },
     testLocaleMatcherGetLikelyLocaleByLocaleCode_ca: function(test) {
         test.expect(3);
         var lm = new LocaleMatcher({
@@ -1557,6 +1535,28 @@ module.exports.testlocalematch = {
         test.equal(locale.getSpec(), "wo-Latn-SN");
         test.done();
     },
+    testLocaleMatcherGetLikelyLocaleByLocaleCode_tnh: function(test) {
+        test.expect(3);
+        var lm = new LocaleMatcher({
+            locale: "tnh"
+        });
+        test.ok(typeof(lm) !== "undefined");
+        var locale = lm.getLikelyLocale();
+        test.ok(typeof(locale) !== "undefined");
+        test.equal(locale.getSpec(), "tnh-Latn-PG");
+        test.done();
+    },
+    testLocaleMatcherGetLikelyLocaleByLocaleCode_wan: function(test) {
+        test.expect(3);
+        var lm = new LocaleMatcher({
+            locale: "wan"
+        });
+        test.ok(typeof(lm) !== "undefined");
+        var locale = lm.getLikelyLocale();
+        test.ok(typeof(locale) !== "undefined");
+        test.equal(locale.getSpec(), "wan-Latn-CI");
+        test.done();
+    },
     testLocaleMatcherGetLikelyLocaleByLocaleCode_wo_SN: function(test) {
         test.expect(3);
         var lm = new LocaleMatcher({
diff --git a/js/test/root/testscriptinfo.js b/js/test/root/testscriptinfo.js
index 88fe985fb3..4487a0e26f 100644
--- a/js/test/root/testscriptinfo.js
+++ b/js/test/root/testscriptinfo.js
@@ -1,7 +1,7 @@
 /*
  * testscriptinfo.js - test the script info object
  *
- * Copyright © 2013-2017, 2019-2022 JEDLSoft
+ * Copyright © 2013-2017, 2019-2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -171,8 +171,7 @@ module.exports.testscriptinfo = {
         var scripts = ScriptInfo.getAllScripts();
         test.ok(scripts !== null);
 
-        test.equal(scripts.length, 213);
-
+        test.equal(scripts.length, 223);
         test.equal(scripts[0], "Adlm");
         test.equal(scripts[1], "Afak");
         test.equal(scripts[2], "Aghb");
@@ -222,13 +221,40 @@ module.exports.testscriptinfo = {
         test.ok(!si.getCasing());
         test.done();
     },
+    testScriptGetDefaultLongCode_Gara: function(test) {
+        test.expect(8);
+        var si = new ScriptInfo("Gara");
+        test.ok(si !== null);
+
+        test.equal(si.getCode(), "Gara");
+        test.equal(si.getCodeNumber(), 164);
+        test.equal(si.getName(), "Garay");
+        test.equal(si.getLongCode(), "Garay");
+        test.equal(si.getScriptDirection(), "ltr");
+        test.ok(!si.getNeedsIME());
+        test.ok(!si.getCasing());
+        test.done();
+    },
+    testScriptGetDefaultLongCode_Tols: function(test) {
+        test.expect(8);
+        var si = new ScriptInfo("Tols");
+        test.ok(si !== null);
+
+        test.equal(si.getCode(), "Tols");
+        test.equal(si.getCodeNumber(), 299);
+        test.equal(si.getName(), "Tolong Siki");
+        test.equal(si.getLongCode(), "Tolong_Siki");
+        test.equal(si.getScriptDirection(), "ltr");
+        test.ok(!si.getNeedsIME());
+        test.ok(!si.getCasing());
+        test.done();
+    },
     testScriptInfo_ar_EG: function(test) {
         test.expect(4);
         var li = new LocaleInfo("ar-EG");
         var scinfo = new ScriptInfo(li.getScript());
         test.ok(li !== null);
         test.ok(scinfo !== null);
-
         test.equal(li.getScript(), "Arab");
         test.equal(scinfo.getScriptDirection(), "rtl");
         test.done();
diff --git a/js/test/root/testscriptinfoasync.js b/js/test/root/testscriptinfoasync.js
index 7a0664ed98..ea1147828e 100644
--- a/js/test/root/testscriptinfoasync.js
+++ b/js/test/root/testscriptinfoasync.js
@@ -1,7 +1,7 @@
 /*
  * testscriptinfoasync.js - test the script info object
  *
- * Copyright © 2018-2022, JEDLSoft
+ * Copyright © 2018-2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,8 +110,7 @@ module.exports.testscriptinfoasync = {
         ScriptInfo.getAllScripts(false, undefined, function(scripts) {
             test.ok(scripts !== null);
 
-            test.equal(scripts.length, 213);
-
+            test.equal(scripts.length, 223);
             test.equal(scripts[0], "Adlm");
             test.equal(scripts[1], "Afak");
             test.equal(scripts[2], "Aghb");
@@ -122,11 +121,9 @@ module.exports.testscriptinfoasync = {
             ScriptInfo.getAllScripts(false, undefined, function(scripts) {
                 test.ok(scripts !== null);
 
-                test.equal(scripts.length, 213);
-
+                test.equal(scripts.length, 223);
                 test.equal(scripts[0], "Adlm");
                 test.equal(scripts[scripts.length-1], "Zzzz");
-
                 test.done();
             });
         });
diff --git a/js/test/strings-ext/testlistfmt_am_ET.js b/js/test/strings-ext/testlistfmt_am_ET.js
index 27807df8fe..69d2ee6737 100644
--- a/js/test/strings-ext/testlistfmt_am_ET.js
+++ b/js/test/strings-ext/testlistfmt_am_ET.js
@@ -1,7 +1,7 @@
 /*
  * testlistfmt_am_ET.js - test the list formatter object
  *
- * Copyright © 2017, 2020 JEDLSoft
+ * Copyright © 2017, 2020, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ module.exports.testlistfmt_am_ET = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት"]), "አንድ፣ ሁለት, እና ሶስት");
+        test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት"]), 'አንድ፣ ሁለት፣ እና ሶስት');
         test.done();
     },
     testListFmtamETNumberFormatFour: function(test) {
@@ -67,7 +67,7 @@ module.exports.testlistfmt_am_ET = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት", "አራት"]), "አንድ፣ ሁለት፣ ሶስት, እና አራት");
+        test.equal(fmt.format(["አንድ", "ሁለት", "ሶስት", "አራት"]), 'አንድ፣ ሁለት፣ ሶስት፣ እና አራት');
         test.done();
     },
     testListFmtUnitStyleamETNumberFormatOne: function(test) {
diff --git a/js/test/strings-ext/testlistfmt_en.js b/js/test/strings-ext/testlistfmt_en.js
index 4c53687d4a..84f64d0715 100644
--- a/js/test/strings-ext/testlistfmt_en.js
+++ b/js/test/strings-ext/testlistfmt_en.js
@@ -1,7 +1,7 @@
 /*
  * testlistfmt_en.js - test the list formatter object
  *
- * Copyright © 2017, 2020, 2022 JEDLSoft
+ * Copyright © 2017, 2020, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -2050,5 +2050,56 @@ module.exports.testlistfmt_en = {
         test.ok(fmt !== null);
         test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four, & five");
         test.done();
+    },
+    // en-ID
+    testListFmtenIDNumberFormatOne: function(test) {
+        var fmt = new ListFmt({
+            locale: "en-ID"
+        });
+
+        test.expect(2);
+        test.ok(fmt !== null);
+        test.equal(fmt.format(["one"]), "one");
+        test.done();
+    },
+    testListFmtenIDNumberFormatTwo: function(test) {
+        var fmt = new ListFmt({
+            locale: "en-ID"
+        });
+
+        test.expect(2);
+        test.ok(fmt !== null);
+        test.equal(fmt.format(["one", "two"]), "one and two");
+        test.done();
+    },
+    testListFmtenIDNumberFormatThree: function(test) {
+        var fmt = new ListFmt({
+            locale: "en-ID"
+        });
+
+        test.expect(2);
+        test.ok(fmt !== null);
+        test.equal(fmt.format(["one", "two", "three"]), "one, two and three");
+        test.done();
+    },
+    testListFmtenIDNumberFormatFour: function(test) {
+        var fmt = new ListFmt({
+            locale: "en-ID"
+        });
+
+        test.expect(2);
+        test.ok(fmt !== null);
+        test.equal(fmt.format(["one", "two", "three", "four"]), "one, two, three and four");
+        test.done();
+    },
+    testListFmtenIDNumberFormatFive: function(test) {
+        var fmt = new ListFmt({
+            locale: "en-ID"
+        });
+
+        test.expect(2);
+        test.ok(fmt !== null);
+        test.equal(fmt.format(["one", "two", "three", "four", "five"]), "one, two, three, four and five");
+        test.done();
     }
 };
diff --git a/js/test/strings-ext/testlistfmt_ml_IN.js b/js/test/strings-ext/testlistfmt_ml_IN.js
index 2c4fcfd2e2..c9c1523d39 100644
--- a/js/test/strings-ext/testlistfmt_ml_IN.js
+++ b/js/test/strings-ext/testlistfmt_ml_IN.js
@@ -1,7 +1,7 @@
 /*
  * testlistfmt_ml_IN.js - test the list formatter object
  *
- * Copyright © 2017, 2020-2021 JEDLSoft
+ * Copyright © 2017, 2020-2021, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -162,6 +162,54 @@ module.exports.testlistfmt_ml_IN = {
         test.equal(fmt.format(["ഒന്ന്", "രണ്ട്", "മൂന്ന്", "നാല്"]), "ഒന്ന്, രണ്ട്, മൂന്ന്, നാല്");
         test.done();
     },
+    testListFmtUnitStylemlINNumberFormatOneLong: function(test) {
+        var fmt = new ListFmt({
+            locale: "ml-IN",
+            style: "unit",
+            length: "full"
+        });
+
+        test.expect(2);
+        test.ok(fmt !== null);
+        test.equal(fmt.format(["ഒന്ന്"]), "ഒന്ന്");
+        test.done();
+    },
+    testListFmtUnitStylemlINNumberFormatTwoLong: function(test) {
+        var fmt = new ListFmt({
+            locale: "ml-IN",
+            style: "unit",
+            length: "full"
+        });
+
+        test.expect(2);
+        test.ok(fmt !== null);
+        test.equal(fmt.format(["ഒന്ന്", "രണ്ട്"]), 'ഒന്ന്, രണ്ട്');
+        test.done();
+    },
+    testListFmtUnitStylemlINNumberFormatThreeLong: function(test) {
+        var fmt = new ListFmt({
+            locale: "ml-IN",
+            style: "unit",
+            length: "full"
+        });
+
+        test.expect(2);
+        test.ok(fmt !== null);
+        test.equal(fmt.format(["ഒന്ന്", "രണ്ട്", "മൂന്ന്"]), "ഒന്ന്, രണ്ട്, മൂന്ന്");
+        test.done();
+    },
+    testListFmtUnitStylemlINNumberFormatFourLong: function(test) {
+        var fmt = new ListFmt({
+            locale: "ml-IN",
+            style: "unit",
+            length: "full"
+        });
+
+        test.expect(2);
+        test.ok(fmt !== null);
+        test.equal(fmt.format(["ഒന്ന്", "രണ്ട്", "മൂന്ന്", "നാല്"]), "ഒന്ന്, രണ്ട്, മൂന്ന്, നാല്");
+        test.done();
+    },
     testListFmtORStyle_ml_IN_One: function(test) {
         var fmt = new ListFmt({
             locale: "ml-IN",
diff --git a/js/test/strings-ext/testlistfmt_my_MM.js b/js/test/strings-ext/testlistfmt_my_MM.js
index 9280b85bfd..c2a23a7516 100644
--- a/js/test/strings-ext/testlistfmt_my_MM.js
+++ b/js/test/strings-ext/testlistfmt_my_MM.js
@@ -1,7 +1,7 @@
 /*
  * testlistfmt_my_MM.js - test the list formatter object
  *
- * Copyright © 2020-2021, JEDLSoft
+ * Copyright © 2020-2021, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@ module.exports.testlistfmt_my_MM = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["တစ္", "ႎႀစ္", "သံုး"]), 'တစ္- ႎႀစ္နှင့် သံုး');
+        test.equal(fmt.format(["တစ္", "ႎႀစ္", "သံုး"]), 'တစ္ - ႎႀစ္နှင့် သံုး');
         test.done();
     },
     testListFmtUnitStyleNumberFormatFourShort_my_MM: function(test) {
@@ -121,7 +121,7 @@ module.exports.testlistfmt_my_MM = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["တစ္", "ႎႀစ္", "သံုး", "ေလး"]), 'တစ္- ႎႀစ္- သံုးနှင့် ေလး');
+        test.equal(fmt.format(["တစ္", "ႎႀစ္", "သံုး", "ေလး"]), 'တစ္ - ႎႀစ္ - သံုးနှင့် ေလး');
         test.done();
     },
     testListFmtUnitStyleNumberFormatFiveShort_my_MM: function(test) {
@@ -132,7 +132,7 @@ module.exports.testlistfmt_my_MM = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["တစ္", "ႎႀစ္", "သံုး", "ေလး", "ငၝး"]), 'တစ္- ႎႀစ္- သံုး- ေလးနှင့် ငၝး');
+        test.equal(fmt.format(["တစ္", "ႎႀစ္", "သံုး", "ေလး", "ငၝး"]), 'တစ္ - ႎႀစ္ - သံုး - ေလးနှင့် ငၝး');
         test.done();
     },
     testListFmtUnitStyleNumberFormatOneFull_my_MM: function(test) {
@@ -156,7 +156,7 @@ module.exports.testlistfmt_my_MM = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["တစ္", "ႎႀစ္"]), 'တစ္နှင့်ႎႀစ္');
+        test.equal(fmt.format(["တစ္", "ႎႀစ္"]), 'တစ္နှင့် ႎႀစ္');
         test.done();
     },
     testListFmtUnitStyleNumberFormatThreeFull_my_MM: function(test) {
diff --git a/js/test/strings-ext/testlistfmt_nl.js b/js/test/strings-ext/testlistfmt_nl.js
index 519bf7f7fb..9fcd89d1aa 100644
--- a/js/test/strings-ext/testlistfmt_nl.js
+++ b/js/test/strings-ext/testlistfmt_nl.js
@@ -1,7 +1,7 @@
 /*
  * testlistfmt_nl.js - test the list formatter object
  *
- * Copyright © 2017, JEDLSoft
+ * Copyright © 2017, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ module.exports.testlistfmt_nl = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["een", "twee"]), "een en twee");
+        test.equal(fmt.format(["een", "twee"]), 'een & twee');
         test.done();
     },
     testListFmtnlBENumberFormatThree: function(test) {
@@ -58,7 +58,7 @@ module.exports.testlistfmt_nl = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["een", "twee", "drie"]), "een, twee en drie");
+        test.equal(fmt.format(["een", "twee", "drie"]), 'een, twee & drie');
         test.done();
     },
     testListFmtnlBENumberFormatFour: function(test) {
@@ -68,7 +68,7 @@ module.exports.testlistfmt_nl = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["een", "twee", "drie", "vier"]), "een, twee, drie en vier");
+        test.equal(fmt.format(["een", "twee", "drie", "vier"]), 'een, twee, drie & vier');
         test.done();
     },
     testListFmtUnitStylenlBENumberFormatOne: function(test) {
@@ -181,7 +181,7 @@ module.exports.testlistfmt_nl = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["een", "twee"]), "een en twee");
+        test.equal(fmt.format(["een", "twee"]), 'een & twee');
         test.done();
     },
     testListFmtnlNLNumberFormatThree: function(test) {
@@ -191,7 +191,7 @@ module.exports.testlistfmt_nl = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["een", "twee", "drie"]), "een, twee en drie");
+        test.equal(fmt.format(["een", "twee", "drie"]), 'een, twee & drie');
         test.done();
     },
     testListFmtnlNLNumberFormatFour: function(test) {
@@ -201,7 +201,7 @@ module.exports.testlistfmt_nl = {
 
         test.expect(2);
         test.ok(fmt !== null);
-        test.equal(fmt.format(["een", "twee", "drie", "vier"]), "een, twee, drie en vier");
+        test.equal(fmt.format(["een", "twee", "drie", "vier"]), 'een, twee, drie & vier');
         test.done();
     },
     testListFmtUnitStylenlNLNumberFormatOne: function(test) {
@@ -296,4 +296,4 @@ module.exports.testlistfmt_nl = {
         test.equal(fmt.format(["een", "twee", "drie", "vier"]), "een, twee, drie en vier");
         test.done();
     }
-};
+};
\ No newline at end of file
diff --git a/js/test/units/testtime.js b/js/test/units/testtime.js
index 3e0df952a9..683fbd709f 100644
--- a/js/test/units/testtime.js
+++ b/js/test/units/testtime.js
@@ -177,6 +177,4 @@ module.exports.testtime = {
         test.equalIgnoringOrder(measures, expected);
         test.done();
     }
-
-
-};
+};
\ No newline at end of file
diff --git a/js/test/units/testunitfmt.js b/js/test/units/testunitfmt.js
index 2f8be70847..68fbc33e73 100644
--- a/js/test/units/testunitfmt.js
+++ b/js/test/units/testunitfmt.js
@@ -105,7 +105,7 @@ module.exports.testunitfmt = {
             amount: 3000,
             unit: "meter"
         });
-        var uf = new UnitFmt({autoScale: false, autoConvert:false});
+        var uf = new UnitFmt({autoScale:false, autoConvert:false});
         var str = uf.format(m);
         test.equal(str, "3,000 meters");
         test.done();
@@ -129,7 +129,7 @@ module.exports.testunitfmt = {
             amount: 1048576000
         });
 
-        var uf = new UnitFmt({autoScale: false,autoConvert:false});
+        var uf = new UnitFmt({autoScale:false, autoConvert:false});
         var str = uf.format(m);
         test.equal(str, "1,048,576,000 bits");
         test.done();
@@ -153,7 +153,7 @@ module.exports.testunitfmt = {
             amount: 10000000
         });
 
-        var uf = new UnitFmt({autoScale: false,autoConvert:false});
+        var uf = new UnitFmt({autoScale:false, autoConvert:false});
         var str = uf.format(m);
         test.equal(str, "10,000,000 micrograms");
         test.done();
@@ -192,7 +192,7 @@ module.exports.testunitfmt = {
             amount: 100
         });
 
-        var uf = new UnitFmt({autoScale: false, autoConvert:false});
+        var uf = new UnitFmt({autoScale:false, autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "100 hectares");
         test.done();
@@ -231,7 +231,7 @@ module.exports.testunitfmt = {
             amount: 1233453
         });
 
-        var uf = new UnitFmt({autoScale: false, autoConvert:false});
+        var uf = new UnitFmt({autoScale:false, autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "1,233,453 kilowatt-hours");
         test.done();
@@ -270,7 +270,7 @@ module.exports.testunitfmt = {
             amount: 36
         });
 
-        var uf = new UnitFmt({autoScale: false, autoConvert:false});
+        var uf = new UnitFmt({autoScale:false, autoConvert:false});
         var str = uf.format(m);
         test.equal(str, "36 kilometers per hour");
         test.done();
@@ -310,7 +310,7 @@ module.exports.testunitfmt = {
             amount: 12000
         });
 
-        var uf = new UnitFmt({autoScale: false,autoConvert:false});
+        var uf = new UnitFmt({autoScale:false, autoConvert:false});
         var str = uf.format(m);
         test.equal(str, "12,000 milliseconds");
         test.done();
@@ -334,7 +334,7 @@ module.exports.testunitfmt = {
             amount: 1500
         });
 
-        var uf = new UnitFmt({autoScale: false,autoConvert:false});
+        var uf = new UnitFmt({autoScale:false, autoConvert:false});
         var str = uf.format(m);
         test.equal(str, "1,500 milliliters");
         test.done();
@@ -392,7 +392,6 @@ module.exports.testunitfmt = {
         test.done();
     },
     /*Area*/
-
     testUnitFormatArea1: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -412,7 +411,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "2 квадратных сантиметра");
         test.done();
@@ -424,7 +423,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 квадратных сантиметров");
         test.done();
@@ -436,7 +435,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "1,000제곱센티미터");
         test.done();
@@ -448,10 +447,9 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 centimètres carrés");
-
         test.done();
     },
     testUnitFormatArea5DE: function(test) {
@@ -461,7 +459,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"de-DE",autoConvert:false});
+        var uf = new UnitFmt({locale:"de-DE", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "1.000 Quadratzentimeter");
         test.done();
@@ -485,7 +483,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "2 квадратных сантиметра");
         test.done();
@@ -497,7 +495,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 гектаров");
         test.done();
@@ -509,7 +507,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "1,000제곱야드");
         test.done();
@@ -521,13 +519,11 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 yards carrés");
         test.done();
     },
-
-
     /*DigitalStorage*/
     testUnitFormatDigitalStorage1: function(test) {
         test.expect(1);
@@ -548,7 +544,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "2 килобайта");
         test.done();
@@ -560,7 +556,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000킬로바이트");
         test.done();
@@ -572,7 +568,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 kilooctets");
         test.done();
@@ -584,7 +580,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"de-DE",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"de-DE", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1.000 Kilobyte");
         test.done();
@@ -596,7 +592,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "2 gigabits");
         test.done();
@@ -608,7 +604,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "2 гигабита");
         test.done();
@@ -620,7 +616,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 бит");
         test.done();
@@ -632,7 +628,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000기가비트");
         test.done();
@@ -644,13 +640,11 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 gigabits");;
         test.done();
     },
-
-
     testUnitFormatEnergy1: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -670,7 +664,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "2 джоуля");
         test.done();
@@ -682,7 +676,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:true});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:true});
         var str = uf.format(m1);
         test.equal(str, "1 килоджоуль");
         test.done();
@@ -694,7 +688,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:true});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:true});
         var str = uf.format(m1);
         test.equal(str, "1킬로줄");
         test.done();
@@ -706,7 +700,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 joules");
         test.done();
@@ -718,7 +712,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2 kWh");
         test.done();
@@ -730,7 +724,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "2 киловатт-часа");
         test.done();
@@ -742,7 +736,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 килокалорий");
         test.done();
@@ -754,7 +748,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000기가비트");
         test.done();
@@ -766,13 +760,11 @@ module.exports.testunitfmt = {
             amount: 2000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:true,autoScale:true});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:true, autoScale:true});
         var str = uf.format(m1);
         test.equal(str, "2 kilojoules");;
         test.done();
     },
-
-
     testUnitFormatFuelConsumption1: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -792,7 +784,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "2 мили на амер. галлон");
         test.done();
@@ -804,7 +796,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:true,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "0,235215 л/100 км");
         test.done();
@@ -816,7 +808,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:true});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:true});
         var str = uf.format(m1);
         test.equal(str, "리터당 1,000킬로미터");
         test.done();
@@ -828,7 +820,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 miles par gallon");
         test.done();
@@ -840,7 +832,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"de-DE",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"de-DE", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1.000 Meilen pro Gallone");
         test.done();
@@ -864,7 +856,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "2 дюйма");
         test.done();
@@ -876,7 +868,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:true,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "1 км");
         test.done();
@@ -888,7 +880,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:true});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:true});
         var str = uf.format(m1);
         test.equal(str, "1킬로미터");
         test.done();
@@ -900,7 +892,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 mètres");
         test.done();
@@ -912,7 +904,7 @@ module.exports.testunitfmt = {
             amount: 1234.45
         });
 
-        var uf = new UnitFmt({locale:"de-DE",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"de-DE", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1.234,45 Meter");
         test.done();
@@ -924,7 +916,7 @@ module.exports.testunitfmt = {
             amount: 2000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:true,autoScale:true,length:"short"});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:true, autoScale:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "3,21868 Mm");
         test.done();
@@ -936,7 +928,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "2 мили");
         test.done();
@@ -948,7 +940,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 сантиметров");
         test.done();
@@ -960,7 +952,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000센티미터");
         test.done();
@@ -972,7 +964,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:true,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:true, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 centimètres");
         test.done();
@@ -996,7 +988,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "2 микрограмма");
         test.done();
@@ -1008,7 +1000,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:true,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "1 мг");
         test.done();
@@ -1020,7 +1012,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:true});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:true});
         var str = uf.format(m1);
         test.equal(str, "1밀리그램");
         test.done();
@@ -1032,7 +1024,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 microgrammes");
         test.done();
@@ -1044,7 +1036,7 @@ module.exports.testunitfmt = {
             amount: 2000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2 000 lb");
         test.done();
@@ -1056,7 +1048,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"de-DE",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"de-DE", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1.000 Mikrogramm");
         test.done();
@@ -1068,7 +1060,7 @@ module.exports.testunitfmt = {
             amount: 2000
         });
 
-        var uf = new UnitFmt({locale:"de-DE",autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({locale:"de-DE", autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2.000 lb");
         test.done();
@@ -1080,7 +1072,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "2 стоуна");
         test.done();
@@ -1092,7 +1084,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 тонн");
         test.done();
@@ -1104,7 +1096,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000메트릭 톤");
         test.done();
@@ -1116,13 +1108,11 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:true,autoScale:true});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:true, autoScale:true});
         var str = uf.format(m1);
         test.equal(str, "1 kilogramme");
         test.done();
     },
-
-
     testUnitFormatSpeed1: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -1142,7 +1132,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false});
         var str = uf.format(m1);
         test.equal(str, "2 километра в час");
         test.done();
@@ -1154,7 +1144,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:true,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "277,778 м/с");
         test.done();
@@ -1166,7 +1156,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "초당 1,000피트");
         test.done();
@@ -1178,7 +1168,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 miles par heure");
         test.done();
@@ -1190,7 +1180,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"de-DE",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"de-DE", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1.000 Meilen pro Stunde");
         test.done();
@@ -1202,7 +1192,7 @@ module.exports.testunitfmt = {
             amount: 2000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:true,autoScale:true,length:"short"});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:true, autoScale:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2 km/s");
         test.done();
@@ -1214,7 +1204,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "2 мили в час");
         test.done();
@@ -1226,7 +1216,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "1 000 уз");
         test.done();
@@ -1238,7 +1228,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "시속 1,000마일");
         test.done();
@@ -1250,7 +1240,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:true,autoScale:true,length:"short"});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:true, autoScale:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "447,03924652 m/s");
         test.done();
@@ -1262,7 +1252,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"de-DE",autoConvert:true,autoScale:true,length:"short"});
+        var uf = new UnitFmt({locale:"de-DE", autoConvert:true, autoScale:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "447,03924652 m/s");
         test.done();
@@ -1298,7 +1288,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({autoConvert:false,length:"short"});
+        var uf = new UnitFmt({autoConvert:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2°C");
         test.done();
@@ -1310,7 +1300,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:true,length:"long"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:true, length:"long"});
         var str = uf.format(m1);
         test.equal(str, "1 000 градусов Цельсия");
         test.done();
@@ -1322,7 +1312,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000켈빈");
         test.done();
@@ -1334,7 +1324,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"en-US",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"en-US", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000 kelvins");
         test.done();
@@ -1346,9 +1336,8 @@ module.exports.testunitfmt = {
             amount: 2000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:true,autoScale:true,length:"short",maxFractionDigits: 9});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:true, autoScale:true, length:"short",maxFractionDigits: 9});
         var str = uf.format(m1);
-
         test.equal(str, "1 093,333333333 °C");
         test.done();
     },
@@ -1359,7 +1348,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2 °F");
         test.done();
@@ -1371,7 +1360,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "1 000 K");
         test.done();
@@ -1383,7 +1372,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "화씨 1,000도");
         test.done();
@@ -1395,7 +1384,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:true,autoScale:false, length:"short", maxFractionDigits: 2});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:true, autoScale:false, length:"short", maxFractionDigits: 2});
         var str = uf.format(m1);
         test.equal(str, "537.78°C");
         test.done();
@@ -1407,7 +1396,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:true,autoScale:false, length:"long"});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:true, autoScale:false, length:"long"});
         var str = uf.format(m1);
         test.equal(str, "섭씨 537.7777777777778도");
         test.done();
@@ -1443,7 +1432,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({autoConvert:false,length:"short"});
+        var uf = new UnitFmt({autoConvert:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2 ns");
         test.done();
@@ -1455,7 +1444,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:true,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "1 мкс");
         test.done();
@@ -1467,7 +1456,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000밀리초");
         test.done();
@@ -1479,7 +1468,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 millisecondes");
         test.done();
@@ -1491,7 +1480,7 @@ module.exports.testunitfmt = {
             amount: 2000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:true,autoScale:true,length:"short"});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:true, autoScale:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "3,83308 déc.");
         test.done();
@@ -1503,7 +1492,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2 г.");
         test.done();
@@ -1515,7 +1504,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "1 000 мин");
         test.done();
@@ -1527,7 +1516,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000분");
         test.done();
@@ -1539,7 +1528,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",length:"long",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR",length:"long", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 mois");
         test.done();
@@ -1563,7 +1552,7 @@ module.exports.testunitfmt = {
             amount: 2
         });
 
-        var uf = new UnitFmt({autoConvert:false,length:"short"});
+        var uf = new UnitFmt({autoConvert:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2 tsp");
         test.done();
@@ -1575,7 +1564,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "1 000 унц.");
         test.done();
@@ -1587,7 +1576,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000밀리초");
         test.done();
@@ -1599,7 +1588,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1 000 litres");
         test.done();
@@ -1611,7 +1600,7 @@ module.exports.testunitfmt = {
             amount: 2000
         });
 
-        var uf = new UnitFmt({locale:"fr-FR",autoConvert:true,autoScale:true,length:"short"});
+        var uf = new UnitFmt({locale:"fr-FR", autoConvert:true, autoScale:true, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "2 m³");
         test.done();
@@ -1623,7 +1612,7 @@ module.exports.testunitfmt = {
             amount: 1
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false,length:"long"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false, length:"long"});
         var str = uf.format(m1);
         test.equal(str, "1 амер. галлон");
         test.done();
@@ -1635,7 +1624,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ru-RU",autoConvert:false,autoScale:false,length:"short"});
+        var uf = new UnitFmt({locale:"ru-RU", autoConvert:false, autoScale:false, length:"short"});
         var str = uf.format(m1);
         test.equal(str, "1 000 ам. гал.");
         test.done();
@@ -1647,7 +1636,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale:"ko-KR",autoConvert:false,autoScale:false});
+        var uf = new UnitFmt({locale:"ko-KR", autoConvert:false, autoScale:false});
         var str = uf.format(m1);
         test.equal(str, "1,000세제곱피트");
         test.done();
@@ -1695,7 +1684,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 square centimeters");
         test.done();
@@ -1707,7 +1696,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 cm²");
         test.done();
@@ -1719,7 +1708,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 kilobytes");
         test.done();
@@ -1731,7 +1720,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 kB");
         test.done();
@@ -1743,7 +1732,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 kilobytes per hour");
         test.done();
@@ -1755,7 +1744,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 kB/h");
         test.done();
@@ -1767,7 +1756,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale: "fr-FR",length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({locale: "fr-FR",length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1 000 mégaoctets par seconde");
         test.done();
@@ -1779,7 +1768,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale: "fr-FR",length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({locale: "fr-FR",length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1 000 Mo/s");
         test.done();
@@ -1791,7 +1780,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale: "zh-Hans-CN",length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({locale: "zh-Hans-CN",length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000兆字节/秒");
         test.done();
@@ -1803,7 +1792,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale: "be-BY",length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({locale: "be-BY",length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1 000 мегабайта у секунду");
         test.done();
@@ -1815,7 +1804,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({locale: "be-BY",length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({locale: "be-BY",length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1 000 МБ/с");
         test.done();
@@ -1827,7 +1816,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 kilowatt-hours");
         test.done();
@@ -1839,11 +1828,23 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 kWh");
         test.done();
     },
+    testUnitFormatEnergy13: function(test) {
+        test.expect(1);
+        var m1 = MeasurementFactory({
+            unit: "kilowatt hour",
+            amount: 2
+        });
+
+        var uf = new UnitFmt({locale:"en-ID", autoConvert:true, autoScale:true});
+        var str = uf.format(m1);
+        test.equal(str, "2 kilowatt-hours");;
+        test.done();
+    },
     testUnitFormatFuelConsumption11: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -1851,7 +1852,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 kilometers per liter");
         test.done();
@@ -1863,7 +1864,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 km/L");
         test.done();
@@ -1875,7 +1876,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 decimeters");
         test.done();
@@ -1887,7 +1888,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 dm");
         test.done();
@@ -1899,7 +1900,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 kilometers per second");
         test.done();
@@ -1911,7 +1912,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 km/s");
         test.done();
@@ -1923,7 +1924,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 degrees Fahrenheit");
         test.done();
@@ -1935,7 +1936,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000°F");
         test.done();
@@ -1947,7 +1948,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"long",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"long", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 milliseconds");
         test.done();
@@ -1959,7 +1960,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({length:"short",autoConvert:false,autoScale: false});
+        var uf = new UnitFmt({length:"short", autoConvert:false, autoScale: false});
         var str = uf.format(m1);
         test.equal(str, "1,000 ms");
         test.done();
@@ -2007,10 +2008,10 @@ module.exports.testunitfmt = {
         });
 
         var uf = new UnitFmt({
-            autoConvert:false,
+            autoConvert: false,
             autoScale: false,
-        maxFractionDigits: 2,
-        roundingMode: "up"
+            maxFractionDigits: 2,
+            roundingMode: "up"
         });
         var str = uf.format(m1);
         test.equal(str, "1.75 meters");
@@ -2024,10 +2025,10 @@ module.exports.testunitfmt = {
         });
 
         var uf = new UnitFmt({
-            autoConvert:false,
+            autoConvert: false,
             autoScale: false,
             maxFractionDigits: 2,
-        roundingMode: "down"
+            roundingMode: "down"
         });
         var str = uf.format(m1);
         test.equal(str, "1.74 meters");
@@ -2041,10 +2042,10 @@ module.exports.testunitfmt = {
         });
 
         var uf = new UnitFmt({
-            autoConvert:false,
+            autoConvert: false,
             autoScale: false,
             minFractionDigits: 3,
-        maxFractionDigits: 3
+            maxFractionDigits: 3
         });
         var str = uf.format(m1);
         test.equal(str, "1.745 meters");
@@ -2057,7 +2058,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "bn-IN",useNative:false});
+        var uf = new UnitFmt({autoScale:false, locale: "bn-IN", useNative:false});
         var str = uf.format(m1);
         test.equal(str, "1,000 সেন্টিমিটার");
         test.done();
@@ -2069,7 +2070,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "bn-IN",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "bn-IN", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "১,০০০ সেন্টিমিটার");
         test.done();
@@ -2081,14 +2082,12 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "bn-IN"});
+        var uf = new UnitFmt({autoScale:false, locale: "bn-IN"});
         var str = uf.format(m1);
         test.equal(str, "১,০০০ সেন্টিমিটার");
         test.done();
     },
     /*Zh units*/
-
-
     testUnitFormatzhHansCN: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -2096,7 +2095,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-CN",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-CN", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "一,〇〇〇厘米");
         test.done();
@@ -2108,13 +2107,11 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-HK"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-HK"});
         var str = uf.format(m1);
         test.equal(str, "1,000厘米");
         test.done();
     },
-
-
     testUnitFormatzhHansSG: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -2122,7 +2119,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-SG",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-SG", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "一,〇〇〇厘米");
         test.done();
@@ -2134,7 +2131,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-MO"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-MO"});
         var str = uf.format(m1);
         test.equal(str, "1,000厘米");
         test.done();
@@ -2146,7 +2143,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-HK",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-HK", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "一,〇〇〇 厘米");
         test.done();
@@ -2158,7 +2155,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-MO"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-MO"});
         var str = uf.format(m1);
         test.equal(str, "1,000 厘米");
         test.done();
@@ -2170,7 +2167,7 @@ module.exports.testunitfmt = {
             amount: 1000
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-MY",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-MY", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "一,〇〇〇 公分");
         test.done();
@@ -2207,8 +2204,6 @@ module.exports.testunitfmt = {
         test.done();
     },
     /*Kelvin*/
-
-
     testUnitFormatzhHansCNKelvin: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -2216,7 +2211,7 @@ module.exports.testunitfmt = {
                amount: 285.3
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-CN",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-CN", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "二八五.三开尔文");
         test.done();
@@ -2228,13 +2223,11 @@ module.exports.testunitfmt = {
             amount: 285.3
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-HK"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-HK"});
         var str = uf.format(m1);
         test.equal(str, "285.3开氏度");
         test.done();
     },
-
-
     testUnitFormatzhHansSGKelvin: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -2242,7 +2235,7 @@ module.exports.testunitfmt = {
             amount: 285.3
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-SG",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-SG", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "二八五.三开氏度");
         test.done();
@@ -2254,7 +2247,7 @@ module.exports.testunitfmt = {
             amount: 285.3
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-MO"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-MO"});
         var str = uf.format(m1);
         test.equal(str, "285.3开氏度");
         test.done();
@@ -2266,7 +2259,7 @@ module.exports.testunitfmt = {
             amount: 285.3
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-HK",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-HK", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "二八五.三 開爾文");
         test.done();
@@ -2278,13 +2271,11 @@ module.exports.testunitfmt = {
             amount: 285.3
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-MO"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-MO"});
         var str = uf.format(m1);
         test.equal(str, "285.3 開爾文");
         test.done();
     },
-
-
     testUnitFormatzhHantMYKelvin: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -2292,7 +2283,7 @@ module.exports.testunitfmt = {
             amount: 285.3
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-MY",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-MY", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "二八五.三 克耳文");
         test.done();
@@ -2304,7 +2295,7 @@ module.exports.testunitfmt = {
             amount: 285.3
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-TW"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-TW"});
         var str = uf.format(m1);
         test.equal(str, "285.3 克耳文");
         test.done();
@@ -2327,7 +2318,6 @@ module.exports.testunitfmt = {
         test.done();
     },
     /*hectare*/
-
     testUnitFormatzhHansCNHectare: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -2335,7 +2325,7 @@ module.exports.testunitfmt = {
             amount: 100
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-CN",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-CN", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "一〇〇公顷");
         test.done();
@@ -2347,13 +2337,11 @@ module.exports.testunitfmt = {
             amount: 100
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-HK"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-HK"});
         var str = uf.format(m1);
         test.equal(str, "100公顷");
         test.done();
     },
-
-
     testUnitFormatzhHansSGHectare: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -2361,7 +2349,7 @@ module.exports.testunitfmt = {
             amount: 100
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-SG",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-SG", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "一〇〇公顷");
         test.done();
@@ -2373,7 +2361,7 @@ module.exports.testunitfmt = {
             amount: 100
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hans-MO"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hans-MO"});
         var str = uf.format(m1);
         test.equal(str, "100公顷");
         test.done();
@@ -2385,7 +2373,7 @@ module.exports.testunitfmt = {
             amount: 100
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-HK",useNative:true});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-HK", useNative:true});
         var str = uf.format(m1);
         test.equal(str, "一〇〇 公頃");
         test.done();
@@ -2397,13 +2385,11 @@ module.exports.testunitfmt = {
             amount: 100
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-MO"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-MO"});
         var str = uf.format(m1);
         test.equal(str, "100 公頃");
         test.done();
     },
-
-
     testUnitFormatUsezhHantMOHectare: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -2411,7 +2397,7 @@ module.exports.testunitfmt = {
             amount: 100
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-MY"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-MY"});
         var str = uf.format(m1);
         test.equal(str, "100 公頃");
         test.done();
@@ -2423,7 +2409,7 @@ module.exports.testunitfmt = {
             amount: 100
         });
 
-        var uf = new UnitFmt({autoScale:false,locale: "zh-Hant-TW"});
+        var uf = new UnitFmt({autoScale:false, locale: "zh-Hant-TW"});
         var str = uf.format(m1);
         test.equal(str, "100 公頃");
         test.done();
@@ -2703,7 +2689,6 @@ module.exports.testunitfmt = {
         test.done();
     },
     /** pressure **/
-
     testUnitFormatPressure: function(test) {
         test.expect(1);
         var m1 = MeasurementFactory({
@@ -2723,7 +2708,6 @@ module.exports.testunitfmt = {
         test.done();
     },
     /** time **/
-
     testUnitFmt_Time_am_ET: function(test) {
         test.expect(2);
         var m1 = MeasurementFactory({
@@ -2891,4 +2875,4 @@ module.exports.testunitfmt = {
         test.equal(str, '5 centimetara');
         test.done();
     }
-};
+};
\ No newline at end of file
diff --git a/js/test/units/testunitfmt_usages.js b/js/test/units/testunitfmt_usages.js
index 0100d98da4..a53c0c3036 100644
--- a/js/test/units/testunitfmt_usages.js
+++ b/js/test/units/testunitfmt_usages.js
@@ -1,7 +1,7 @@
 /*
  * testunits_usages.js - test the units formatter object with various usages
  *
- * Copyright © 2018, 2021-2023 JEDLSoft
+ * Copyright © 2018, 2021-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -2419,7 +2419,7 @@ module.exports.testunitfmt_usages = {
             locale: "km-KH"
         });
         var str = uf.format(m1);
-        test.equal(str, "330,2 សង់ទីម៉ែត្រគូប");
+        test.equal(str, '330.2 សង់ទីម៉ែត្រគូប');
         test.done();
     },
     testUnitFormatWithUsageStorageVolume: function(test) {
@@ -2976,7 +2976,7 @@ module.exports.testunitfmt_usages = {
             locale: "be-BY"
         });
         var str = uf.format(m1);
-        test.equal(str, "80,56 кілаватаў");
+        test.equal(str, '80,56 кілавата');
         test.done();
     }
 };
diff --git a/package.json b/package.json
index c802eeaa77..59d66359ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ilib",
-    "version": "14.19.0",
+    "version": "14.20.0",
     "main": "js/index.js",
     "description": "iLib is a cross-engine library of internationalization (i18n) classes written in pure JS",
     "keywords": [
@@ -51,15 +51,15 @@
     },
     "devDependencies": {
         "babel-loader": "^8.2.5",
-        "better-docs": "^2.7.2",
-        "cldr-cal-ethiopic-full": "^43.1.0",
-        "cldr-cal-persian-full": "^43.1.0",
-        "cldr-core": "^43.1.0",
-        "cldr-dates-full": "^43.1.0",
-        "cldr-localenames-full": "^43.1.0",
-        "cldr-misc-full": "^43.1.0",
-        "cldr-numbers-full": "^43.1.0",
-        "cldr-units-full": "^43.1.0",
+        "better-docs": "^2.7.3",
+        "cldr-cal-ethiopic-full": "^44.1.0",
+        "cldr-cal-persian-full": "^44.1.0",
+        "cldr-core": "^44.1.0",
+        "cldr-dates-full": "^44.1.0",
+        "cldr-localenames-full": "^44.1.0",
+        "cldr-misc-full": "^44.1.0",
+        "cldr-numbers-full": "^44.1.0",
+        "cldr-units-full": "^44.1.0",
         "ejs": "^3.1.9",
         "grunt": "^1.6.1",
         "grunt-cli": "^1.4.3",
@@ -79,15 +79,15 @@
         "ilib-scanner": "^1.4.0",
         "ilib-webpack-loader": "^1.3.1",
         "ilib-webpack-plugin": "^1.3.0",
-        "iso-15924": "^3.1.0",
+        "iso-15924": "^3.2.0",
         "jsdoc": "^4.0.2",
-        "json-stable-stringify": "^1.0.2",
+        "json-stable-stringify": "^1.1.1",
         "node-expat": "^2.4.0",
         "nodeunit": "^0.11.0",
         "should": "^13.2.3",
         "tap": "^18.1.5",
         "trireme": "^0.9.3",
-        "ucd-full": "^15.0.0",
+        "ucd-full": "^15.1.0",
         "uglify-js": "^3.17.4",
         "uglifyjs-webpack-plugin": "^2.2.0",
         "webpack": "^4.46.0",
@@ -102,4 +102,4 @@
     "publishConfig": {
         "tag": "experimental"
     }
-}
+}
\ No newline at end of file
diff --git a/tools/cldr/datefmts.js b/tools/cldr/datefmts.js
index 505c8889b8..08aaa4b3e7 100644
--- a/tools/cldr/datefmts.js
+++ b/tools/cldr/datefmts.js
@@ -1,7 +1,7 @@
 /*
  * datefmts.js - auxillary tools used to generate the dateformats.json files
  *
- * Copyright © 2015-2023, JEDLSoft
+ * Copyright © 2015-2024, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -736,7 +736,11 @@ module.exports = {
                         calendar.date.l = {};
                     }
                     if (isAsian) {
-                        calendar.date.l[lenAbbr] = getAvailableFormat(cldrCalendar, "M").replace(/M+/, calendar.date.m[lenAbbr]);
+                        if(language === "ko" && (lenAbbr === 'f' || lenAbbr === "l")) {
+                            calendar.date.l[lenAbbr] = getAvailableFormat(cldrCalendar, "M").replace("월","").replace(/M+/, calendar.date.m[lenAbbr]);
+                        } else {
+                            calendar.date.l[lenAbbr] = getAvailableFormat(cldrCalendar, "M").replace(/M+/, calendar.date.m[lenAbbr]);
+                        }
                     } else {
                         calendar.date.l[lenAbbr] = calendar.date.m[lenAbbr].replace(/M/g, "L");
                     }
@@ -1032,8 +1036,10 @@ module.exports = {
                 } else {
                     dateRangeTemplateOrder = calendar.order + " – " + calendar.order;
                     cFmt0 = calendar.order + " – {time}";
+                    if (language === 'eu') {//ymd case
+                        cFmt0 = cFmt0.replace(" – {time}", " – ({time})");
+                    }
                     opcFmt0  = "{time} – " + calendar.order;
-
                 }
                 var dateTimeOrder = dateRangeTemplateOrder.indexOf("{date}") === 0 ? true: false;
                 var dateOnlyTemplate = "{date} – {date}";
@@ -1225,7 +1231,6 @@ module.exports = {
                                 break;
                             case "ymd":
                                 //console.log("dt,ymd");
-
                                 cFmt0 = replaceFormats(cFmt0, "{date}", calendar.date[dmyiLib][lenAbbr]);
                                 cFmt0 = replaceFormats(cFmt0, startTime);
                                 cFmt0 = replaceFormats(cFmt0,"{time}", "{st}");
@@ -1690,11 +1695,19 @@ module.exports = {
             var part = cldrCalendar.months.format;
             if (isAsianLang(language)) {
                 for (prop in part.wide) {
-                    formats["MMMM" + prop + calendarNameSuffix] = part.wide[prop].substring(0, part.wide[prop].length-1);
-                    formats["N" + prop + calendarNameSuffix] =
-                        formats["NN" + prop + calendarNameSuffix] =
-                            formats["MMM" + prop + calendarNameSuffix] =
-                                part.abbreviated[prop].substring(0, part.abbreviated[prop].length-1);
+                    if (language === 'ko') {
+                        formats["MMMM" + prop + calendarNameSuffix] = part.wide[prop];
+                        formats["N" + prop + calendarNameSuffix] =
+                            formats["NN" + prop + calendarNameSuffix] =
+                                formats["MMM" + prop + calendarNameSuffix] =
+                                    part.abbreviated[prop];
+                    } else {
+                        formats["MMMM" + prop + calendarNameSuffix] = part.wide[prop].substring(0, part.wide[prop].length-1);
+                        formats["N" + prop + calendarNameSuffix] =
+                            formats["NN" + prop + calendarNameSuffix] =
+                                formats["MMM" + prop + calendarNameSuffix] =
+                                    part.abbreviated[prop].substring(0, part.abbreviated[prop].length-1);
+                    }
                 }
             } else {
                 for (prop in part.wide) {
diff --git a/tools/cldr/genlangscripts.js b/tools/cldr/genlangscripts.js
index 4edc1cb02b..116b0b6b0e 100644
--- a/tools/cldr/genlangscripts.js
+++ b/tools/cldr/genlangscripts.js
@@ -1,7 +1,7 @@
 /*
  * genlangscripts.js - ilib tool to generate the json data about ISO 15924 scripts
  *
- * Copyright © 2013-2018, 2020-2022 JEDLSoft
+ * Copyright © 2013-2018, 2020-2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,15 +27,14 @@ var coelesce = common.coelesce;
 
 function usage() {
     console.log("Usage: genlangscripts [-h] [toDir]\n" +
-        "Generate the script.jf files for each language.\n" +
+        "Generate the scripts.jf files for each language.\n" +
         "-h or --help\n" +
         "  this help\n" +
         "toDir\n" +
-    "  directory to output the script.jf json files. Default: current dir.");
+    "  directory to output the scripts.jf files. Default: current dir.");
     process.exit(1);
 }
 
-var languageDataFileName;
 var toDir = ".";
 
 process.argv.forEach(function (val, index, array) {
@@ -46,8 +45,8 @@ process.argv.forEach(function (val, index, array) {
 
 toDir = process.argv[2] || "tmp";
 
-console.log("genlangscripts - generate the localeinfo script.jf files.\n" +
-    "Copyright (c) 2013-2018, 2020-2022 JEDLSoft");
+console.log("genlangscripts - generate the localeinfo scripts.jf files.\n" +
+    "Copyright (c) 2013-2018, 2020-2022, 2024 JEDLSoft");
 
 console.log("output dir: " + toDir);
 
@@ -126,4 +125,4 @@ for (var language in scripts) {
             }
         });
     }
-}
+}
\ No newline at end of file
diff --git a/tools/cldr/genlikelyloc.js b/tools/cldr/genlikelyloc.js
index 4603f70afb..d8beffd77d 100644
--- a/tools/cldr/genlikelyloc.js
+++ b/tools/cldr/genlikelyloc.js
@@ -2,7 +2,7 @@
  * genlikelyloc.js - ilib tool to generate the localematch.json files from
  * the CLDR data files
  *
- * Copyright © 2013-2020, 2022-2023 JEDLSoft
+ * Copyright © 2013-2020, 2022-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ process.argv.forEach(function (val, index, array) {
 localeDirName = process.argv[2] || "tmp";
 
 console.log("genlikelyloc - generate the localematch.json file.\n" +
-        "Copyright (c) 2013-2019, 2022 JEDLSoft");
+        "Copyright (c) 2013-2019, 2022-2024 JEDLSoft");
 
 console.log("locale dir: " + localeDirName);
 
@@ -67,6 +67,35 @@ var localematch = {};
 
 // cldr is missing these
 var hardCodedSubtags = {
+    "002": "en-Latn-NG",
+    "003": "en-Latn-US",
+    "005": "pt-Latn-BR",
+    "009": "en-Latn-AU",
+    "011": "en-Latn-NG",
+    "013": "es-Latn-MX",
+    "014": "sw-Latn-TZ",
+    "015": "ar-Arab-EG",
+    "017": "sw-Latn-CD",
+    "018": "en-Latn-ZA",
+    "019": "en-Latn-US",
+    "021": "en-Latn-US",
+    "029": "es-Latn-CU",
+    "030": "zh-Hans-CN",
+    "034": "hi-Deva-IN",
+    "035": "id-Latn-ID",
+    "039": "it-Latn-IT",
+    "053": "en-Latn-AU",
+    "054": "en-Latn-PG",
+    "057": "en-Latn-GU",
+    "061": "sm-Latn-WS",
+    "142": "zh-Hans-CN",
+    "143": "uz-Latn-UZ",
+    "145": "ar-Arab-SA",
+    "150": "ru-Cyrl-RU",
+    "151": "ru-Cyrl-RU",
+    "154": "en-Latn-GB",
+    "155": "de-Latn-DE",
+    "202": "en-Latn-NG",
     "bn-IN": "bn-Beng-IN",
     "en-KR": "en-Latn-KR",
     "hr-HU": "hr-Latn-HU",
diff --git a/tools/cldr/genunits.js b/tools/cldr/genunits.js
index f23dda60ab..fd21e73dac 100644
--- a/tools/cldr/genunits.js
+++ b/tools/cldr/genunits.js
@@ -1,7 +1,7 @@
 /*
  * genunits.js - ilib tool to generate the json data about unit formats
  *
- * Copyright © 2013, 2018, 2020-2023 JEDLSoft
+ * Copyright © 2013, 2018, 2020-2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -304,7 +304,7 @@ process.argv.forEach(function (val, index, array) {
 localeDirName = process.argv[2] || "tmp";
 
 console.log("genunits - tool to generate the json data about unit formats from the CLDR data.\n" +
-        "Copyright © 2013, 2018, 2020-2023 JEDLSoft");
+        "Copyright © 2013, 2018, 2020-2024 JEDLSoft");
 
 console.log("locale dir: " + localeDirName );
 
@@ -389,6 +389,8 @@ var filter = {
     "10p-18": true,
     "10p-21": true,
     "10p-24": true,
+    "10p-27": true,
+    "10p-30": true,
     "10p1": true,
     "10p2": true,
     "10p3": true,
@@ -399,6 +401,8 @@ var filter = {
     "10p18": true,
     "10p21": true,
     "10p24": true,
+    "10p27": true,
+    "10p30": true,
     "per": true,
     "power2": true,
     "power3": true,