Merge pull request #478 from iLib-js/development

Merge to main to publish v14.21.0

Author: ehoogerbeets

.circleci/config.yml

@@ -22,13 +22,6 @@ jobs:
             sudo apt update
             sudo apt install -y ant
 
-      - run:
-          name: Set up QT
-          command: |
-            #sudo apt-add-repository --yes ppa:beineri/opt-qt551-trusty
-            #sudo apt update
-            sudo apt install -y build-essential libfontconfig1 mesa-common-dev qtbase5-dev qmlscene qtdeclarative5-dev 
-
       - run:
           name: Set up OpenJDK
           command: |
@@ -54,7 +47,6 @@ jobs:
             echo "javac version: " $(javac -version)
             echo "javadoc version: " $(javadoc --version)
             echo "ant version: " $(ant -version)
-            echo "qmake version: " $(qmake --version)
             echo "TZ is $TZ"
             echo "NODE_OPTIONS is $NODE_OPTIONS"
 
@@ -75,10 +67,10 @@ workflows:
       - test:
           docker_image: cimg/node:12.22.12-browsers
       - test:
-          docker_image: cimg/node:14.21.2-browsers
+          docker_image: cimg/node:14.21.3-browsers
       - test:
-          docker_image: cimg/node:16.19.0-browsers
+          docker_image: cimg/node:16.20.2-browsers
       - test:
-          docker_image: cimg/node:18.14.0-browsers
-      - test
-
+          docker_image: cimg/node:18.20.4-browsers
+      - test:
+          docker_image: cimg/node:20.15.1-browsers

build.properties

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=14.20.0
+version=14.21.0

docs/ReleaseNotes.md

@@ -1,6 +1,15 @@
 Release Notes for Version 14
 ============================
 
+Build 030
+-------
+Published as version 14.21.0
+
+New Features:
+* Update to CLDR v46 data
+* Update to Unicode Character Database (UCD) version 16.0.0
+
+
 Build 029
 -------
 Published as version 14.20.0

js/build.xml

@@ -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-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.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,sn-ZW,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-)/"/>
 

js/data/locale/aa/dateformats.json

@@ -38,6 +38,7 @@
                 "s": "dd, E"
             },
             "m": {
+                "f": "MMMM",
                 "l": "MMMM",
                 "m": "MMM",
                 "s": "MM"
@@ -48,10 +49,20 @@
                 "m": "yyyy MMM",
                 "s": "yyyy-MM"
             },
+            "w": {
+                "f": "EEEE",
+                "l": "EEE",
+                "m": "EE",
+                "s": "E"
+            },
             "y": {
+                "f": "yyyy",
+                "l": "yyyy",
+                "m": "yyyy",
                 "s": "yyyy"
             }
         },
+        "order": "{date} {time}",
         "range": {
             "c00": {
                 "f": "{sy} {sm} {sd} {st} – {et}",
@@ -110,11 +121,19 @@
         },
         "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"
+                "ahmz": "h:mm a z",
+                "h": "h",
+                "hm": "h:mm",
+                "hms": "h:mm:ss",
+                "hmsz": "h:mm:ss z",
+                "hmz": "h:mm z",
+                "m": "mm",
+                "ms": "mm:ss",
+                "s": "ss"
             },
             "24": {
                 "ah": "HH",
@@ -126,7 +145,10 @@
                 "hm": "HH:mm",
                 "hms": "HH:mm:ss",
                 "hmsz": "HH:mm:ss z",
-                "hmz": "HH:mm z"
+                "hmz": "HH:mm z",
+                "m": "mm",
+                "ms": "mm:ss",
+                "s": "ss"
             }
         }
     }

js/data/locale/aa/sysres.json

@@ -65,20 +65,36 @@
     "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": "S",
+    "E1": "M",
+    "E2": "T",
+    "E3": "W",
+    "E4": "T",
+    "E5": "F",
+    "E6": "S",
     "EE0": "Sun",
     "EE1": "Mon",
     "EE2": "Tue",
     "EE3": "Wed",
     "EE4": "Thu",
     "EE5": "Fri",
     "EE6": "Sat",
+    "EEE0": "Sun",
+    "EEE1": "Mon",
+    "EEE2": "Tue",
+    "EEE3": "Wed",
+    "EEE4": "Thu",
+    "EEE5": "Fri",
+    "EEE6": "Sat",
     "EEEE0": "Sun",
     "EEEE1": "Mon",
     "EEEE2": "Tue",
     "EEEE3": "Wed",
     "EEEE4": "Thu",
     "EEEE5": "Fri",
     "EEEE6": "Sat",
+    "G-1": "BCE",
+    "G1": "CE",
     "MMM1": "M01",
     "MMM10": "M10",
     "MMM11": "M11",
@@ -108,7 +124,9 @@
     "N11": "M",
     "N12": "M",
     "N2": "M",
+    "N3": "M",
     "N4": "M",
+    "N5": "M",
     "N6": "M",
     "N7": "M",
     "N8": "M",
@@ -125,6 +143,8 @@
     "NN7": "M0",
     "NN8": "M0",
     "NN9": "M0",
+    "a0": "AM",
+    "a1": "PM",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
     "durationMediumMillis": "#{num} ms",
@@ -137,6 +157,8 @@
     "finalSeparatorLong": ", ",
     "finalSeparatorMedium": ", ",
     "finalSeparatorShort": ", ",
+    "separatorFull": ", ",
+    "separatorLong": ", ",
     "separatorMedium": ", ",
     "separatorShort": ", "
 }

js/data/locale/aa/unitfmt.json

@@ -101,6 +101,7 @@
             "kilowatt-hour": "#{n} kWh",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
             "knot": "#{n} kn",
+            "light-speed": "#{n} light",
             "light-year": "#{n} ly",
             "liter": "#{n} l",
             "liter-per-100-kilometer": "#{n} L/100km",
@@ -147,6 +148,7 @@
             "nautical-mile": "#{n} nmi",
             "newton": "#{n} N",
             "newton-meter": "#{n} N⋅m",
+            "night": "#{n} night",
             "ohm": "#{n} Ω",
             "ounce": "#{n} oz",
             "ounce-troy": "#{n} oz t",
@@ -165,6 +167,7 @@
             "pixel-per-centimeter": "#{n} ppcm",
             "pixel-per-inch": "#{n} ppi",
             "point": "#{n} pt",
+            "portion-per-1e9": "#{n} ppb",
             "pound": "#{n} lb",
             "pound-force": "#{n} lbf",
             "pound-force-foot": "#{n} lbf⋅ft",
@@ -304,6 +307,7 @@
             "kilowatt-hour": "#{n} kWh",
             "kilowatt-hour-per-100-kilometer": "#{n} kWh/100km",
             "knot": "#{n} kn",
+            "light-speed": "#{n} light",
             "light-year": "#{n} ly",
             "liter": "#{n} l",
             "liter-per-100-kilometer": "#{n} L/100km",
@@ -350,6 +354,7 @@
             "nautical-mile": "#{n} nmi",
             "newton": "#{n} N",
             "newton-meter": "#{n} N⋅m",
+            "night": "#{n} night",
             "ohm": "#{n} Ω",
             "ounce": "#{n} oz",
             "ounce-troy": "#{n} oz t",
@@ -368,6 +373,7 @@
             "pixel-per-centimeter": "#{n} ppcm",
             "pixel-per-inch": "#{n} ppi",
             "point": "#{n} pt",
+            "portion-per-1e9": "#{n} ppb",
             "pound": "#{n} lb",
             "pound-force": "#{n} lbf",
             "pound-force-foot": "#{n} lbf⋅ft",

js/data/locale/ab/dateformats.json

@@ -38,6 +38,7 @@
                 "s": "dd, E"
             },
             "m": {
+                "f": "MMMM",
                 "l": "MMMM",
                 "m": "MMM",
                 "s": "MM"
@@ -48,10 +49,20 @@
                 "m": "yyyy MMM",
                 "s": "yyyy-MM"
             },
+            "w": {
+                "f": "EEEE",
+                "l": "EEE",
+                "m": "EE",
+                "s": "E"
+            },
             "y": {
+                "f": "yyyy",
+                "l": "yyyy",
+                "m": "yyyy",
                 "s": "yyyy"
             }
         },
+        "order": "{date} {time}",
         "range": {
             "c00": {
                 "f": "{sy} {sm} {sd} {st} – {et}",
@@ -110,11 +121,19 @@
         },
         "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"
+                "ah": "h a",
+                "ahm": "h:mma",
+                "ahms": "h:mm:ssa",
+                "ahmsz": "h:mm:ssa z",
+                "ahmz": "h:mma z",
+                "h": "h",
+                "hm": "h:mm",
+                "hms": "h:mm:ss",
+                "hmsz": "h:mm:ss z",
+                "hmz": "h:mm z",
+                "m": "mm",
+                "ms": "mm:ss",
+                "s": "ss"
             },
             "24": {
                 "ah": "HH",
@@ -126,7 +145,10 @@
                 "hm": "HH:mm",
                 "hms": "HH:mm:ss",
                 "hmsz": "HH:mm:ss z",
-                "hmz": "HH:mm z"
+                "hmz": "HH:mm z",
+                "m": "mm",
+                "ms": "mm:ss",
+                "s": "ss"
             }
         }
     }

js/data/locale/ab/sysres.json

@@ -65,20 +65,36 @@
     "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": "S",
+    "E1": "M",
+    "E2": "T",
+    "E3": "W",
+    "E4": "T",
+    "E5": "F",
+    "E6": "S",
     "EE0": "Sun",
     "EE1": "Mon",
     "EE2": "Tue",
     "EE3": "Wed",
     "EE4": "Thu",
     "EE5": "Fri",
     "EE6": "Sat",
+    "EEE0": "Sun",
+    "EEE1": "Mon",
+    "EEE2": "Tue",
+    "EEE3": "Wed",
+    "EEE4": "Thu",
+    "EEE5": "Fri",
+    "EEE6": "Sat",
     "EEEE0": "Sun",
     "EEEE1": "Mon",
     "EEEE2": "Tue",
     "EEEE3": "Wed",
     "EEEE4": "Thu",
     "EEEE5": "Fri",
     "EEEE6": "Sat",
+    "G-1": "BCE",
+    "G1": "CE",
     "MMM1": "M01",
     "MMM10": "M10",
     "MMM11": "M11",
@@ -108,7 +124,9 @@
     "N11": "M",
     "N12": "M",
     "N2": "M",
+    "N3": "M",
     "N4": "M",
+    "N5": "M",
     "N6": "M",
     "N7": "M",
     "N8": "M",
@@ -125,6 +143,8 @@
     "NN7": "M0",
     "NN8": "M0",
     "NN9": "M0",
+    "a0": "AM",
+    "a1": "PM",
     "durationLongDays": "#{num} d",
     "durationMediumHours": "#{num} h",
     "durationMediumMillis": "#{num} ms",
@@ -137,6 +157,8 @@
     "finalSeparatorLong": ", ",
     "finalSeparatorMedium": ", ",
     "finalSeparatorShort": ", ",
+    "separatorFull": ", ",
+    "separatorLong": ", ",
     "separatorMedium": ", ",
     "separatorShort": ", "
 }