< prev index next >

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

Print this page

        

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2018 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
 -->
 <ldml>
         <identity>
-                <version number="$Revision: 14982 $"/>
+                <version number="$Revision: 13920 $"/>
                 <language type="nl"/>
         </identity>
         <localeDisplayNames>
                 <localeDisplayPattern>
                         <localePattern>{0} ({1})</localePattern>

@@ -104,11 +104,10 @@
                         <language type="ca">Catalaans</language>
                         <language type="cad">Caddo</language>
                         <language type="car">Caribisch</language>
                         <language type="cay">Cayuga</language>
                         <language type="cch">Atsam</language>
-                        <language type="ccp">Chakma</language>
                         <language type="ce">Tsjetsjeens</language>
                         <language type="ceb">Cebuano</language>
                         <language type="cgg">Chiga</language>
                         <language type="ch">Chamorro</language>
                         <language type="chb">Chibcha</language>

@@ -624,10 +623,11 @@
                 </languages>
                 <scripts>
                         <script type="Adlm" draft="contributed">Adlam</script>
                         <script type="Afak" draft="contributed">Defaka</script>
                         <script type="Aghb" draft="contributed">Kaukasisch Albanees</script>
+                        <script type="Ahom" draft="contributed">Ahom</script>
                         <script type="Arab">Arabisch</script>
                         <script type="Arab" alt="variant">Perso-Arabisch</script>
                         <script type="Armi">Keizerlijk Aramees</script>
                         <script type="Armn">Armeens</script>
                         <script type="Avst">Avestaans</script>

@@ -644,30 +644,28 @@
                         <script type="Bugi">Buginees</script>
                         <script type="Buhd">Buhid</script>
                         <script type="Cakm">Chakma</script>
                         <script type="Cans">Verenigde Canadese Aboriginal-symbolen</script>
                         <script type="Cari">Carisch</script>
+                        <script type="Cham">Cham</script>
                         <script type="Cher">Cherokee</script>
                         <script type="Cirt">Cirth</script>
                         <script type="Copt">Koptisch</script>
                         <script type="Cprt">Cyprisch</script>
                         <script type="Cyrl">Cyrillisch</script>
                         <script type="Cyrs">Oudkerkslavisch Cyrillisch</script>
                         <script type="Deva">Devanagari</script>
-                        <script type="Dogr" draft="contributed">Dogra</script>
                         <script type="Dsrt">Deseret</script>
                         <script type="Dupl" draft="contributed">Duployan snelschrift</script>
                         <script type="Egyd">Egyptisch demotisch</script>
                         <script type="Egyh">Egyptisch hiëratisch</script>
                         <script type="Egyp">Egyptische hiërogliefen</script>
                         <script type="Elba" draft="contributed">Elbasan</script>
-                        <script type="Elym" draft="contributed">Elymaisch</script>
                         <script type="Ethi">Ethiopisch</script>
                         <script type="Geok">Georgisch Khutsuri</script>
                         <script type="Geor">Georgisch</script>
                         <script type="Glag">Glagolitisch</script>
-                        <script type="Gong" draft="contributed">Gunjala Gondi</script>
                         <script type="Gonm" draft="contributed">Masaram Gondi</script>
                         <script type="Goth">Gothisch</script>
                         <script type="Gran" draft="contributed">Grantha</script>
                         <script type="Grek">Grieks</script>
                         <script type="Gujr">Gujarati</script>

@@ -683,11 +681,10 @@
                         <script type="Hatr" draft="contributed">Hatran</script>
                         <script type="Hebr">Hebreeuws</script>
                         <script type="Hira">Hiragana</script>
                         <script type="Hluw" draft="contributed">Anatolische hiërogliefen</script>
                         <script type="Hmng">Pahawh Hmong</script>
-                        <script type="Hmnp" draft="contributed">Nyiakeng Puachue Hmong</script>
                         <script type="Hrkt">Katakana of Hiragana</script>
                         <script type="Hung">Oudhongaars</script>
                         <script type="Inds">Indus</script>
                         <script type="Ital">Oud-italisch</script>
                         <script type="Jamo">Jamo</script>

@@ -715,27 +712,25 @@
                         <script type="Lisu" draft="contributed">Fraser</script>
                         <script type="Loma" draft="contributed">Loma</script>
                         <script type="Lyci">Lycisch</script>
                         <script type="Lydi">Lydisch</script>
                         <script type="Mahj" draft="contributed">Mahajani</script>
-                        <script type="Maka" draft="contributed">Makasar</script>
                         <script type="Mand">Mandaeans</script>
                         <script type="Mani">Manicheaans</script>
                         <script type="Marc" draft="contributed">Marchen</script>
                         <script type="Maya">Mayahiërogliefen</script>
-                        <script type="Medf" draft="contributed">Medefaidrin</script>
                         <script type="Mend" draft="contributed">Mende</script>
                         <script type="Merc" draft="contributed">Meroitisch cursief</script>
                         <script type="Mero">Meroïtisch</script>
                         <script type="Mlym">Malayalam</script>
+                        <script type="Modi" draft="contributed">Modi</script>
                         <script type="Mong">Mongools</script>
                         <script type="Moon">Moon</script>
                         <script type="Mroo" draft="contributed">Mro</script>
                         <script type="Mtei">Meitei</script>
                         <script type="Mult" draft="contributed">Multani</script>
                         <script type="Mymr">Birmaans</script>
-                        <script type="Nand" draft="contributed">Nandinagari</script>
                         <script type="Narb" draft="contributed">Oud Noord-Arabisch</script>
                         <script type="Nbat" draft="contributed">Nabateaans</script>
                         <script type="Newa" draft="contributed">Newari</script>
                         <script type="Nkgb" draft="contributed">Naxi Geba</script>
                         <script type="Nkoo">N’Ko</script>

@@ -754,12 +749,59 @@
                         <script type="Phlp">Psalmen Pahlavi</script>
                         <script type="Phlv">Boek Pahlavi</script>
                         <script type="Phnx">Foenicisch</script>
                         <script type="Plrd">Pollard-fonetisch</script>
                         <script type="Prti">Inscriptioneel Parthisch</script>
+                        <script type="Qaaa" draft="contributed">Qaaa</script>
+                        <script type="Qaab" draft="contributed">Qaab</script>
+                        <script type="Qaac" draft="contributed">Qaac</script>
+                        <script type="Qaad" draft="contributed">Qaad</script>
+                        <script type="Qaae" draft="contributed">Qaae</script>
+                        <script type="Qaaf" draft="contributed">Qaaf</script>
+                        <script type="Qaag" draft="contributed">Qaag</script>
+                        <script type="Qaah" draft="contributed">Qaah</script>
+                        <script type="Qaak" draft="contributed">Qaak</script>
+                        <script type="Qaal" draft="contributed">Qaal</script>
+                        <script type="Qaam" draft="contributed">Qaam</script>
+                        <script type="Qaan" draft="contributed">Qaan</script>
+                        <script type="Qaao" draft="contributed">Qaao</script>
+                        <script type="Qaap" draft="contributed">Qaap</script>
+                        <script type="Qaaq" draft="contributed">Qaaq</script>
+                        <script type="Qaar" draft="contributed">Qaar</script>
+                        <script type="Qaas" draft="contributed">Qaas</script>
+                        <script type="Qaat" draft="contributed">Qaat</script>
+                        <script type="Qaau" draft="contributed">Qaau</script>
+                        <script type="Qaav" draft="contributed">Qaav</script>
+                        <script type="Qaaw" draft="contributed">Qaaw</script>
+                        <script type="Qaax" draft="contributed">Qaax</script>
+                        <script type="Qaay" draft="contributed">Qaay</script>
+                        <script type="Qaaz" draft="contributed">Qaaz</script>
+                        <script type="Qaba" draft="contributed">Qaba</script>
+                        <script type="Qabb" draft="contributed">Qabb</script>
+                        <script type="Qabc" draft="contributed">Qabc</script>
+                        <script type="Qabd" draft="contributed">Qabd</script>
+                        <script type="Qabe" draft="contributed">Qabe</script>
+                        <script type="Qabf" draft="contributed">Qabf</script>
+                        <script type="Qabg" draft="contributed">Qabg</script>
+                        <script type="Qabh" draft="contributed">Qabh</script>
+                        <script type="Qabi" draft="contributed">Qabi</script>
+                        <script type="Qabj" draft="contributed">Qabj</script>
+                        <script type="Qabk" draft="contributed">Qabk</script>
+                        <script type="Qabl" draft="contributed">Qabl</script>
+                        <script type="Qabm" draft="contributed">Qabm</script>
+                        <script type="Qabn" draft="contributed">Qabn</script>
+                        <script type="Qabo" draft="contributed">Qabo</script>
+                        <script type="Qabp" draft="contributed">Qabp</script>
+                        <script type="Qabq" draft="contributed">Qabq</script>
+                        <script type="Qabr" draft="contributed">Qabr</script>
+                        <script type="Qabs" draft="contributed">Qabs</script>
+                        <script type="Qabt" draft="contributed">Qabt</script>
+                        <script type="Qabu" draft="contributed">Qabu</script>
+                        <script type="Qabv" draft="contributed">Qabv</script>
+                        <script type="Qabw" draft="contributed">Qabw</script>
+                        <script type="Qabx" draft="contributed">Qabx</script>
                         <script type="Rjng">Rejang</script>
-                        <script type="Rohg" draft="contributed">Hanifi Rohingya</script>
                         <script type="Roro">Rongorongo</script>
                         <script type="Runr">Runic</script>
                         <script type="Samr">Samaritaans</script>
                         <script type="Sara">Sarati</script>
                         <script type="Sarb" draft="contributed">Oud Zuid-Arabisch</script>

@@ -768,12 +810,10 @@
                         <script type="Shaw">Shavian</script>
                         <script type="Shrd" draft="contributed">Sharada</script>
                         <script type="Sidd" draft="contributed">Siddham</script>
                         <script type="Sind" draft="contributed">Sindhi</script>
                         <script type="Sinh">Singalees</script>
-                        <script type="Sogd" draft="contributed">Sogdisch</script>
-                        <script type="Sogo" draft="contributed">Oud Sogdisch</script>
                         <script type="Sora" draft="contributed">Sora Sompeng</script>
                         <script type="Soyo" draft="contributed">Soyombo</script>
                         <script type="Sund">Soendanees</script>
                         <script type="Sylo">Syloti Nagri</script>
                         <script type="Syrc">Syriac</script>

@@ -797,11 +837,10 @@
                         <script type="Tirh" draft="contributed">Tirhuta</script>
                         <script type="Ugar">Ugaritisch</script>
                         <script type="Vaii">Vai</script>
                         <script type="Visp">Zichtbare spraak</script>
                         <script type="Wara" draft="contributed">Varang Kshiti</script>
-                        <script type="Wcho" draft="contributed">Wancho</script>
                         <script type="Wole" draft="contributed">Woleai</script>
                         <script type="Xpeo">Oudperzisch</script>
                         <script type="Xsux">Sumero-Akkadian Cuneiform</script>
                         <script type="Yiii">Yi</script>
                         <script type="Zanb" draft="contributed">vierkant Zanabazar</script>

@@ -841,11 +880,11 @@
                         <territory type="145">West-Azië</territory>
                         <territory type="150">Europa</territory>
                         <territory type="151">Oost-Europa</territory>
                         <territory type="154">Noord-Europa</territory>
                         <territory type="155">West-Europa</territory>
-                        <territory type="202">Sub-Saharaans Afrika</territory>
+                        <territory type="202" draft="contributed">Sub-Saharaans Afrika</territory>
                         <territory type="419">Latijns-Amerika</territory>
                         <territory type="AC">Ascension</territory>
                         <territory type="AD">Andorra</territory>
                         <territory type="AE">Verenigde Arabische Emiraten</territory>
                         <territory type="AF">Afghanistan</territory>

@@ -1000,11 +1039,12 @@
                         <territory type="MD">Moldavië</territory>
                         <territory type="ME">Montenegro</territory>
                         <territory type="MF">Saint-Martin</territory>
                         <territory type="MG">Madagaskar</territory>
                         <territory type="MH">Marshalleilanden</territory>
-                        <territory type="MK">Noord-Macedonië</territory>
+                        <territory type="MK">Macedonië</territory>
+                        <territory type="MK" alt="variant">Macedonië (FYROM)</territory>
                         <territory type="ML">Mali</territory>
                         <territory type="MM">Myanmar (Birma)</territory>
                         <territory type="MN">Mongolië</territory>
                         <territory type="MO">Macau SAR van China</territory>
                         <territory type="MO" alt="short">Macau</territory>

@@ -1072,12 +1112,11 @@
                         <territory type="SS">Zuid-Soedan</territory>
                         <territory type="ST">Sao Tomé en Principe</territory>
                         <territory type="SV">El Salvador</territory>
                         <territory type="SX">Sint-Maarten</territory>
                         <territory type="SY">Syrië</territory>
-                        <territory type="SZ">eSwatini</territory>
-                        <territory type="SZ" alt="variant">Swaziland</territory>
+                        <territory type="SZ">Swaziland</territory>
                         <territory type="TA">Tristan da Cunha</territory>
                         <territory type="TC">Turks- en Caicoseilanden</territory>
                         <territory type="TD">Tsjaad</territory>
                         <territory type="TF">Franse Gebieden in de zuidelijke Indische Oceaan</territory>
                         <territory type="TG">Togo</territory>

@@ -1110,12 +1149,10 @@
                         <territory type="VI">Amerikaanse Maagdeneilanden</territory>
                         <territory type="VN">Vietnam</territory>
                         <territory type="VU">Vanuatu</territory>
                         <territory type="WF">Wallis en Futuna</territory>
                         <territory type="WS">Samoa</territory>
-                        <territory type="XA">Pseudo-Accenten</territory>
-                        <territory type="XB">Pseudo-Bidi</territory>
                         <territory type="XK">Kosovo</territory>
                         <territory type="YE">Jemen</territory>
                         <territory type="YT">Mayotte</territory>
                         <territory type="ZA">Zuid-Afrika</territory>
                         <territory type="ZM">Zambia</territory>

@@ -1128,66 +1165,51 @@
                         <variant type="1996">Duitse spelling van 1996</variant>
                         <variant type="1606NICT">Laat Middelfrans tot 1606</variant>
                         <variant type="1694ACAD">Vroeg modern Frans</variant>
                         <variant type="1959ACAD" draft="contributed">Academisch</variant>
                         <variant type="ABL1943" draft="contributed">Spellingsformulering van 1943</variant>
-                        <variant type="AKUAPEM" draft="contributed">Akuapem</variant>
                         <variant type="ALALC97" draft="contributed">Romanisering ALA-LC, editie 1997</variant>
                         <variant type="ALUKU" draft="contributed">Aloekoe-dialect</variant>
                         <variant type="AO1990" draft="contributed">Portugese spellingsovereenkomst van 1990</variant>
-                        <variant type="ARANES" draft="contributed">Aranees</variant>
                         <variant type="AREVELA">Oost-Armeens</variant>
                         <variant type="AREVMDA">West-Armeens</variant>
-                        <variant type="ASANTE" draft="contributed">Asante</variant>
-                        <variant type="AUVERN" draft="contributed">Auvern</variant>
                         <variant type="BAKU1926">Eenvormig Turkse Latijnse alfabet</variant>
                         <variant type="BALANKA" draft="contributed">Balanka-dialect van Anii</variant>
                         <variant type="BARLA" draft="contributed">Barlavento-dialectgroep van Kabuverdianu</variant>
                         <variant type="BASICENG" draft="contributed">Standaard Engels</variant>
                         <variant type="BAUDDHA" draft="contributed">Bauddha</variant>
                         <variant type="BISCAYAN" draft="contributed">Biskajaans</variant>
                         <variant type="BISKE">San Giorgio/Bila-dialect</variant>
                         <variant type="BOHORIC" draft="contributed">Bohorič-alfabet</variant>
                         <variant type="BOONT">Boontling</variant>
-                        <variant type="CISAUP" draft="contributed">Cisaup</variant>
                         <variant type="COLB1945" draft="contributed">Portugese-Braziliaanse spellingsverdrag van 1945</variant>
                         <variant type="CORNU" draft="contributed">Cornu</variant>
-                        <variant type="CREISS" draft="contributed">Creiss</variant>
                         <variant type="DAJNKO" draft="contributed">Dajnko-alfabet</variant>
                         <variant type="EKAVSK" draft="contributed">Servisch met Ekaviaanse uitspraak</variant>
                         <variant type="EMODENG" draft="contributed">Vroegmodern Engels</variant>
                         <variant type="FONIPA">Internationaal Fonetisch Alfabet</variant>
-                        <variant type="FONKIRSH" draft="contributed">Fonkirsh</variant>
                         <variant type="FONNAPA" draft="contributed">Fonnapa</variant>
                         <variant type="FONUPA">Oeralisch Fonetisch Alfabet</variant>
                         <variant type="FONXSAMP" draft="contributed">Transcriptie volgens X-SAMPA</variant>
-                        <variant type="GASCON" draft="contributed">Gascon</variant>
-                        <variant type="GRCLASS" draft="contributed">Grclass</variant>
-                        <variant type="GRITAL" draft="contributed">Grital</variant>
-                        <variant type="GRMISTR" draft="contributed">Grmistr</variant>
                         <variant type="HEPBURN" draft="contributed">Hepburn-romanisering</variant>
                         <variant type="HOGNORSK" draft="contributed">Hoognoors</variant>
                         <variant type="HSISTEMO" draft="contributed">H-sistemo</variant>
                         <variant type="IJEKAVSK" draft="contributed">Servisch met Ijekaviaanse uitspraak</variant>
                         <variant type="ITIHASA" draft="contributed">Episch Sanskriet</variant>
-                        <variant type="IVANCHOV" draft="contributed">Ivanchov</variant>
                         <variant type="JAUER" draft="contributed">Jauer</variant>
                         <variant type="JYUTPING" draft="contributed">Jyutping</variant>
                         <variant type="KKCOR" draft="contributed">Algemene spelling</variant>
                         <variant type="KOCIEWIE" draft="contributed">Kociewie</variant>
                         <variant type="KSCOR" draft="contributed">Standaardspelling</variant>
                         <variant type="LAUKIKA" draft="contributed">Laukika</variant>
-                        <variant type="LEMOSIN" draft="contributed">Lemosin</variant>
-                        <variant type="LENGADOC" draft="contributed">Lengadoc</variant>
                         <variant type="LIPAW">Het Lipovaz-dialect van het Resiaans</variant>
                         <variant type="LUNA1918" draft="contributed">Russische spelling van 1917</variant>
                         <variant type="METELKO" draft="contributed">Metelko-alfabet</variant>
                         <variant type="MONOTON">Monotonaal</variant>
                         <variant type="NDYUKA" draft="contributed">Ndyuka-dialect</variant>
                         <variant type="NEDIS">Natisone-dialect</variant>
                         <variant type="NEWFOUND" draft="contributed">Newfound</variant>
-                        <variant type="NICARD" draft="contributed">Nicard</variant>
                         <variant type="NJIVA">Gniva/Njiva-dialect</variant>
                         <variant type="NULIK" draft="contributed">Modern Volapük</variant>
                         <variant type="OSOJS">Oseacco/Osojane-dialect</variant>
                         <variant type="OXENDICT" draft="contributed">Spelling volgens het Oxford English Dictionary</variant>
                         <variant type="PAHAWH2" draft="contributed">Pahawh2</variant>

@@ -1196,11 +1218,10 @@
                         <variant type="PAMAKA" draft="contributed">Pamaka</variant>
                         <variant type="PETR1708" draft="contributed">Petr1708</variant>
                         <variant type="PINYIN">Pinyin</variant>
                         <variant type="POLYTON">Polytonaal</variant>
                         <variant type="POSIX">Computer</variant>
-                        <variant type="PROVENC" draft="contributed">Provenc</variant>
                         <variant type="PUTER" draft="contributed">Puter</variant>
                         <variant type="REVISED">Gewijzigde spelling</variant>
                         <variant type="RIGIK" draft="contributed">Klassiek Volapük</variant>
                         <variant type="ROZAJ">Resiaans</variant>
                         <variant type="RUMGR" draft="contributed">Rumgr</variant>

@@ -1220,33 +1241,32 @@
                         <variant type="ULSTER" draft="contributed">Ulster</variant>
                         <variant type="UNIFON" draft="contributed">Unifon fonetisch alfabet</variant>
                         <variant type="VAIDIKA" draft="contributed">Vaidika</variant>
                         <variant type="VALENCIA">Valenciaans</variant>
                         <variant type="VALLADER" draft="contributed">Vallader</variant>
-                        <variant type="VIVARAUP" draft="contributed">Vivaraup</variant>
                         <variant type="WADEGILE" draft="contributed">Wade-Giles-romanisering</variant>
                         <variant type="XSISTEMO" draft="contributed">X-sistemo</variant>
                 </variants>
                 <keys>
                         <key type="calendar">kalender</key>
                         <key type="cf">valutanotatie</key>
-                        <key type="colAlternate">Sorteren van symbolen negeren</key>
-                        <key type="colBackwards">Omgekeerd sorteren op accenten</key>
-                        <key type="colCaseFirst">Indelen op hoofdletters/kleine letters</key>
-                        <key type="colCaseLevel">Hoofdlettergevoelig sorteren</key>
+                        <key type="colAlternate" draft="contributed">Sorteren van symbolen negeren</key>
+                        <key type="colBackwards" draft="contributed">Omgekeerd sorteren op accenten</key>
+                        <key type="colCaseFirst" draft="contributed">Indelen op hoofdletters/kleine letters</key>
+                        <key type="colCaseLevel" draft="contributed">Hoofdlettergevoelig sorteren</key>
                         <key type="collation">sorteervolgorde</key>
-                        <key type="colNormalization">Genormaliseerd sorteren</key>
-                        <key type="colNumeric">Numeriek sorteren</key>
-                        <key type="colStrength">Sorteervoorrang</key>
+                        <key type="colNormalization" draft="contributed">Genormaliseerd sorteren</key>
+                        <key type="colNumeric" draft="contributed">Numeriek sorteren</key>
+                        <key type="colStrength" draft="contributed">Sorteervoorrang</key>
                         <key type="currency">valuta</key>
                         <key type="hc">uursysteem (12 of 24)</key>
                         <key type="lb">stijl regelafbreking</key>
                         <key type="ms">maatsysteem</key>
                         <key type="numbers">cijfers</key>
-                        <key type="timezone">Tijdzone</key>
-                        <key type="va">Landvariant</key>
-                        <key type="x">Privégebruik</key>
+                        <key type="timezone" draft="contributed">Tijdzone</key>
+                        <key type="va" draft="contributed">Landvariant</key>
+                        <key type="x" draft="contributed">Privégebruik</key>
                 </keys>
                 <types>
                         <type key="calendar" type="buddhist">Boeddhistische kalender</type>
                         <type key="calendar" type="chinese">Chinese kalender</type>
                         <type key="calendar" type="coptic">Koptische kalender</type>

@@ -1332,11 +1352,10 @@
                         <type key="numbers" type="deva">Devanagari cijfers</type>
                         <type key="numbers" type="ethi">Ethiopische cijfers</type>
                         <type key="numbers" type="finance" draft="contributed">Financiële cijfers</type>
                         <type key="numbers" type="fullwide">cijfers met volledige breedte</type>
                         <type key="numbers" type="geor">Georgische cijfers</type>
-                        <type key="numbers" type="gong" draft="contributed">Gunjala Gondi cijfers</type>
                         <type key="numbers" type="gonm" draft="contributed">Masaram Gondi cijfers</type>
                         <type key="numbers" type="grek">Griekse cijfers</type>
                         <type key="numbers" type="greklow">kleine Griekse cijfers</type>
                         <type key="numbers" type="gujr">Gujarati cijfers</type>
                         <type key="numbers" type="guru">Gurmukhi cijfers</type>

@@ -1345,11 +1364,10 @@
                         <type key="numbers" type="hansfin">vereenvoudigd Chinese financiële cijfers</type>
                         <type key="numbers" type="hant">traditioneel Chinese cijfers</type>
                         <type key="numbers" type="hantfin">traditioneel Chinese financiële cijfers</type>
                         <type key="numbers" type="hebr">Hebreeuwse cijfers</type>
                         <type key="numbers" type="hmng" draft="contributed">Pahawh Hmong cijfers</type>
-                        <type key="numbers" type="hmnp" draft="contributed">Nyiakeng Puachue Hmong cijfers</type>
                         <type key="numbers" type="java" draft="contributed">Javaanse cijfers</type>
                         <type key="numbers" type="jpan">Japanse cijfers</type>
                         <type key="numbers" type="jpanfin">Japanse financiële cijfers</type>
                         <type key="numbers" type="kali" draft="contributed">Kayah Li cijfers</type>
                         <type key="numbers" type="khmr">Khmer cijfers</type>

@@ -1376,11 +1394,10 @@
                         <type key="numbers" type="native" draft="contributed">Binnenlandse cijfers</type>
                         <type key="numbers" type="nkoo" draft="contributed">N’Ko cijfers</type>
                         <type key="numbers" type="olck" draft="contributed">Ol Chiki cijfers</type>
                         <type key="numbers" type="orya">Odia cijfers</type>
                         <type key="numbers" type="osma" draft="contributed">Osmanya cijfers</type>
-                        <type key="numbers" type="rohg" draft="contributed">Hanifi Rohingya cijfers</type>
                         <type key="numbers" type="roman">Romeinse cijfers</type>
                         <type key="numbers" type="romanlow">kleine Romeinse cijfers</type>
                         <type key="numbers" type="saur" draft="contributed">Saurashtra cijfers</type>
                         <type key="numbers" type="shrd" draft="contributed">Sharada cijfers</type>
                         <type key="numbers" type="sind" draft="contributed">Khudawadi cijfers</type>

@@ -1396,11 +1413,10 @@
                         <type key="numbers" type="tibt">Tibetaanse cijfers</type>
                         <type key="numbers" type="tirh" draft="contributed">Tirhuta cijfers</type>
                         <type key="numbers" type="traditional" draft="contributed">Traditionele cijfers</type>
                         <type key="numbers" type="vaii" draft="contributed">Vai-cijfers</type>
                         <type key="numbers" type="wara" draft="contributed">Warang Citi cijfers</type>
-                        <type key="numbers" type="wcho" draft="contributed">Wancho cijfers</type>
                 </types>
                 <measurementSystemNames>
                         <measurementSystemName type="metric">metriek</measurementSystemName>
                         <measurementSystemName type="UK">Brits</measurementSystemName>
                         <measurementSystemName type="US">Amerikaans</measurementSystemName>

@@ -1441,24 +1457,35 @@
                 <exemplarCharacters>[a á ä b c d e é ë f g h i í ï {ij} {íj\u0301} j k l m n o ó ö p q r s t u ú ü v w x y z]</exemplarCharacters>
                 <exemplarCharacters type="auxiliary">[à â å ã æ ç è ê î ñ ô ø œ ù û ÿ]</exemplarCharacters>
                 <exemplarCharacters type="index" draft="contributed">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
                 <exemplarCharacters type="numbers">[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
                 <exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+                <ellipsis type="final">{0}…</ellipsis>
+                <ellipsis type="initial">…{0}</ellipsis>
+                <ellipsis type="medial">{0}…{1}</ellipsis>
+                <ellipsis type="word-final">{0} …</ellipsis>
+                <ellipsis type="word-initial">… {0}</ellipsis>
+                <ellipsis type="word-medial">{0} … {1}</ellipsis>
+                <moreInformation>?</moreInformation>
                 <parseLenients scope="date" level="lenient">
+                        <parseLenient sample="-" draft="contributed">[\--/]</parseLenient>
                         <parseLenient sample=":" draft="contributed">[\:∶]</parseLenient>
                 </parseLenients>
                 <parseLenients scope="general" level="lenient">
-                        <parseLenient sample="’" draft="contributed">['ʼ՚᾽᾿’']</parseLenient>
-                        <parseLenient sample="%" draft="contributed">[%٪﹪%]</parseLenient>
-                        <parseLenient sample="‰" draft="contributed">[؉‰]</parseLenient>
+                        <parseLenient sample="." draft="contributed">[.․。︒﹒.。]</parseLenient>
                         <parseLenient sample="$" draft="contributed">[\$﹩$$]</parseLenient>
                         <parseLenient sample="£" draft="contributed">[£₤]</parseLenient>
-                        <parseLenient sample="¥" draft="contributed">[¥¥]</parseLenient>
-                        <parseLenient sample="₩" draft="contributed">[₩₩]</parseLenient>
+                        <parseLenient sample="₹" draft="contributed">[₨₹{Rp}{Rs}]</parseLenient>
                 </parseLenients>
                 <parseLenients scope="number" level="lenient">
                         <parseLenient sample="-" draft="contributed">[\-‒⁻₋−➖﹣-]</parseLenient>
+                        <parseLenient sample="," draft="contributed">[,،٫、︐︑﹐﹑,、]</parseLenient>
+                        <parseLenient sample="+" draft="contributed">[+⁺₊➕﬩﹢+]</parseLenient>
+                </parseLenients>
+                <parseLenients scope="number" level="stricter">
+                        <parseLenient sample="," draft="contributed">[,٫︐﹐,]</parseLenient>
+                        <parseLenient sample="." draft="contributed">[.․﹒.。]</parseLenient>
                 </parseLenients>
         </characters>
         <delimiters>
                 <quotationStart>‘</quotationStart>
                 <quotationEnd>’</quotationEnd>

@@ -1466,10 +1493,21 @@
                 <alternateQuotationEnd>”</alternateQuotationEnd>
         </delimiters>
         <dates>
                 <calendars>
                         <calendar type="buddhist">
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">BE</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0">BE</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">BE</era>
+                                        </eraNarrow>
+                                </eras>
                                 <dateFormats>
                                         <dateFormatLength type="full">
                                                 <dateFormat>
                                                         <pattern>EEEE d MMMM y G</pattern>
                                                 </dateFormat>

@@ -1489,28 +1527,22 @@
                                                         <pattern>dd-MM-yy GGGGG</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                 </dateFormats>
                                 <dateTimeFormats>
-                                        <dateTimeFormatLength type="full">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <dateTimeFormatLength type="long">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
                                         <availableFormats>
+                                                <dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+                                                <dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
                                                 <dateFormatItem id="Ed">E d</dateFormatItem>
                                                 <dateFormatItem id="Gy">y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+                                                <dateFormatItem id="M" draft="contributed">L</dateFormatItem>
                                                 <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
                                                 <dateFormatItem id="MEd">E d-M</dateFormatItem>
+                                                <dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
                                                 <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
                                                 <dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
                                                 <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>

@@ -1522,120 +1554,10 @@
                                                 <dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
                                         </availableFormats>
-                                        <intervalFormats>
-                                                <intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="M">
-                                                        <greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Md">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="y">
-                                                        <greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yM">
-                                                        <greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMd">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMMM y – MMMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                        </intervalFormats>
                                 </dateTimeFormats>
                         </calendar>
                         <calendar type="chinese">
                                 <months>
                                         <monthContext type="format">

@@ -1651,10 +1573,24 @@
                                                         <month type="9" draft="contributed">mnd 9</month>
                                                         <month type="10" draft="contributed">mnd 10</month>
                                                         <month type="11" draft="contributed">mnd 11</month>
                                                         <month type="12" draft="contributed">mnd 12</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">maand 1</month>
                                                         <month type="2" draft="contributed">maand 2</month>
                                                         <month type="3" draft="contributed">maand 3</month>
                                                         <month type="4" draft="contributed">maand 4</month>

@@ -1681,10 +1617,24 @@
                                                         <month type="9" draft="contributed">mnd 9</month>
                                                         <month type="10" draft="contributed">mnd 10</month>
                                                         <month type="11" draft="contributed">mnd 11</month>
                                                         <month type="12" draft="contributed">mnd 12</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">maand 1</month>
                                                         <month type="2" draft="contributed">maand 2</month>
                                                         <month type="3" draft="contributed">maand 3</month>
                                                         <month type="4" draft="contributed">maand 4</month>

@@ -1697,11 +1647,466 @@
                                                         <month type="11" draft="contributed">maand 11</month>
                                                         <month type="12" draft="contributed">maand 12</month>
                                                 </monthWidth>
                                         </monthContext>
                                 </months>
+                                <monthPatterns>
+                                        <monthPatternContext type="format">
+                                                <monthPatternWidth type="abbreviated">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                                <monthPatternWidth type="narrow">
+                                                        <monthPattern type="leap" draft="contributed">{0}b</monthPattern>
+                                                </monthPatternWidth>
+                                                <monthPatternWidth type="wide">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                        </monthPatternContext>
+                                        <monthPatternContext type="numeric">
+                                                <monthPatternWidth type="all">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                        </monthPatternContext>
+                                        <monthPatternContext type="stand-alone">
+                                                <monthPatternWidth type="abbreviated">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                                <monthPatternWidth type="narrow">
+                                                        <monthPattern type="leap" draft="contributed">{0}b</monthPattern>
+                                                </monthPatternWidth>
+                                                <monthPatternWidth type="wide">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                        </monthPatternContext>
+                                </monthPatterns>
                                 <cyclicNameSets>
+                                        <cyclicNameSet type="dayParts">
+                                                <cyclicNameContext type="format">
+                                                        <cyclicNameWidth type="abbreviated">
+                                                                <cyclicName type="1" draft="contributed">zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="narrow">
+                                                                <cyclicName type="1" draft="contributed">zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="wide">
+                                                                <cyclicName type="1" draft="contributed">zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                </cyclicNameContext>
+                                        </cyclicNameSet>
+                                        <cyclicNameSet type="days">
+                                                <cyclicNameContext type="format">
+                                                        <cyclicNameWidth type="abbreviated">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="narrow">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="wide">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                </cyclicNameContext>
+                                        </cyclicNameSet>
+                                        <cyclicNameSet type="months">
+                                                <cyclicNameContext type="format">
+                                                        <cyclicNameWidth type="abbreviated">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="narrow">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="wide">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                </cyclicNameContext>
+                                        </cyclicNameSet>
                                         <cyclicNameSet type="solarTerms">
                                                 <cyclicNameContext type="format">
                                                         <cyclicNameWidth type="abbreviated">
                                                                 <cyclicName type="1" draft="contributed">begin van de lente</cyclicName>
                                                                 <cyclicName type="2" draft="contributed">regenwater</cyclicName>

@@ -1780,10 +2185,200 @@
                                                                 <cyclicName type="23" draft="contributed">koel</cyclicName>
                                                                 <cyclicName type="24" draft="contributed">koud</cyclicName>
                                                         </cyclicNameWidth>
                                                 </cyclicNameContext>
                                         </cyclicNameSet>
+                                        <cyclicNameSet type="years">
+                                                <cyclicNameContext type="format">
+                                                        <cyclicNameWidth type="abbreviated">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="narrow">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="wide">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                </cyclicNameContext>
+                                        </cyclicNameSet>
                                         <cyclicNameSet type="zodiacs">
                                                 <cyclicNameContext type="format">
                                                         <cyclicNameWidth type="abbreviated">
                                                                 <cyclicName type="1" draft="contributed">Rat</cyclicName>
                                                                 <cyclicName type="2" draft="contributed">Os</cyclicName>

@@ -1850,21 +2445,56 @@
                                                         <pattern>dd-MM-yy</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                 </dateFormats>
                                 <dateTimeFormats>
+                                        <dateTimeFormatLength type="full">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
+                                        <dateTimeFormatLength type="long">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
+                                        <dateTimeFormatLength type="medium">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
+                                        <dateTimeFormatLength type="short">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
                                         <availableFormats>
+                                                <dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+                                                <dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
                                                 <dateFormatItem id="Ed">E d</dateFormatItem>
                                                 <dateFormatItem id="Gy">U</dateFormatItem>
                                                 <dateFormatItem id="GyMMM">MMM U</dateFormatItem>
                                                 <dateFormatItem id="GyMMMd">d MMM U</dateFormatItem>
                                                 <dateFormatItem id="GyMMMEd">E d MMM U</dateFormatItem>
+                                                <dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
+                                                <dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
+                                                <dateFormatItem id="hm">h:mm a</dateFormatItem>
+                                                <dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
+                                                <dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+                                                <dateFormatItem id="Hms" draft="contributed">HH:mm:ss</dateFormatItem>
+                                                <dateFormatItem id="M" draft="contributed">L</dateFormatItem>
                                                 <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
                                                 <dateFormatItem id="MEd">E d-M</dateFormatItem>
+                                                <dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
                                                 <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
+                                                <dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
+                                                <dateFormatItem id="UM" draft="contributed">U MM</dateFormatItem>
+                                                <dateFormatItem id="UMd" draft="contributed">U MM-d</dateFormatItem>
+                                                <dateFormatItem id="UMMM" draft="contributed">U MMM</dateFormatItem>
+                                                <dateFormatItem id="UMMMd" draft="contributed">U MMM d</dateFormatItem>
                                                 <dateFormatItem id="y" draft="contributed">U</dateFormatItem>
                                                 <dateFormatItem id="yMd" draft="contributed">y-MM-dd</dateFormatItem>
                                                 <dateFormatItem id="yyyy" draft="contributed">U</dateFormatItem>
                                                 <dateFormatItem id="yyyyM" draft="contributed">M-y</dateFormatItem>
                                                 <dateFormatItem id="yyyyMd">d-M-y</dateFormatItem>

@@ -1875,18 +2505,102 @@
                                                 <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM U</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ U</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ U</dateFormatItem>
                                         </availableFormats>
                                         <intervalFormats>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
+                                                <intervalFormatFallback draft="contributed">{0} – {1}</intervalFormatFallback>
+                                                <intervalFormatItem id="d">
+                                                        <greatestDifference id="d" draft="contributed">d–d</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="h">
+                                                        <greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
+                                                        <greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="H">
+                                                        <greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="hm">
+                                                        <greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
+                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
+                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm a</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="Hm">
+                                                        <greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
+                                                        <greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="hmv">
+                                                        <greatestDifference id="a" draft="contributed">h:mm a – h:mm a v</greatestDifference>
+                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm a v</greatestDifference>
+                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm a v</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="Hmv">
+                                                        <greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+                                                        <greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="hv">
+                                                        <greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
+                                                        <greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="Hv">
+                                                        <greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="M">
+                                                        <greatestDifference id="M" draft="contributed">MM–MM</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="Md">
+                                                        <greatestDifference id="d" draft="contributed">MM-dd – MM-dd</greatestDifference>
+                                                        <greatestDifference id="M" draft="contributed">MM-dd – MM-dd</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="MEd">
+                                                        <greatestDifference id="d" draft="contributed">MM-dd, E – MM-dd, E</greatestDifference>
+                                                        <greatestDifference id="M" draft="contributed">MM-dd, E – MM-dd, E</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="MMM">
+                                                        <greatestDifference id="M" draft="contributed">LLL–LLL</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="MMMd">
+                                                        <greatestDifference id="d" draft="contributed">MMM d–d</greatestDifference>
+                                                        <greatestDifference id="M" draft="contributed">MMM d – MMM d</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="MMMEd">
+                                                        <greatestDifference id="d" draft="contributed">MMM d, E – MMM d, E</greatestDifference>
+                                                        <greatestDifference id="M" draft="contributed">MMM d, E – MMM d, E</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="y">
+                                                        <greatestDifference id="y" draft="contributed">U–U</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="yM">
+                                                        <greatestDifference id="M" draft="contributed">y-MM – y-MM</greatestDifference>
+                                                        <greatestDifference id="y" draft="contributed">y-MM – y-MM</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="yMd">
+                                                        <greatestDifference id="d" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
+                                                        <greatestDifference id="M" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
+                                                        <greatestDifference id="y" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="yMEd">
+                                                        <greatestDifference id="d" draft="contributed">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+                                                        <greatestDifference id="M" draft="contributed">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+                                                        <greatestDifference id="y" draft="contributed">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="yMMM">
+                                                        <greatestDifference id="M" draft="contributed">U MMM–MMM</greatestDifference>
+                                                        <greatestDifference id="y" draft="contributed">U MMM – U MMM</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="yMMMd">
+                                                        <greatestDifference id="d" draft="contributed">U MMM d–d</greatestDifference>
+                                                        <greatestDifference id="M" draft="contributed">U MMM d – MMM d</greatestDifference>
+                                                        <greatestDifference id="y" draft="contributed">U MMM d – U MMM d</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="yMMMEd">
+                                                        <greatestDifference id="d" draft="contributed">U MMM d, E – MMM d, E</greatestDifference>
+                                                        <greatestDifference id="M" draft="contributed">U MMM d, E – MMM d, E</greatestDifference>
+                                                        <greatestDifference id="y" draft="contributed">U MMM d, E – U MMM d, E</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="yMMMM">
+                                                        <greatestDifference id="M" draft="contributed">U MMMM–MMMM</greatestDifference>
+                                                        <greatestDifference id="y" draft="contributed">U MMMM – U MMMM</greatestDifference>
                                                 </intervalFormatItem>
                                         </intervalFormats>
                                 </dateTimeFormats>
                         </calendar>
                         <calendar type="coptic">

@@ -1905,10 +2619,25 @@
                                                         <month type="10" draft="contributed">Ba’unah</month>
                                                         <month type="11" draft="contributed">Abib</month>
                                                         <month type="12" draft="contributed">Misra</month>
                                                         <month type="13" draft="contributed">Nasi</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">Tut</month>
                                                         <month type="2" draft="contributed">Babah</month>
                                                         <month type="3" draft="contributed">Hatur</month>
                                                         <month type="4" draft="contributed">Kiyahk</month>

@@ -1937,10 +2666,25 @@
                                                         <month type="10" draft="contributed">Ba’unah</month>
                                                         <month type="11" draft="contributed">Abib</month>
                                                         <month type="12" draft="contributed">Misra</month>
                                                         <month type="13" draft="contributed">Nasi</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">Tut</month>
                                                         <month type="2" draft="contributed">Babah</month>
                                                         <month type="3" draft="contributed">Hatur</month>
                                                         <month type="4" draft="contributed">Kiyahk</month>

@@ -1954,176 +2698,28 @@
                                                         <month type="12" draft="contributed">Misra</month>
                                                         <month type="13" draft="contributed">Nasi</month>
                                                 </monthWidth>
                                         </monthContext>
                                 </months>
-                                <dateFormats>
-                                        <dateFormatLength type="full">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">EEEE d MMMM y G</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="long">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">d MMMM y G</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="medium">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">d MMM y G</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="short">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">dd-MM-yy GGGGG</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                </dateFormats>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">ERA0</era>
+                                                <era type="1" draft="contributed">ERA1</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">ERA0</era>
+                                                <era type="1" draft="contributed">ERA1</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">ERA0</era>
+                                                <era type="1" draft="contributed">ERA1</era>
+                                        </eraNarrow>
+                                </eras>
                                 <dateTimeFormats>
-                                        <dateTimeFormatLength type="full">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <dateTimeFormatLength type="long">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
                                         <availableFormats>
-                                                <dateFormatItem id="Ed" draft="contributed">E d</dateFormatItem>
-                                                <dateFormatItem id="Gy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMd" draft="contributed">d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMEd" draft="contributed">E d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
-                                                <dateFormatItem id="MEd" draft="contributed">E d-M</dateFormatItem>
-                                                <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
-                                                <dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyM" draft="contributed">M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMd" draft="contributed">d-M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMEd" draft="contributed">E d-M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMd" draft="contributed">d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMEd" draft="contributed">E d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
+                                                <dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
                                         </availableFormats>
-                                        <intervalFormats>
-                                                <intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="M">
-                                                        <greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Md">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="y">
-                                                        <greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yM">
-                                                        <greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMd">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMMM y – MMMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                        </intervalFormats>
                                 </dateTimeFormats>
                         </calendar>
                         <calendar type="dangi">
                                 <months>
                                         <monthContext type="format">

@@ -2139,10 +2735,24 @@
                                                         <month type="9" draft="contributed">mnd 9</month>
                                                         <month type="10" draft="contributed">mnd 10</month>
                                                         <month type="11" draft="contributed">mnd 11</month>
                                                         <month type="12" draft="contributed">mnd 12</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">maand 1</month>
                                                         <month type="2" draft="contributed">maand 2</month>
                                                         <month type="3" draft="contributed">maand 3</month>
                                                         <month type="4" draft="contributed">maand 4</month>

@@ -2169,10 +2779,24 @@
                                                         <month type="9" draft="contributed">mnd 9</month>
                                                         <month type="10" draft="contributed">mnd 10</month>
                                                         <month type="11" draft="contributed">mnd 11</month>
                                                         <month type="12" draft="contributed">mnd 12</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">maand 1</month>
                                                         <month type="2" draft="contributed">maand 2</month>
                                                         <month type="3" draft="contributed">maand 3</month>
                                                         <month type="4" draft="contributed">maand 4</month>

@@ -2185,11 +2809,466 @@
                                                         <month type="11" draft="contributed">maand 11</month>
                                                         <month type="12" draft="contributed">maand 12</month>
                                                 </monthWidth>
                                         </monthContext>
                                 </months>
+                                <monthPatterns>
+                                        <monthPatternContext type="format">
+                                                <monthPatternWidth type="abbreviated">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                                <monthPatternWidth type="narrow">
+                                                        <monthPattern type="leap" draft="contributed">{0}b</monthPattern>
+                                                </monthPatternWidth>
+                                                <monthPatternWidth type="wide">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                        </monthPatternContext>
+                                        <monthPatternContext type="numeric">
+                                                <monthPatternWidth type="all">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                        </monthPatternContext>
+                                        <monthPatternContext type="stand-alone">
+                                                <monthPatternWidth type="abbreviated">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                                <monthPatternWidth type="narrow">
+                                                        <monthPattern type="leap" draft="contributed">{0}b</monthPattern>
+                                                </monthPatternWidth>
+                                                <monthPatternWidth type="wide">
+                                                        <monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+                                                </monthPatternWidth>
+                                        </monthPatternContext>
+                                </monthPatterns>
                                 <cyclicNameSets>
+                                        <cyclicNameSet type="dayParts">
+                                                <cyclicNameContext type="format">
+                                                        <cyclicNameWidth type="abbreviated">
+                                                                <cyclicName type="1" draft="contributed">zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="narrow">
+                                                                <cyclicName type="1" draft="contributed">zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="wide">
+                                                                <cyclicName type="1" draft="contributed">zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                </cyclicNameContext>
+                                        </cyclicNameSet>
+                                        <cyclicNameSet type="days">
+                                                <cyclicNameContext type="format">
+                                                        <cyclicNameWidth type="abbreviated">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="narrow">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="wide">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                </cyclicNameContext>
+                                        </cyclicNameSet>
+                                        <cyclicNameSet type="months">
+                                                <cyclicNameContext type="format">
+                                                        <cyclicNameWidth type="abbreviated">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="narrow">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="wide">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                </cyclicNameContext>
+                                        </cyclicNameSet>
                                         <cyclicNameSet type="solarTerms">
                                                 <cyclicNameContext type="format">
                                                         <cyclicNameWidth type="abbreviated">
                                                                 <cyclicName type="1" draft="contributed">begin van de lente</cyclicName>
                                                                 <cyclicName type="2" draft="contributed">regenwater</cyclicName>

@@ -2268,10 +3347,200 @@
                                                                 <cyclicName type="23" draft="contributed">koel</cyclicName>
                                                                 <cyclicName type="24" draft="contributed">koud</cyclicName>
                                                         </cyclicNameWidth>
                                                 </cyclicNameContext>
                                         </cyclicNameSet>
+                                        <cyclicNameSet type="years">
+                                                <cyclicNameContext type="format">
+                                                        <cyclicNameWidth type="abbreviated">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="narrow">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                        <cyclicNameWidth type="wide">
+                                                                <cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+                                                                <cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+                                                                <cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+                                                                <cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+                                                                <cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+                                                                <cyclicName type="6" draft="contributed">ji-si</cyclicName>
+                                                                <cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+                                                                <cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+                                                                <cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+                                                                <cyclicName type="10" draft="contributed">gui-you</cyclicName>
+                                                                <cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+                                                                <cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+                                                                <cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+                                                                <cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+                                                                <cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+                                                                <cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+                                                                <cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+                                                                <cyclicName type="18" draft="contributed">xin-si</cyclicName>
+                                                                <cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+                                                                <cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+                                                                <cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+                                                                <cyclicName type="22" draft="contributed">yi-you</cyclicName>
+                                                                <cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+                                                                <cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+                                                                <cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+                                                                <cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+                                                                <cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+                                                                <cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+                                                                <cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+                                                                <cyclicName type="30" draft="contributed">gui-si</cyclicName>
+                                                                <cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+                                                                <cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+                                                                <cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+                                                                <cyclicName type="34" draft="contributed">ding-you</cyclicName>
+                                                                <cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+                                                                <cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+                                                                <cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+                                                                <cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+                                                                <cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+                                                                <cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+                                                                <cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+                                                                <cyclicName type="42" draft="contributed">yi-si</cyclicName>
+                                                                <cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+                                                                <cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+                                                                <cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+                                                                <cyclicName type="46" draft="contributed">ji-you</cyclicName>
+                                                                <cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+                                                                <cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+                                                                <cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+                                                                <cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+                                                                <cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+                                                                <cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+                                                                <cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+                                                                <cyclicName type="54" draft="contributed">ding-si</cyclicName>
+                                                                <cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+                                                                <cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+                                                                <cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+                                                                <cyclicName type="58" draft="contributed">xin-you</cyclicName>
+                                                                <cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+                                                                <cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+                                                        </cyclicNameWidth>
+                                                </cyclicNameContext>
+                                        </cyclicNameSet>
                                         <cyclicNameSet type="zodiacs">
                                                 <cyclicNameContext type="format">
                                                         <cyclicNameWidth type="abbreviated">
                                                                 <cyclicName type="1" draft="contributed">Rat</cyclicName>
                                                                 <cyclicName type="2" draft="contributed">Os</cyclicName>

@@ -2315,83 +3584,10 @@
                                                                 <cyclicName type="12" draft="contributed">Varken</cyclicName>
                                                         </cyclicNameWidth>
                                                 </cyclicNameContext>
                                         </cyclicNameSet>
                                 </cyclicNameSets>
-                                <dateFormats>
-                                        <dateFormatLength type="full">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">EEEE d MMMM r (U)</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="long">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">d MMMM r (U)</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="medium">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">d MMM r</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="short">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">dd-MM-r</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                </dateFormats>
-                                <dateTimeFormats>
-                                        <dateTimeFormatLength type="full">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <dateTimeFormatLength type="long">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <availableFormats>
-                                                <dateFormatItem id="Ed" draft="contributed">E d</dateFormatItem>
-                                                <dateFormatItem id="Gy" draft="contributed">r (U)</dateFormatItem>
-                                                <dateFormatItem id="GyMMM" draft="contributed">MMM r (U)</dateFormatItem>
-                                                <dateFormatItem id="GyMMMd" draft="contributed">d MMM r</dateFormatItem>
-                                                <dateFormatItem id="GyMMMEd" draft="contributed">E d MMM r (U)</dateFormatItem>
-                                                <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
-                                                <dateFormatItem id="MEd" draft="contributed">E d-M</dateFormatItem>
-                                                <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
-                                                <dateFormatItem id="UM" draft="contributed">MM U</dateFormatItem>
-                                                <dateFormatItem id="UMd" draft="contributed">d-MM U</dateFormatItem>
-                                                <dateFormatItem id="UMMM" draft="contributed">MMM U</dateFormatItem>
-                                                <dateFormatItem id="UMMMd" draft="contributed">d MMM U</dateFormatItem>
-                                                <dateFormatItem id="y" draft="contributed">r (U)</dateFormatItem>
-                                                <dateFormatItem id="yMd" draft="contributed">d-M-r</dateFormatItem>
-                                                <dateFormatItem id="yyyy" draft="contributed">r (U)</dateFormatItem>
-                                                <dateFormatItem id="yyyyM" draft="contributed">M-r</dateFormatItem>
-                                                <dateFormatItem id="yyyyMd" draft="contributed">d-M-r</dateFormatItem>
-                                                <dateFormatItem id="yyyyMEd" draft="contributed">E d-M-r</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMM" draft="contributed">MMM r (U)</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMd" draft="contributed">d MMM r</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMEd" draft="contributed">E d MMM r (U)</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM r (U)</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ r (U)</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ r (U)</dateFormatItem>
-                                        </availableFormats>
-                                        <intervalFormats>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                        </intervalFormats>
-                                </dateTimeFormats>
                         </calendar>
                         <calendar type="ethiopic">
                                 <months>
                                         <monthContext type="format">
                                                 <monthWidth type="abbreviated">

@@ -2407,10 +3603,25 @@
                                                         <month type="10" draft="contributed">Säne</month>
                                                         <month type="11" draft="contributed">Hamle</month>
                                                         <month type="12" draft="contributed">Nähase</month>
                                                         <month type="13" draft="contributed">Pagumän</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">Mäskäräm</month>
                                                         <month type="2" draft="contributed">Teqemt</month>
                                                         <month type="3" draft="contributed">Hedar</month>
                                                         <month type="4" draft="contributed">Tahsas</month>

@@ -2439,10 +3650,25 @@
                                                         <month type="10" draft="contributed">Säne</month>
                                                         <month type="11" draft="contributed">Hamle</month>
                                                         <month type="12" draft="contributed">Nähase</month>
                                                         <month type="13" draft="contributed">Pagumän</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">Mäskäräm</month>
                                                         <month type="2" draft="contributed">Teqemt</month>
                                                         <month type="3" draft="contributed">Hedar</month>
                                                         <month type="4" draft="contributed">Tahsas</month>

@@ -2493,18 +3719,41 @@
                                                         <pattern>dd-MM-yy GGGGG</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                 </dateFormats>
                                 <dateTimeFormats>
+                                        <dateTimeFormatLength type="full">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
+                                        <dateTimeFormatLength type="long">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
+                                        <dateTimeFormatLength type="medium">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
+                                        <dateTimeFormatLength type="short">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
                                         <availableFormats>
+                                                <dateFormatItem id="d" draft="contributed">d</dateFormatItem>
                                                 <dateFormatItem id="Ed">E d</dateFormatItem>
                                                 <dateFormatItem id="Gy">y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+                                                <dateFormatItem id="M" draft="contributed">L</dateFormatItem>
                                                 <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
                                                 <dateFormatItem id="MEd">E d-M</dateFormatItem>
+                                                <dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
                                                 <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
                                                 <dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
                                                 <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>

@@ -2517,57 +3766,12 @@
                                                 <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
                                         </availableFormats>
                                         <intervalFormats>
-                                                <intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
+                                                <intervalFormatItem id="d">
+                                                        <greatestDifference id="d" draft="contributed">d–d</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="M">
                                                         <greatestDifference id="M" draft="contributed">M–M</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="Md">

@@ -2730,59 +3934,44 @@
                                                 <dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
                                         </availableFormats>
                                         <intervalFormats>
                                                 <intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
                                                 <intervalFormatItem id="d">
                                                         <greatestDifference id="d">d–d</greatestDifference>
                                                 </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
+                                                <intervalFormatItem id="h">
+                                                        <greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
+                                                        <greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
                                                 </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
+                                                <intervalFormatItem id="H">
+                                                        <greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
                                                 </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
+                                                <intervalFormatItem id="hm">
+                                                        <greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
+                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
+                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm a</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="Hm">
+                                                        <greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
+                                                        <greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="hmv">
+                                                        <greatestDifference id="a" draft="contributed">h:mm a – h:mm a v</greatestDifference>
+                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm a v</greatestDifference>
+                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm a v</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="Hmv">
+                                                        <greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+                                                        <greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="hv">
+                                                        <greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
+                                                        <greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
+                                                </intervalFormatItem>
+                                                <intervalFormatItem id="Hv">
+                                                        <greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="M">
                                                         <greatestDifference id="M">M–M</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="Md">

@@ -3060,32 +4249,32 @@
                                         <dayPeriodContext type="format">
                                                 <dayPeriodWidth type="abbreviated">
                                                         <dayPeriod type="midnight">middernacht</dayPeriod>
                                                         <dayPeriod type="am">a.m.</dayPeriod>
                                                         <dayPeriod type="pm">p.m.</dayPeriod>
-                                                        <dayPeriod type="morning1">’s ochtends</dayPeriod>
-                                                        <dayPeriod type="afternoon1">’s middags</dayPeriod>
-                                                        <dayPeriod type="evening1">’s avonds</dayPeriod>
-                                                        <dayPeriod type="night1">’s nachts</dayPeriod>
+                                                        <dayPeriod type="morning1">‘s ochtends</dayPeriod>
+                                                        <dayPeriod type="afternoon1">‘s middags</dayPeriod>
+                                                        <dayPeriod type="evening1">‘s avonds</dayPeriod>
+                                                        <dayPeriod type="night1">‘s nachts</dayPeriod>
                                                 </dayPeriodWidth>
                                                 <dayPeriodWidth type="narrow">
                                                         <dayPeriod type="midnight">middernacht</dayPeriod>
                                                         <dayPeriod type="am">a.m.</dayPeriod>
                                                         <dayPeriod type="pm">p.m.</dayPeriod>
-                                                        <dayPeriod type="morning1">’s ochtends</dayPeriod>
-                                                        <dayPeriod type="afternoon1">’s middags</dayPeriod>
-                                                        <dayPeriod type="evening1">’s avonds</dayPeriod>
-                                                        <dayPeriod type="night1">’s nachts</dayPeriod>
+                                                        <dayPeriod type="morning1">‘s ochtends</dayPeriod>
+                                                        <dayPeriod type="afternoon1">‘s middags</dayPeriod>
+                                                        <dayPeriod type="evening1">‘s avonds</dayPeriod>
+                                                        <dayPeriod type="night1">‘s nachts</dayPeriod>
                                                 </dayPeriodWidth>
                                                 <dayPeriodWidth type="wide">
                                                         <dayPeriod type="midnight">middernacht</dayPeriod>
                                                         <dayPeriod type="am">a.m.</dayPeriod>
                                                         <dayPeriod type="pm">p.m.</dayPeriod>
-                                                        <dayPeriod type="morning1">’s ochtends</dayPeriod>
-                                                        <dayPeriod type="afternoon1">’s middags</dayPeriod>
-                                                        <dayPeriod type="evening1">’s avonds</dayPeriod>
-                                                        <dayPeriod type="night1">’s nachts</dayPeriod>
+                                                        <dayPeriod type="morning1">‘s ochtends</dayPeriod>
+                                                        <dayPeriod type="afternoon1">‘s middags</dayPeriod>
+                                                        <dayPeriod type="evening1">‘s avonds</dayPeriod>
+                                                        <dayPeriod type="night1">‘s nachts</dayPeriod>
                                                 </dayPeriodWidth>
                                         </dayPeriodContext>
                                         <dayPeriodContext type="stand-alone">
                                                 <dayPeriodWidth type="abbreviated">
                                                         <dayPeriod type="midnight">middernacht</dayPeriod>

@@ -3152,14 +4341,36 @@
                                                         <pattern>d MMM y</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                         <dateFormatLength type="short">
                                                 <dateFormat>
-                                                        <pattern>dd-MM-y</pattern>
+                                                        <pattern>dd-MM-yy</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                 </dateFormats>
+                                <timeFormats>
+                                        <timeFormatLength type="full">
+                                                <timeFormat>
+                                                        <pattern>HH:mm:ss zzzz</pattern>
+                                                </timeFormat>
+                                        </timeFormatLength>
+                                        <timeFormatLength type="long">
+                                                <timeFormat>
+                                                        <pattern>HH:mm:ss z</pattern>
+                                                </timeFormat>
+                                        </timeFormatLength>
+                                        <timeFormatLength type="medium">
+                                                <timeFormat>
+                                                        <pattern>HH:mm:ss</pattern>
+                                                </timeFormat>
+                                        </timeFormatLength>
+                                        <timeFormatLength type="short">
+                                                <timeFormat>
+                                                        <pattern>HH:mm</pattern>
+                                                </timeFormat>
+                                        </timeFormatLength>
+                                </timeFormats>
                                 <dateTimeFormats>
                                         <dateTimeFormatLength type="full">
                                                 <dateTimeFormat>
                                                         <pattern>{1} 'om' {0}</pattern>
                                                 </dateTimeFormat>

@@ -3211,12 +4422,12 @@
                                                 <dateFormatItem id="MEd">E d-M</dateFormatItem>
                                                 <dateFormatItem id="MMM">LLL</dateFormatItem>
                                                 <dateFormatItem id="MMMd">d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-                                                <dateFormatItem id="MMMMW" count="one">'week' W 'van' MMMM</dateFormatItem>
-                                                <dateFormatItem id="MMMMW" count="other">'week' W 'van' MMMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMW" count="one">'week' W 'van' MMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMW" count="other">'week' W 'van' MMM</dateFormatItem>
                                                 <dateFormatItem id="ms">mm:ss</dateFormatItem>
                                                 <dateFormatItem id="y">y</dateFormatItem>
                                                 <dateFormatItem id="yM">M-y</dateFormatItem>
                                                 <dateFormatItem id="yMd">d-M-y</dateFormatItem>
                                                 <dateFormatItem id="yMEd">E d-M-y</dateFormatItem>

@@ -3232,60 +4443,13 @@
                                         <appendItems>
                                                 <appendItem request="Timezone">{0} {1}</appendItem>
                                         </appendItems>
                                         <intervalFormats>
                                                 <intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
                                                 <intervalFormatItem id="d">
                                                         <greatestDifference id="d">d–d</greatestDifference>
                                                 </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
                                                 <intervalFormatItem id="h">
                                                         <greatestDifference id="a">h a – h a</greatestDifference>
                                                         <greatestDifference id="h">h–h a</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="H">

@@ -3396,10 +4560,26 @@
                                                         <month type="10">Sivan</month>
                                                         <month type="11">Tammoez</month>
                                                         <month type="12">Av</month>
                                                         <month type="13">Elloel</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="7" yeartype="leap" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1">Tisjrie</month>
                                                         <month type="2">Chesjwan</month>
                                                         <month type="3">Kislev</month>
                                                         <month type="4">Tevet</month>

@@ -3430,10 +4610,26 @@
                                                         <month type="10">Sivan</month>
                                                         <month type="11">Tammoez</month>
                                                         <month type="12">Av</month>
                                                         <month type="13">Elloel</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="7" yeartype="leap" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1">Tisjrie</month>
                                                         <month type="2">Chesjwan</month>
                                                         <month type="3">Kislev</month>
                                                         <month type="4">Tevet</month>

@@ -3448,10 +4644,21 @@
                                                         <month type="12">Av</month>
                                                         <month type="13">Elloel</month>
                                                 </monthWidth>
                                         </monthContext>
                                 </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">AM</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">AM</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">AM</era>
+                                        </eraNarrow>
+                                </eras>
                                 <dateFormats>
                                         <dateFormatLength type="full">
                                                 <dateFormat>
                                                         <pattern>EEEE d MMMM y G</pattern>
                                                 </dateFormat>

@@ -3470,155 +4677,10 @@
                                                 <dateFormat>
                                                         <pattern>dd-MM-yy GGGGG</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                 </dateFormats>
-                                <dateTimeFormats>
-                                        <dateTimeFormatLength type="full">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <dateTimeFormatLength type="long">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <availableFormats>
-                                                <dateFormatItem id="Ed" draft="contributed">E d</dateFormatItem>
-                                                <dateFormatItem id="Gy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMd" draft="contributed">d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMEd" draft="contributed">E d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="Md" draft="contributed">d MMM</dateFormatItem>
-                                                <dateFormatItem id="MEd" draft="contributed">E d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
-                                                <dateFormatItem id="y" draft="contributed">y</dateFormatItem>
-                                                <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyM" draft="contributed">M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMd" draft="contributed">d-M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMEd" draft="contributed">E d-M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMd" draft="contributed">d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMEd" draft="contributed">E d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
-                                        </availableFormats>
-                                        <intervalFormats>
-                                                <intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="M">
-                                                        <greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Md">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="y">
-                                                        <greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yM">
-                                                        <greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMd">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMMM y – MMMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                        </intervalFormats>
-                                </dateTimeFormats>
                         </calendar>
                         <calendar type="indian">
                                 <months>
                                         <monthContext type="format">
                                                 <monthWidth type="abbreviated">

@@ -3633,10 +4695,24 @@
                                                         <month type="9" draft="contributed">Agrahayana</month>
                                                         <month type="10" draft="contributed">Pausha</month>
                                                         <month type="11" draft="contributed">Maagha</month>
                                                         <month type="12" draft="contributed">Phaalguna</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">Chaitra</month>
                                                         <month type="2" draft="contributed">Vaishakha</month>
                                                         <month type="3" draft="contributed">Jyeshtha</month>
                                                         <month type="4" draft="contributed">Aashaadha</month>

@@ -3663,10 +4739,24 @@
                                                         <month type="9" draft="contributed">Agrahayana</month>
                                                         <month type="10" draft="contributed">Pausha</month>
                                                         <month type="11" draft="contributed">Maagha</month>
                                                         <month type="12" draft="contributed">Phaalguna</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1" draft="contributed">Chaitra</month>
                                                         <month type="2" draft="contributed">Vaishakha</month>
                                                         <month type="3" draft="contributed">Jyeshtha</month>
                                                         <month type="4" draft="contributed">Aashaadha</month>

@@ -3679,177 +4769,21 @@
                                                         <month type="11" draft="contributed">Maagha</month>
                                                         <month type="12" draft="contributed">Phaalguna</month>
                                                 </monthWidth>
                                         </monthContext>
                                 </months>
-                                <dateFormats>
-                                        <dateFormatLength type="full">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">EEEE d MMMM y G</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="long">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">d MMMM y G</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="medium">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">d MMM y G</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="short">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">dd-MM-yy GGGGG</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                </dateFormats>
-                                <dateTimeFormats>
-                                        <dateTimeFormatLength type="full">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <dateTimeFormatLength type="long">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <availableFormats>
-                                                <dateFormatItem id="Ed" draft="contributed">E d</dateFormatItem>
-                                                <dateFormatItem id="Gy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMd" draft="contributed">d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMEd" draft="contributed">E d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
-                                                <dateFormatItem id="MEd" draft="contributed">E d-M</dateFormatItem>
-                                                <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
-                                                <dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyM" draft="contributed">M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMd" draft="contributed">d-M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMEd" draft="contributed">E d-M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMd" draft="contributed">d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMEd" draft="contributed">E d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
-                                        </availableFormats>
-                                        <intervalFormats>
-                                                <intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="M">
-                                                        <greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Md">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="y">
-                                                        <greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yM">
-                                                        <greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMd">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMMM y – MMMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                        </intervalFormats>
-                                </dateTimeFormats>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">Saka</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0">Saka</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">Saka</era>
+                                        </eraNarrow>
+                                </eras>
                         </calendar>
                         <calendar type="islamic">
                                 <months>
                                         <monthContext type="format">
                                                 <monthWidth type="abbreviated">

@@ -3864,10 +4798,24 @@
                                                         <month type="9">Ram.</month>
                                                         <month type="10">Sjaw.</month>
                                                         <month type="11">Doe al k.</month>
                                                         <month type="12">Doe al h.</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1">1</month>
+                                                        <month type="2">2</month>
+                                                        <month type="3">3</month>
+                                                        <month type="4">4</month>
+                                                        <month type="5">5</month>
+                                                        <month type="6">6</month>
+                                                        <month type="7">7</month>
+                                                        <month type="8">8</month>
+                                                        <month type="9">9</month>
+                                                        <month type="10">10</month>
+                                                        <month type="11">11</month>
+                                                        <month type="12">12</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1">Moeharram</month>
                                                         <month type="2">Safar</month>
                                                         <month type="3">Rabiʻa al awal</month>
                                                         <month type="4">Rabiʻa al thani</month>

@@ -3894,10 +4842,24 @@
                                                         <month type="9">Ram.</month>
                                                         <month type="10">Sjaw.</month>
                                                         <month type="11">Doe al k.</month>
                                                         <month type="12">Doe al h.</month>
                                                 </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1">1</month>
+                                                        <month type="2">2</month>
+                                                        <month type="3">3</month>
+                                                        <month type="4">4</month>
+                                                        <month type="5">5</month>
+                                                        <month type="6">6</month>
+                                                        <month type="7">7</month>
+                                                        <month type="8">8</month>
+                                                        <month type="9">9</month>
+                                                        <month type="10">10</month>
+                                                        <month type="11">11</month>
+                                                        <month type="12">12</month>
+                                                </monthWidth>
                                                 <monthWidth type="wide">
                                                         <month type="1">Moeharram</month>
                                                         <month type="2">Safar</month>
                                                         <month type="3">Rabiʻa al awal</month>
                                                         <month type="4">Rabiʻa al thani</month>

@@ -3914,10 +4876,16 @@
                                 </months>
                                 <eras>
                                         <eraNames>
                                                 <era type="0">Saʻna Hizjria</era>
                                         </eraNames>
+                                        <eraAbbr>
+                                                <era type="0">AH</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">AH</era>
+                                        </eraNarrow>
                                 </eras>
                                 <dateFormats>
                                         <dateFormatLength type="full">
                                                 <dateFormat>
                                                         <pattern>EEEE d MMMM y G</pattern>

@@ -3938,28 +4906,21 @@
                                                         <pattern>dd-MM-yy GGGGG</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                 </dateFormats>
                                 <dateTimeFormats>
-                                        <dateTimeFormatLength type="full">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <dateTimeFormatLength type="long">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
                                         <availableFormats>
+                                                <dateFormatItem id="d" draft="contributed">d</dateFormatItem>
                                                 <dateFormatItem id="Ed">E d</dateFormatItem>
                                                 <dateFormatItem id="Gy">y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+                                                <dateFormatItem id="M" draft="contributed">L</dateFormatItem>
                                                 <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
                                                 <dateFormatItem id="MEd">E d-M</dateFormatItem>
+                                                <dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
                                                 <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
                                                 <dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
                                                 <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>

@@ -3971,212 +4932,562 @@
                                                 <dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
                                         </availableFormats>
-                                        <intervalFormats>
-                                                <intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="M">
-                                                        <greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Md">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="y">
-                                                        <greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yM">
-                                                        <greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMd">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMMM y – MMMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                        </intervalFormats>
                                 </dateTimeFormats>
                         </calendar>
                         <calendar type="japanese">
                                 <eras>
                                         <eraNames>
+                                                <era type="0" draft="contributed">Taika (645–650)</era>
+                                                <era type="1" draft="contributed">Hakuchi (650–671)</era>
+                                                <era type="2" draft="contributed">Hakuhō (672–686)</era>
+                                                <era type="3" draft="contributed">Shuchō (686–701)</era>
+                                                <era type="4" draft="contributed">Taihō (701–704)</era>
+                                                <era type="5" draft="contributed">Keiun (704–708)</era>
+                                                <era type="6" draft="contributed">Wadō (708–715)</era>
+                                                <era type="7" draft="contributed">Reiki (715–717)</era>
+                                                <era type="8" draft="contributed">Yōrō (717–724)</era>
+                                                <era type="9" draft="contributed">Jinki (724–729)</era>
+                                                <era type="10" draft="contributed">Tenpyō (729–749)</era>
                                                 <era type="11" draft="contributed">Tenpyō-kampō (749-749)</era>
                                                 <era type="12" draft="contributed">Tenpyō-shōhō (749-757)</era>
                                                 <era type="13" draft="contributed">Tenpyō-hōji (757-765)</era>
                                                 <era type="14" draft="contributed">Tenpyō-jingo (765-767)</era>
                                                 <era type="15" draft="contributed">Jingo-keiun (767-770)</era>
+                                                <era type="16" draft="contributed">Hōki (770–780)</era>
                                                 <era type="17" draft="contributed">Ten-ō (781-782)</era>
+                                                <era type="18" draft="contributed">Enryaku (782–806)</era>
+                                                <era type="19" draft="contributed">Daidō (806–810)</era>
+                                                <era type="20" draft="contributed">Kōnin (810–824)</era>
+                                                <era type="21" draft="contributed">Tenchō (824–834)</era>
+                                                <era type="22" draft="contributed">Jōwa (834–848)</era>
+                                                <era type="23" draft="contributed">Kajō (848–851)</era>
+                                                <era type="24" draft="contributed">Ninju (851–854)</era>
+                                                <era type="25" draft="contributed">Saikō (854–857)</era>
                                                 <era type="26" draft="contributed">Ten-an (857-859)</era>
+                                                <era type="27" draft="contributed">Jōgan (859–877)</era>
+                                                <era type="28" draft="contributed">Gangyō (877–885)</era>
+                                                <era type="29" draft="contributed">Ninna (885–889)</era>
+                                                <era type="30" draft="contributed">Kanpyō (889–898)</era>
+                                                <era type="31" draft="contributed">Shōtai (898–901)</era>
+                                                <era type="32" draft="contributed">Engi (901–923)</era>
+                                                <era type="33" draft="contributed">Enchō (923–931)</era>
+                                                <era type="34" draft="contributed">Jōhei (931–938)</era>
+                                                <era type="35" draft="contributed">Tengyō (938–947)</era>
+                                                <era type="36" draft="contributed">Tenryaku (947–957)</era>
+                                                <era type="37" draft="contributed">Tentoku (957–961)</era>
+                                                <era type="38" draft="contributed">Ōwa (961–964)</era>
+                                                <era type="39" draft="contributed">Kōhō (964–968)</era>
+                                                <era type="40" draft="contributed">Anna (968–970)</era>
+                                                <era type="41" draft="contributed">Tenroku (970–973)</era>
+                                                <era type="42" draft="contributed">Ten’en (973–976)</era>
+                                                <era type="43" draft="contributed">Jōgen (976–978)</era>
+                                                <era type="44" draft="contributed">Tengen (978–983)</era>
+                                                <era type="45" draft="contributed">Eikan (983–985)</era>
+                                                <era type="46" draft="contributed">Kanna (985–987)</era>
+                                                <era type="47" draft="contributed">Eien (987–989)</era>
+                                                <era type="48" draft="contributed">Eiso (989–990)</era>
+                                                <era type="49" draft="contributed">Shōryaku (990–995)</era>
+                                                <era type="50" draft="contributed">Chōtoku (995–999)</era>
+                                                <era type="51" draft="contributed">Chōhō (999–1004)</era>
+                                                <era type="52" draft="contributed">Kankō (1004–1012)</era>
+                                                <era type="53" draft="contributed">Chōwa (1012–1017)</era>
+                                                <era type="54" draft="contributed">Kannin (1017–1021)</era>
+                                                <era type="55" draft="contributed">Jian (1021–1024)</era>
+                                                <era type="56" draft="contributed">Manju (1024–1028)</era>
+                                                <era type="57" draft="contributed">Chōgen (1028–1037)</era>
+                                                <era type="58" draft="contributed">Chōryaku (1037–1040)</era>
+                                                <era type="59" draft="contributed">Chōkyū (1040–1044)</era>
+                                                <era type="60" draft="contributed">Kantoku (1044–1046)</era>
+                                                <era type="61" draft="contributed">Eishō (1046–1053)</era>
+                                                <era type="62" draft="contributed">Tengi (1053–1058)</era>
+                                                <era type="63" draft="contributed">Kōhei (1058–1065)</era>
+                                                <era type="64" draft="contributed">Jiryaku (1065–1069)</era>
+                                                <era type="65" draft="contributed">Enkyū (1069–1074)</era>
+                                                <era type="66" draft="contributed">Shōho (1074–1077)</era>
+                                                <era type="67" draft="contributed">Shōryaku (1077–1081)</era>
+                                                <era type="68" draft="contributed">Eihō (1081–1084)</era>
+                                                <era type="69" draft="contributed">Ōtoku (1084–1087)</era>
+                                                <era type="70" draft="contributed">Kanji (1087–1094)</era>
                                                 <era type="71" draft="contributed">Kaho (1094–1096)</era>
+                                                <era type="72" draft="contributed">Eichō (1096–1097)</era>
                                                 <era type="73" draft="contributed">Shōtoku (1097–1099)</era>
+                                                <era type="74" draft="contributed">Kōwa (1099–1104)</era>
+                                                <era type="75" draft="contributed">Chōji (1104–1106)</era>
+                                                <era type="76" draft="contributed">Kashō (1106–1108)</era>
+                                                <era type="77" draft="contributed">Tennin (1108–1110)</era>
                                                 <era type="78" draft="contributed">Ten-ei (1110-1113)</era>
+                                                <era type="79" draft="contributed">Eikyū (1113–1118)</era>
                                                 <era type="80" draft="contributed">Gen-ei (1118-1120)</era>
                                                 <era type="81" draft="contributed">Hoan (1120–1124)</era>
+                                                <era type="82" draft="contributed">Tenji (1124–1126)</era>
+                                                <era type="83" draft="contributed">Daiji (1126–1131)</era>
+                                                <era type="84" draft="contributed">Tenshō (1131–1132)</era>
+                                                <era type="85" draft="contributed">Chōshō (1132–1135)</era>
                                                 <era type="86" draft="contributed">Hoen (1135–1141)</era>
+                                                <era type="87" draft="contributed">Eiji (1141–1142)</era>
+                                                <era type="88" draft="contributed">Kōji (1142–1144)</era>
+                                                <era type="89" draft="contributed">Ten’yō (1144–1145)</era>
+                                                <era type="90" draft="contributed">Kyūan (1145–1151)</era>
+                                                <era type="91" draft="contributed">Ninpei (1151–1154)</era>
+                                                <era type="92" draft="contributed">Kyūju (1154–1156)</era>
                                                 <era type="93" draft="contributed">Hogen (1156–1159)</era>
+                                                <era type="94" draft="contributed">Heiji (1159–1160)</era>
+                                                <era type="95" draft="contributed">Eiryaku (1160–1161)</era>
+                                                <era type="96" draft="contributed">Ōho (1161–1163)</era>
+                                                <era type="97" draft="contributed">Chōkan (1163–1165)</era>
+                                                <era type="98" draft="contributed">Eiman (1165–1166)</era>
+                                                <era type="99" draft="contributed">Nin’an (1166–1169)</era>
+                                                <era type="100" draft="contributed">Kaō (1169–1171)</era>
+                                                <era type="101" draft="contributed">Shōan (1171–1175)</era>
+                                                <era type="102" draft="contributed">Angen (1175–1177)</era>
+                                                <era type="103" draft="contributed">Jishō (1177–1181)</era>
+                                                <era type="104" draft="contributed">Yōwa (1181–1182)</era>
+                                                <era type="105" draft="contributed">Juei (1182–1184)</era>
+                                                <era type="106" draft="contributed">Genryaku (1184–1185)</era>
+                                                <era type="107" draft="contributed">Bunji (1185–1190)</era>
+                                                <era type="108" draft="contributed">Kenkyū (1190–1199)</era>
+                                                <era type="109" draft="contributed">Shōji (1199–1201)</era>
+                                                <era type="110" draft="contributed">Kennin (1201–1204)</era>
+                                                <era type="111" draft="contributed">Genkyū (1204–1206)</era>
                                                 <era type="112" draft="contributed">Ken-ei (1206-1207)</era>
                                                 <era type="113" draft="contributed">Shōgen (1207–1211)</era>
+                                                <era type="114" draft="contributed">Kenryaku (1211–1213)</era>
+                                                <era type="115" draft="contributed">Kenpō (1213–1219)</era>
                                                 <era type="116" draft="contributed">Shōkyū (1219–1222)</era>
+                                                <era type="117" draft="contributed">Jōō (1222–1224)</era>
+                                                <era type="118" draft="contributed">Gennin (1224–1225)</era>
+                                                <era type="119" draft="contributed">Karoku (1225–1227)</era>
+                                                <era type="120" draft="contributed">Antei (1227–1229)</era>
+                                                <era type="121" draft="contributed">Kanki (1229–1232)</era>
+                                                <era type="122" draft="contributed">Jōei (1232–1233)</era>
                                                 <era type="123" draft="contributed">Tempuku (1233–1234)</era>
+                                                <era type="124" draft="contributed">Bunryaku (1234–1235)</era>
+                                                <era type="125" draft="contributed">Katei (1235–1238)</era>
+                                                <era type="126" draft="contributed">Ryakunin (1238–1239)</era>
                                                 <era type="127" draft="contributed">En-ō (1239-1240)</era>
+                                                <era type="128" draft="contributed">Ninji (1240–1243)</era>
+                                                <era type="129" draft="contributed">Kangen (1243–1247)</era>
+                                                <era type="130" draft="contributed">Hōji (1247–1249)</era>
+                                                <era type="131" draft="contributed">Kenchō (1249–1256)</era>
+                                                <era type="132" draft="contributed">Kōgen (1256–1257)</era>
+                                                <era type="133" draft="contributed">Shōka (1257–1259)</era>
+                                                <era type="134" draft="contributed">Shōgen (1259–1260)</era>
                                                 <era type="135" draft="contributed">Bun-ō (1260-1261)</era>
+                                                <era type="136" draft="contributed">Kōchō (1261–1264)</era>
                                                 <era type="137" draft="contributed">Bun-ei (1264-1275)</era>
+                                                <era type="138" draft="contributed">Kenji (1275–1278)</era>
+                                                <era type="139" draft="contributed">Kōan (1278–1288)</era>
+                                                <era type="140" draft="contributed">Shōō (1288–1293)</era>
+                                                <era type="141" draft="contributed">Einin (1293–1299)</era>
+                                                <era type="142" draft="contributed">Shōan (1299–1302)</era>
+                                                <era type="143" draft="contributed">Kengen (1302–1303)</era>
+                                                <era type="144" draft="contributed">Kagen (1303–1306)</era>
+                                                <era type="145" draft="contributed">Tokuji (1306–1308)</era>
                                                 <era type="146" draft="contributed">Enkei (1308–1311)</era>
+                                                <era type="147" draft="contributed">Ōchō (1311–1312)</era>
+                                                <era type="148" draft="contributed">Shōwa (1312–1317)</era>
+                                                <era type="149" draft="contributed">Bunpō (1317–1319)</era>
+                                                <era type="150" draft="contributed">Genō (1319–1321)</era>
                                                 <era type="151" draft="contributed">Genkyō (1321–1324)</era>
+                                                <era type="152" draft="contributed">Shōchū (1324–1326)</era>
                                                 <era type="153" draft="contributed">Kareki (1326–1329)</era>
+                                                <era type="154" draft="contributed">Gentoku (1329–1331)</era>
+                                                <era type="155" draft="contributed">Genkō (1331–1334)</era>
                                                 <era type="156" draft="contributed">Kemmu (1334–1336)</era>
+                                                <era type="157" draft="contributed">Engen (1336–1340)</era>
+                                                <era type="158" draft="contributed">Kōkoku (1340–1346)</era>
+                                                <era type="159" draft="contributed">Shōhei (1346–1370)</era>
+                                                <era type="160" draft="contributed">Kentoku (1370–1372)</era>
+                                                <era type="161" draft="contributed">Bunchū (1372–1375)</era>
+                                                <era type="162" draft="contributed">Tenju (1375–1379)</era>
+                                                <era type="163" draft="contributed">Kōryaku (1379–1381)</era>
+                                                <era type="164" draft="contributed">Kōwa (1381–1384)</era>
+                                                <era type="165" draft="contributed">Genchū (1384–1392)</era>
+                                                <era type="166" draft="contributed">Meitoku (1384–1387)</era>
+                                                <era type="167" draft="contributed">Kakei (1387–1389)</era>
+                                                <era type="168" draft="contributed">Kōō (1389–1390)</era>
+                                                <era type="169" draft="contributed">Meitoku (1390–1394)</era>
+                                                <era type="170" draft="contributed">Ōei (1394–1428)</era>
+                                                <era type="171" draft="contributed">Shōchō (1428–1429)</era>
+                                                <era type="172" draft="contributed">Eikyō (1429–1441)</era>
+                                                <era type="173" draft="contributed">Kakitsu (1441–1444)</era>
                                                 <era type="174" draft="contributed">Bun-an (1444-1449)</era>
+                                                <era type="175" draft="contributed">Hōtoku (1449–1452)</era>
+                                                <era type="176" draft="contributed">Kyōtoku (1452–1455)</era>
+                                                <era type="177" draft="contributed">Kōshō (1455–1457)</era>
+                                                <era type="178" draft="contributed">Chōroku (1457–1460)</era>
+                                                <era type="179" draft="contributed">Kanshō (1460–1466)</era>
+                                                <era type="180" draft="contributed">Bunshō (1466–1467)</era>
+                                                <era type="181" draft="contributed">Ōnin (1467–1469)</era>
+                                                <era type="182" draft="contributed">Bunmei (1469–1487)</era>
+                                                <era type="183" draft="contributed">Chōkyō (1487–1489)</era>
+                                                <era type="184" draft="contributed">Entoku (1489–1492)</era>
+                                                <era type="185" draft="contributed">Meiō (1492–1501)</era>
+                                                <era type="186" draft="contributed">Bunki (1501–1504)</era>
+                                                <era type="187" draft="contributed">Eishō (1504–1521)</era>
+                                                <era type="188" draft="contributed">Taiei (1521–1528)</era>
+                                                <era type="189" draft="contributed">Kyōroku (1528–1532)</era>
                                                 <era type="190" draft="contributed">Tenmon (1532–1555)</era>
+                                                <era type="191" draft="contributed">Kōji (1555–1558)</era>
+                                                <era type="192" draft="contributed">Eiroku (1558–1570)</era>
+                                                <era type="193" draft="contributed">Genki (1570–1573)</era>
+                                                <era type="194" draft="contributed">Tenshō (1573–1592)</era>
+                                                <era type="195" draft="contributed">Bunroku (1592–1596)</era>
+                                                <era type="196" draft="contributed">Keichō (1596–1615)</era>
                                                 <era type="197" draft="contributed">Genwa (1615–1624)</era>
                                                 <era type="198" draft="contributed">Kan-ei (1624-1644)</era>
+                                                <era type="199" draft="contributed">Shōho (1644–1648)</era>
+                                                <era type="200" draft="contributed">Keian (1648–1652)</era>
                                                 <era type="201" draft="contributed">Shōō (1652–1655)</era>
                                                 <era type="202" draft="contributed">Meiryaku (1655–1658)</era>
+                                                <era type="203" draft="contributed">Manji (1658–1661)</era>
+                                                <era type="204" draft="contributed">Kanbun (1661–1673)</era>
+                                                <era type="205" draft="contributed">Enpō (1673–1681)</era>
                                                 <era type="206" draft="contributed">Tenwa (1681–1684)</era>
+                                                <era type="207" draft="contributed">Jōkyō (1684–1688)</era>
+                                                <era type="208" draft="contributed">Genroku (1688–1704)</era>
+                                                <era type="209" draft="contributed">Hōei (1704–1711)</era>
+                                                <era type="210" draft="contributed">Shōtoku (1711–1716)</era>
+                                                <era type="211" draft="contributed">Kyōhō (1716–1736)</era>
+                                                <era type="212" draft="contributed">Genbun (1736–1741)</era>
+                                                <era type="213" draft="contributed">Kanpō (1741–1744)</era>
+                                                <era type="214" draft="contributed">Enkyō (1744–1748)</era>
                                                 <era type="215" draft="contributed">Kan-en (1748-1751)</era>
                                                 <era type="216" draft="contributed">Hōryaku (1751–1764)</era>
+                                                <era type="217" draft="contributed">Meiwa (1764–1772)</era>
                                                 <era type="218" draft="contributed">An-ei (1772-1781)</era>
+                                                <era type="219" draft="contributed">Tenmei (1781–1789)</era>
+                                                <era type="220" draft="contributed">Kansei (1789–1801)</era>
+                                                <era type="221" draft="contributed">Kyōwa (1801–1804)</era>
+                                                <era type="222" draft="contributed">Bunka (1804–1818)</era>
+                                                <era type="223" draft="contributed">Bunsei (1818–1830)</era>
+                                                <era type="224" draft="contributed">Tenpō (1830–1844)</era>
+                                                <era type="225" draft="contributed">Kōka (1844–1848)</era>
+                                                <era type="226" draft="contributed">Kaei (1848–1854)</era>
+                                                <era type="227" draft="contributed">Ansei (1854–1860)</era>
                                                 <era type="228" draft="contributed">Man-en (1860-1861)</era>
+                                                <era type="229" draft="contributed">Bunkyū (1861–1864)</era>
+                                                <era type="230" draft="contributed">Genji (1864–1865)</era>
+                                                <era type="231" draft="contributed">Keiō (1865–1868)</era>
+                                                <era type="232" draft="contributed">Meiji</era>
+                                                <era type="233" draft="contributed">Taishō</era>
+                                                <era type="234" draft="contributed">Shōwa</era>
+                                                <era type="235" draft="contributed">Heisei</era>
                                         </eraNames>
                                         <eraAbbr>
+                                                <era type="0" draft="contributed">Taika (645–650)</era>
+                                                <era type="1" draft="contributed">Hakuchi (650–671)</era>
+                                                <era type="2" draft="contributed">Hakuhō (672–686)</era>
+                                                <era type="3" draft="contributed">Shuchō (686–701)</era>
+                                                <era type="4" draft="contributed">Taihō (701–704)</era>
+                                                <era type="5" draft="contributed">Keiun (704–708)</era>
+                                                <era type="6" draft="contributed">Wadō (708–715)</era>
+                                                <era type="7" draft="contributed">Reiki (715–717)</era>
+                                                <era type="8" draft="contributed">Yōrō (717–724)</era>
+                                                <era type="9" draft="contributed">Jinki (724–729)</era>
+                                                <era type="10" draft="contributed">Tenpyō (729–749)</era>
                                                 <era type="11" draft="contributed">Tenpyō-kampō (749-749)</era>
                                                 <era type="12" draft="contributed">Tenpyō-shōhō (749-757)</era>
                                                 <era type="13" draft="contributed">Tenpyō-hōji (757-765)</era>
                                                 <era type="14" draft="contributed">Tenpyō-jingo (765-767)</era>
                                                 <era type="15" draft="contributed">Jingo-keiun (767-770)</era>
+                                                <era type="16" draft="contributed">Hōki (770–780)</era>
                                                 <era type="17" draft="contributed">Ten-ō (781-782)</era>
+                                                <era type="18" draft="contributed">Enryaku (782–806)</era>
+                                                <era type="19" draft="contributed">Daidō (806–810)</era>
+                                                <era type="20" draft="contributed">Kōnin (810–824)</era>
+                                                <era type="21" draft="contributed">Tenchō (824–834)</era>
+                                                <era type="22" draft="contributed">Jōwa (834–848)</era>
+                                                <era type="23" draft="contributed">Kajō (848–851)</era>
+                                                <era type="24" draft="contributed">Ninju (851–854)</era>
+                                                <era type="25" draft="contributed">Saikō (854–857)</era>
                                                 <era type="26" draft="contributed">Ten-an (857-859)</era>
+                                                <era type="27" draft="contributed">Jōgan (859–877)</era>
+                                                <era type="28" draft="contributed">Gangyō (877–885)</era>
+                                                <era type="29" draft="contributed">Ninna (885–889)</era>
+                                                <era type="30" draft="contributed">Kanpyō (889–898)</era>
+                                                <era type="31" draft="contributed">Shōtai (898–901)</era>
+                                                <era type="32" draft="contributed">Engi (901–923)</era>
+                                                <era type="33" draft="contributed">Enchō (923–931)</era>
+                                                <era type="34" draft="contributed">Jōhei (931–938)</era>
+                                                <era type="35" draft="contributed">Tengyō (938–947)</era>
+                                                <era type="36" draft="contributed">Tenryaku (947–957)</era>
+                                                <era type="37" draft="contributed">Tentoku (957–961)</era>
+                                                <era type="38" draft="contributed">Ōwa (961–964)</era>
+                                                <era type="39" draft="contributed">Kōhō (964–968)</era>
+                                                <era type="40" draft="contributed">Anna (968–970)</era>
+                                                <era type="41" draft="contributed">Tenroku (970–973)</era>
+                                                <era type="42" draft="contributed">Ten’en (973–976)</era>
+                                                <era type="43" draft="contributed">Jōgen (976–978)</era>
+                                                <era type="44" draft="contributed">Tengen (978–983)</era>
+                                                <era type="45" draft="contributed">Eikan (983–985)</era>
+                                                <era type="46" draft="contributed">Kanna (985–987)</era>
+                                                <era type="47" draft="contributed">Eien (987–989)</era>
+                                                <era type="48" draft="contributed">Eiso (989–990)</era>
+                                                <era type="49" draft="contributed">Shōryaku (990–995)</era>
+                                                <era type="50" draft="contributed">Chōtoku (995–999)</era>
+                                                <era type="51" draft="contributed">Chōhō (999–1004)</era>
+                                                <era type="52" draft="contributed">Kankō (1004–1012)</era>
+                                                <era type="53" draft="contributed">Chōwa (1012–1017)</era>
+                                                <era type="54" draft="contributed">Kannin (1017–1021)</era>
+                                                <era type="55" draft="contributed">Jian (1021–1024)</era>
+                                                <era type="56" draft="contributed">Manju (1024–1028)</era>
+                                                <era type="57" draft="contributed">Chōgen (1028–1037)</era>
+                                                <era type="58" draft="contributed">Chōryaku (1037–1040)</era>
+                                                <era type="59" draft="contributed">Chōkyū (1040–1044)</era>
+                                                <era type="60" draft="contributed">Kantoku (1044–1046)</era>
+                                                <era type="61" draft="contributed">Eishō (1046–1053)</era>
+                                                <era type="62" draft="contributed">Tengi (1053–1058)</era>
+                                                <era type="63" draft="contributed">Kōhei (1058–1065)</era>
+                                                <era type="64" draft="contributed">Jiryaku (1065–1069)</era>
+                                                <era type="65" draft="contributed">Enkyū (1069–1074)</era>
+                                                <era type="66" draft="contributed">Shōho (1074–1077)</era>
+                                                <era type="67" draft="contributed">Shōryaku (1077–1081)</era>
+                                                <era type="68" draft="contributed">Eihō (1081–1084)</era>
+                                                <era type="69" draft="contributed">Ōtoku (1084–1087)</era>
+                                                <era type="70" draft="contributed">Kanji (1087–1094)</era>
                                                 <era type="71" draft="contributed">Kaho (1094–1096)</era>
+                                                <era type="72" draft="contributed">Eichō (1096–1097)</era>
                                                 <era type="73" draft="contributed">Shōtoku (1097–1099)</era>
+                                                <era type="74" draft="contributed">Kōwa (1099–1104)</era>
+                                                <era type="75" draft="contributed">Chōji (1104–1106)</era>
+                                                <era type="76" draft="contributed">Kashō (1106–1108)</era>
+                                                <era type="77" draft="contributed">Tennin (1108–1110)</era>
                                                 <era type="78" draft="contributed">Ten-ei (1110-1113)</era>
+                                                <era type="79" draft="contributed">Eikyū (1113–1118)</era>
                                                 <era type="80" draft="contributed">Gen-ei (1118-1120)</era>
                                                 <era type="81" draft="contributed">Hoan (1120–1124)</era>
+                                                <era type="82" draft="contributed">Tenji (1124–1126)</era>
+                                                <era type="83" draft="contributed">Daiji (1126–1131)</era>
+                                                <era type="84" draft="contributed">Tenshō (1131–1132)</era>
+                                                <era type="85" draft="contributed">Chōshō (1132–1135)</era>
                                                 <era type="86" draft="contributed">Hoen (1135–1141)</era>
+                                                <era type="87" draft="contributed">Eiji (1141–1142)</era>
+                                                <era type="88" draft="contributed">Kōji (1142–1144)</era>
+                                                <era type="89" draft="contributed">Ten’yō (1144–1145)</era>
+                                                <era type="90" draft="contributed">Kyūan (1145–1151)</era>
+                                                <era type="91" draft="contributed">Ninpei (1151–1154)</era>
+                                                <era type="92" draft="contributed">Kyūju (1154–1156)</era>
                                                 <era type="93" draft="contributed">Hogen (1156–1159)</era>
+                                                <era type="94" draft="contributed">Heiji (1159–1160)</era>
+                                                <era type="95" draft="contributed">Eiryaku (1160–1161)</era>
+                                                <era type="96" draft="contributed">Ōho (1161–1163)</era>
+                                                <era type="97" draft="contributed">Chōkan (1163–1165)</era>
+                                                <era type="98" draft="contributed">Eiman (1165–1166)</era>
+                                                <era type="99" draft="contributed">Nin’an (1166–1169)</era>
+                                                <era type="100" draft="contributed">Kaō (1169–1171)</era>
+                                                <era type="101" draft="contributed">Shōan (1171–1175)</era>
+                                                <era type="102" draft="contributed">Angen (1175–1177)</era>
+                                                <era type="103" draft="contributed">Jishō (1177–1181)</era>
+                                                <era type="104" draft="contributed">Yōwa (1181–1182)</era>
+                                                <era type="105" draft="contributed">Juei (1182–1184)</era>
+                                                <era type="106" draft="contributed">Genryaku (1184–1185)</era>
+                                                <era type="107" draft="contributed">Bunji (1185–1190)</era>
+                                                <era type="108" draft="contributed">Kenkyū (1190–1199)</era>
+                                                <era type="109" draft="contributed">Shōji (1199–1201)</era>
+                                                <era type="110" draft="contributed">Kennin (1201–1204)</era>
+                                                <era type="111" draft="contributed">Genkyū (1204–1206)</era>
                                                 <era type="112" draft="contributed">Ken-ei (1206-1207)</era>
                                                 <era type="113" draft="contributed">Shōgen (1207–1211)</era>
+                                                <era type="114" draft="contributed">Kenryaku (1211–1213)</era>
+                                                <era type="115" draft="contributed">Kenpō (1213–1219)</era>
                                                 <era type="116" draft="contributed">Shōkyū (1219–1222)</era>
+                                                <era type="117" draft="contributed">Jōō (1222–1224)</era>
+                                                <era type="118" draft="contributed">Gennin (1224–1225)</era>
+                                                <era type="119" draft="contributed">Karoku (1225–1227)</era>
+                                                <era type="120" draft="contributed">Antei (1227–1229)</era>
+                                                <era type="121" draft="contributed">Kanki (1229–1232)</era>
+                                                <era type="122" draft="contributed">Jōei (1232–1233)</era>
                                                 <era type="123" draft="contributed">Tempuku (1233–1234)</era>
+                                                <era type="124" draft="contributed">Bunryaku (1234–1235)</era>
+                                                <era type="125" draft="contributed">Katei (1235–1238)</era>
+                                                <era type="126" draft="contributed">Ryakunin (1238–1239)</era>
                                                 <era type="127" draft="contributed">En-ō (1239-1240)</era>
+                                                <era type="128" draft="contributed">Ninji (1240–1243)</era>
+                                                <era type="129" draft="contributed">Kangen (1243–1247)</era>
+                                                <era type="130" draft="contributed">Hōji (1247–1249)</era>
+                                                <era type="131" draft="contributed">Kenchō (1249–1256)</era>
+                                                <era type="132" draft="contributed">Kōgen (1256–1257)</era>
+                                                <era type="133" draft="contributed">Shōka (1257–1259)</era>
+                                                <era type="134" draft="contributed">Shōgen (1259–1260)</era>
                                                 <era type="135" draft="contributed">Bun-ō (1260-1261)</era>
+                                                <era type="136" draft="contributed">Kōchō (1261–1264)</era>
                                                 <era type="137" draft="contributed">Bun-ei (1264-1275)</era>
+                                                <era type="138" draft="contributed">Kenji (1275–1278)</era>
+                                                <era type="139" draft="contributed">Kōan (1278–1288)</era>
+                                                <era type="140" draft="contributed">Shōō (1288–1293)</era>
+                                                <era type="141" draft="contributed">Einin (1293–1299)</era>
+                                                <era type="142" draft="contributed">Shōan (1299–1302)</era>
+                                                <era type="143" draft="contributed">Kengen (1302–1303)</era>
+                                                <era type="144" draft="contributed">Kagen (1303–1306)</era>
+                                                <era type="145" draft="contributed">Tokuji (1306–1308)</era>
                                                 <era type="146" draft="contributed">Enkei (1308–1311)</era>
+                                                <era type="147" draft="contributed">Ōchō (1311–1312)</era>
+                                                <era type="148" draft="contributed">Shōwa (1312–1317)</era>
+                                                <era type="149" draft="contributed">Bunpō (1317–1319)</era>
+                                                <era type="150" draft="contributed">Genō (1319–1321)</era>
                                                 <era type="151" draft="contributed">Genkyō (1321–1324)</era>
+                                                <era type="152" draft="contributed">Shōchū (1324–1326)</era>
                                                 <era type="153" draft="contributed">Kareki (1326–1329)</era>
+                                                <era type="154" draft="contributed">Gentoku (1329–1331)</era>
+                                                <era type="155" draft="contributed">Genkō (1331–1334)</era>
                                                 <era type="156" draft="contributed">Kemmu (1334–1336)</era>
+                                                <era type="157" draft="contributed">Engen (1336–1340)</era>
+                                                <era type="158" draft="contributed">Kōkoku (1340–1346)</era>
+                                                <era type="159" draft="contributed">Shōhei (1346–1370)</era>
+                                                <era type="160" draft="contributed">Kentoku (1370–1372)</era>
+                                                <era type="161" draft="contributed">Bunchū (1372–1375)</era>
+                                                <era type="162" draft="contributed">Tenju (1375–1379)</era>
+                                                <era type="163" draft="contributed">Kōryaku (1379–1381)</era>
+                                                <era type="164" draft="contributed">Kōwa (1381–1384)</era>
+                                                <era type="165" draft="contributed">Genchū (1384–1392)</era>
+                                                <era type="166" draft="contributed">Meitoku (1384–1387)</era>
+                                                <era type="167" draft="contributed">Kakei (1387–1389)</era>
+                                                <era type="168" draft="contributed">Kōō (1389–1390)</era>
+                                                <era type="169" draft="contributed">Meitoku (1390–1394)</era>
+                                                <era type="170" draft="contributed">Ōei (1394–1428)</era>
+                                                <era type="171" draft="contributed">Shōchō (1428–1429)</era>
+                                                <era type="172" draft="contributed">Eikyō (1429–1441)</era>
+                                                <era type="173" draft="contributed">Kakitsu (1441–1444)</era>
                                                 <era type="174" draft="contributed">Bun-an (1444-1449)</era>
+                                                <era type="175" draft="contributed">Hōtoku (1449–1452)</era>
+                                                <era type="176" draft="contributed">Kyōtoku (1452–1455)</era>
+                                                <era type="177" draft="contributed">Kōshō (1455–1457)</era>
+                                                <era type="178" draft="contributed">Chōroku (1457–1460)</era>
+                                                <era type="179" draft="contributed">Kanshō (1460–1466)</era>
+                                                <era type="180" draft="contributed">Bunshō (1466–1467)</era>
+                                                <era type="181" draft="contributed">Ōnin (1467–1469)</era>
+                                                <era type="182" draft="contributed">Bunmei (1469–1487)</era>
+                                                <era type="183" draft="contributed">Chōkyō (1487–1489)</era>
+                                                <era type="184" draft="contributed">Entoku (1489–1492)</era>
+                                                <era type="185" draft="contributed">Meiō (1492–1501)</era>
+                                                <era type="186" draft="contributed">Bunki (1501–1504)</era>
+                                                <era type="187" draft="contributed">Eishō (1504–1521)</era>
+                                                <era type="188" draft="contributed">Taiei (1521–1528)</era>
+                                                <era type="189" draft="contributed">Kyōroku (1528–1532)</era>
                                                 <era type="190" draft="contributed">Tenmon (1532–1555)</era>
+                                                <era type="191" draft="contributed">Kōji (1555–1558)</era>
+                                                <era type="192" draft="contributed">Eiroku (1558–1570)</era>
+                                                <era type="193" draft="contributed">Genki (1570–1573)</era>
+                                                <era type="194" draft="contributed">Tenshō (1573–1592)</era>
+                                                <era type="195" draft="contributed">Bunroku (1592–1596)</era>
+                                                <era type="196" draft="contributed">Keichō (1596–1615)</era>
                                                 <era type="197" draft="contributed">Genwa (1615–1624)</era>
                                                 <era type="198" draft="contributed">Kan-ei (1624-1644)</era>
+                                                <era type="199" draft="contributed">Shōho (1644–1648)</era>
+                                                <era type="200" draft="contributed">Keian (1648–1652)</era>
                                                 <era type="201" draft="contributed">Shōō (1652–1655)</era>
                                                 <era type="202" draft="contributed">Meiryaku (1655–1658)</era>
+                                                <era type="203" draft="contributed">Manji (1658–1661)</era>
+                                                <era type="204" draft="contributed">Kanbun (1661–1673)</era>
+                                                <era type="205" draft="contributed">Enpō (1673–1681)</era>
                                                 <era type="206" draft="contributed">Tenwa (1681–1684)</era>
+                                                <era type="207" draft="contributed">Jōkyō (1684–1688)</era>
+                                                <era type="208" draft="contributed">Genroku (1688–1704)</era>
+                                                <era type="209" draft="contributed">Hōei (1704–1711)</era>
+                                                <era type="210" draft="contributed">Shōtoku (1711–1716)</era>
+                                                <era type="211" draft="contributed">Kyōhō (1716–1736)</era>
+                                                <era type="212" draft="contributed">Genbun (1736–1741)</era>
+                                                <era type="213" draft="contributed">Kanpō (1741–1744)</era>
+                                                <era type="214" draft="contributed">Enkyō (1744–1748)</era>
                                                 <era type="215" draft="contributed">Kan-en (1748-1751)</era>
                                                 <era type="216" draft="contributed">Hōryaku (1751–1764)</era>
+                                                <era type="217" draft="contributed">Meiwa (1764–1772)</era>
                                                 <era type="218" draft="contributed">An-ei (1772-1781)</era>
+                                                <era type="219" draft="contributed">Tenmei (1781–1789)</era>
+                                                <era type="220" draft="contributed">Kansei (1789–1801)</era>
+                                                <era type="221" draft="contributed">Kyōwa (1801–1804)</era>
+                                                <era type="222" draft="contributed">Bunka (1804–1818)</era>
+                                                <era type="223" draft="contributed">Bunsei (1818–1830)</era>
+                                                <era type="224" draft="contributed">Tenpō (1830–1844)</era>
+                                                <era type="225" draft="contributed">Kōka (1844–1848)</era>
+                                                <era type="226" draft="contributed">Kaei (1848–1854)</era>
+                                                <era type="227" draft="contributed">Ansei (1854–1860)</era>
                                                 <era type="228" draft="contributed">Man-en (1860-1861)</era>
+                                                <era type="229" draft="contributed">Bunkyū (1861–1864)</era>
+                                                <era type="230" draft="contributed">Genji (1864–1865)</era>
+                                                <era type="231" draft="contributed">Keiō (1865–1868)</era>
+                                                <era type="232" draft="contributed">Meiji</era>
+                                                <era type="233" draft="contributed">Taishō</era>
+                                                <era type="234" draft="contributed">Shōwa</era>
+                                                <era type="235" draft="contributed">Heisei</era>
                                         </eraAbbr>
                                         <eraNarrow>
+                                                <era type="0" draft="contributed">Taika (645–650)</era>
+                                                <era type="1" draft="contributed">Hakuchi (650–671)</era>
+                                                <era type="2" draft="contributed">Hakuhō (672–686)</era>
+                                                <era type="3" draft="contributed">Shuchō (686–701)</era>
+                                                <era type="4" draft="contributed">Taihō (701–704)</era>
+                                                <era type="5" draft="contributed">Keiun (704–708)</era>
+                                                <era type="6" draft="contributed">Wadō (708–715)</era>
+                                                <era type="7" draft="contributed">Reiki (715–717)</era>
+                                                <era type="8" draft="contributed">Yōrō (717–724)</era>
+                                                <era type="9" draft="contributed">Jinki (724–729)</era>
+                                                <era type="10" draft="contributed">Tenpyō (729–749)</era>
                                                 <era type="11" draft="contributed">Tenpyō-kampō (749-749)</era>
                                                 <era type="12" draft="contributed">Tenpyō-shōhō (749-757)</era>
+                                                <era type="13" draft="contributed">Tenpyō-hōji (757–765)</era>
                                                 <era type="14" draft="contributed">Tenpyō-jingo (765-767)</era>
                                                 <era type="15" draft="contributed">Jingo-keiun (767-770)</era>
+                                                <era type="16" draft="contributed">Hōki (770–780)</era>
                                                 <era type="17" draft="contributed">Ten-ō (781-782)</era>
+                                                <era type="18" draft="contributed">Enryaku (782–806)</era>
+                                                <era type="19" draft="contributed">Daidō (806–810)</era>
+                                                <era type="20" draft="contributed">Kōnin (810–824)</era>
+                                                <era type="21" draft="contributed">Tenchō (824–834)</era>
+                                                <era type="22" draft="contributed">Jōwa (834–848)</era>
+                                                <era type="23" draft="contributed">Kajō (848–851)</era>
+                                                <era type="24" draft="contributed">Ninju (851–854)</era>
+                                                <era type="25" draft="contributed">Saikō (854–857)</era>
                                                 <era type="26" draft="contributed">Ten-an (857-859)</era>
-                                                <era type="146" draft="contributed">Enkei (1308–1311)</era>
-                                                <era type="153" draft="contributed">Kareki (1326–1329)</era>
-                                                <era type="214" draft="contributed">Enkei (1744–1748)</era>
+                                                <era type="27" draft="contributed">Jōgan (859–877)</era>
+                                                <era type="28" draft="contributed">Gangyō (877–885)</era>
+                                                <era type="29" draft="contributed">Ninna (885–889)</era>
+                                                <era type="30" draft="contributed">Kanpyō (889–898)</era>
+                                                <era type="31" draft="contributed">Shōtai (898–901)</era>
+                                                <era type="32" draft="contributed">Engi (901–923)</era>
+                                                <era type="33" draft="contributed">Enchō (923–931)</era>
+                                                <era type="34" draft="contributed">Jōhei (931–938)</era>
+                                                <era type="35" draft="contributed">Tengyō (938–947)</era>
+                                                <era type="36" draft="contributed">Tenryaku (947–957)</era>
+                                                <era type="37" draft="contributed">Tentoku (957–961)</era>
+                                                <era type="38" draft="contributed">Ōwa (961–964)</era>
+                                                <era type="39" draft="contributed">Kōhō (964–968)</era>
+                                                <era type="40" draft="contributed">Anna (968–970)</era>
+                                                <era type="41" draft="contributed">Tenroku (970–973)</era>
+                                                <era type="42" draft="contributed">Ten’en (973–976)</era>
+                                                <era type="43" draft="contributed">Jōgen (976–978)</era>
+                                                <era type="44" draft="contributed">Tengen (978–983)</era>
+                                                <era type="45" draft="contributed">Eikan (983–985)</era>
+                                                <era type="46" draft="contributed">Kanna (985–987)</era>
+                                                <era type="47" draft="contributed">Eien (987–989)</era>
+                                                <era type="48" draft="contributed">Eiso (989–990)</era>
+                                                <era type="49" draft="contributed">Shōryaku (990–995)</era>
+                                                <era type="50" draft="contributed">Chōtoku (995–999)</era>
+                                                <era type="51" draft="contributed">Chōhō (999–1004)</era>
+                                                <era type="52" draft="contributed">Kankō (1004–1012)</era>
+                                                <era type="53" draft="contributed">Chōwa (1012–1017)</era>
+                                                <era type="54" draft="contributed">Kannin (1017–1021)</era>
+                                                <era type="55" draft="contributed">Jian (1021–1024)</era>
+                                                <era type="56" draft="contributed">Manju (1024–1028)</era>
+                                                <era type="57" draft="contributed">Chōgen (1028–1037)</era>
+                                                <era type="58" draft="contributed">Chōryaku (1037–1040)</era>
+                                                <era type="59" draft="contributed">Chōkyū (1040–1044)</era>
+                                                <era type="60" draft="contributed">Kantoku (1044–1046)</era>
+                                                <era type="61" draft="contributed">Eishō (1046–1053)</era>
+                                                <era type="62" draft="contributed">Tengi (1053–1058)</era>
+                                                <era type="63" draft="contributed">Kōhei (1058–1065)</era>
+                                                <era type="64" draft="contributed">Jiryaku (1065–1069)</era>
+                                                <era type="65" draft="contributed">Enkyū (1069–1074)</era>
                                         </eraNarrow>
                                 </eras>
+                                <!-- need some non-empty element here to make inheritance work,
+                                         this copy of generic dateFormats above is smaller than root japanese eras
+                                -->
                                 <dateFormats>
                                         <dateFormatLength type="full">
                                                 <dateFormat>
                                                         <pattern>EEEE d MMMM y G</pattern>
                                                 </dateFormat>

@@ -4196,18 +5507,41 @@
                                                         <pattern>dd-MM-yy GGGGG</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                 </dateFormats>
                                 <dateTimeFormats>
+                                        <dateTimeFormatLength type="full">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
+                                        <dateTimeFormatLength type="long">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
+                                        <dateTimeFormatLength type="medium">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
+                                        <dateTimeFormatLength type="short">
+                                                <dateTimeFormat>
+                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                </dateTimeFormat>
+                                        </dateTimeFormatLength>
                                         <availableFormats>
+                                                <dateFormatItem id="d" draft="contributed">d</dateFormatItem>
                                                 <dateFormatItem id="Ed">E d</dateFormatItem>
                                                 <dateFormatItem id="Gy">y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+                                                <dateFormatItem id="M" draft="contributed">L</dateFormatItem>
                                                 <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
                                                 <dateFormatItem id="MEd">E d-M</dateFormatItem>
+                                                <dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
                                                 <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
                                                 <dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
                                                 <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>

@@ -4219,290 +5553,114 @@
                                                 <dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
                                         </availableFormats>
-                                        <intervalFormats>
-                                                <intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="M">
-                                                        <greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Md">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="y">
-                                                        <greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yM">
-                                                        <greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMd">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMMM y – MMMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                        </intervalFormats>
                                 </dateTimeFormats>
                         </calendar>
                         <calendar type="persian">
-                                <dateFormats>
-                                        <dateFormatLength type="full">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">EEEE d MMMM y G</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="long">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">d MMMM y G</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="medium">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">d MMM y G</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                        <dateFormatLength type="short">
-                                                <dateFormat>
-                                                        <pattern draft="contributed">dd-MM-yy GGGGG</pattern>
-                                                </dateFormat>
-                                        </dateFormatLength>
-                                </dateFormats>
-                                <dateTimeFormats>
-                                        <dateTimeFormatLength type="full">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <dateTimeFormatLength type="long">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <availableFormats>
-                                                <dateFormatItem id="Ed" draft="contributed">E d</dateFormatItem>
-                                                <dateFormatItem id="Gy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMd" draft="contributed">d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMEd" draft="contributed">E d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
-                                                <dateFormatItem id="MEd" draft="contributed">E d-M</dateFormatItem>
-                                                <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
-                                                <dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyM" draft="contributed">M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMd" draft="contributed">d-M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMEd" draft="contributed">E d-M-y GGGGG</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMd" draft="contributed">d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMEd" draft="contributed">E d MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
-                                        </availableFormats>
-                                        <intervalFormats>
-                                                <intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="M">
-                                                        <greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Md">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="y">
-                                                        <greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yM">
-                                                        <greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMd">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMMM y – MMMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                        </intervalFormats>
-                                </dateTimeFormats>
+                                <months>
+                                        <monthContext type="format">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Farvardin</month>
+                                                        <month type="2" draft="contributed">Ordibehesht</month>
+                                                        <month type="3" draft="contributed">Khordad</month>
+                                                        <month type="4" draft="contributed">Tir</month>
+                                                        <month type="5" draft="contributed">Mordad</month>
+                                                        <month type="6" draft="contributed">Shahrivar</month>
+                                                        <month type="7" draft="contributed">Mehr</month>
+                                                        <month type="8" draft="contributed">Aban</month>
+                                                        <month type="9" draft="contributed">Azar</month>
+                                                        <month type="10" draft="contributed">Dey</month>
+                                                        <month type="11" draft="contributed">Bahman</month>
+                                                        <month type="12" draft="contributed">Esfand</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Farvardin</month>
+                                                        <month type="2" draft="contributed">Ordibehesht</month>
+                                                        <month type="3" draft="contributed">Khordad</month>
+                                                        <month type="4" draft="contributed">Tir</month>
+                                                        <month type="5" draft="contributed">Mordad</month>
+                                                        <month type="6" draft="contributed">Shahrivar</month>
+                                                        <month type="7" draft="contributed">Mehr</month>
+                                                        <month type="8" draft="contributed">Aban</month>
+                                                        <month type="9" draft="contributed">Azar</month>
+                                                        <month type="10" draft="contributed">Dey</month>
+                                                        <month type="11" draft="contributed">Bahman</month>
+                                                        <month type="12" draft="contributed">Esfand</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Farvardin</month>
+                                                        <month type="2" draft="contributed">Ordibehesht</month>
+                                                        <month type="3" draft="contributed">Khordad</month>
+                                                        <month type="4" draft="contributed">Tir</month>
+                                                        <month type="5" draft="contributed">Mordad</month>
+                                                        <month type="6" draft="contributed">Shahrivar</month>
+                                                        <month type="7" draft="contributed">Mehr</month>
+                                                        <month type="8" draft="contributed">Aban</month>
+                                                        <month type="9" draft="contributed">Azar</month>
+                                                        <month type="10" draft="contributed">Dey</month>
+                                                        <month type="11" draft="contributed">Bahman</month>
+                                                        <month type="12" draft="contributed">Esfand</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Farvardin</month>
+                                                        <month type="2" draft="contributed">Ordibehesht</month>
+                                                        <month type="3" draft="contributed">Khordad</month>
+                                                        <month type="4" draft="contributed">Tir</month>
+                                                        <month type="5" draft="contributed">Mordad</month>
+                                                        <month type="6" draft="contributed">Shahrivar</month>
+                                                        <month type="7" draft="contributed">Mehr</month>
+                                                        <month type="8" draft="contributed">Aban</month>
+                                                        <month type="9" draft="contributed">Azar</month>
+                                                        <month type="10" draft="contributed">Dey</month>
+                                                        <month type="11" draft="contributed">Bahman</month>
+                                                        <month type="12" draft="contributed">Esfand</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">AP</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">AP</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">AP</era>
+                                        </eraNarrow>
+                                </eras>
                         </calendar>
                         <calendar type="roc">
                                 <eras>
                                         <eraNames>
                                                 <era type="0" draft="contributed">voor R.O.C.</era>

@@ -4538,28 +5696,21 @@
                                                         <pattern>dd-MM-yy GGGGG</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                 </dateFormats>
                                 <dateTimeFormats>
-                                        <dateTimeFormatLength type="full">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
-                                        <dateTimeFormatLength type="long">
-                                                <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} 'om' {0}</pattern>
-                                                </dateTimeFormat>
-                                        </dateTimeFormatLength>
                                         <availableFormats>
+                                                <dateFormatItem id="d" draft="contributed">d</dateFormatItem>
                                                 <dateFormatItem id="Ed">E d</dateFormatItem>
                                                 <dateFormatItem id="Gy">y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+                                                <dateFormatItem id="M" draft="contributed">L</dateFormatItem>
                                                 <dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
                                                 <dateFormatItem id="MEd">E d-M</dateFormatItem>
+                                                <dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
                                                 <dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
                                                 <dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
                                                 <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>

@@ -4571,120 +5722,10 @@
                                                 <dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
                                         </availableFormats>
-                                        <intervalFormats>
-                                                <intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
-                                                <intervalFormatItem id="Bh">
-                                                        <greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h–h B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Bhm">
-                                                        <greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-                                                        <greatestDifference id="h" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                        <greatestDifference id="m" draft="contributed">h:mm–h:mm B</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Gy">
-                                                        <greatestDifference id="G" draft="contributed">y G – y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyM">
-                                                        <greatestDifference id="G" draft="contributed">M-y GGGGG – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">M-y – M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMd">
-                                                        <greatestDifference id="d" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d-M-y – d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d-M-y – E d-M-y GGGGG</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMM">
-                                                        <greatestDifference id="G" draft="contributed">MMM y G – MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">MMM – MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">d MMM y G – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="GyMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="M">
-                                                        <greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="Md">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="MMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="y">
-                                                        <greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yM">
-                                                        <greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMd">
-                                                        <greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMEd">
-                                                        <greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMM–MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMd">
-                                                        <greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMEd">
-                                                        <greatestDifference id="d" draft="contributed">E d – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                                <intervalFormatItem id="yMMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM y G</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMMM y – MMMM y G</greatestDifference>
-                                                </intervalFormatItem>
-                                        </intervalFormats>
                                 </dateTimeFormats>
                         </calendar>
                 </calendars>
                 <fields>
                         <field type="era">

@@ -5706,10 +6747,13 @@
                                 <exemplarCity>Glace Bay</exemplarCity>
                         </zone>
                         <zone type="America/Blanc-Sablon">
                                 <exemplarCity>Blanc-Sablon</exemplarCity>
                         </zone>
+                        <zone type="America/St_Johns">
+                                <exemplarCity>St. John’s</exemplarCity>
+                        </zone>
                         <zone type="Indian/Cocos">
                                 <exemplarCity>Cocoseilanden</exemplarCity>
                         </zone>
                         <zone type="Africa/Kinshasa">
                                 <exemplarCity>Kinshasa</exemplarCity>

@@ -6009,10 +7053,13 @@
                                 <exemplarCity>Tarawa</exemplarCity>
                         </zone>
                         <zone type="Indian/Comoro">
                                 <exemplarCity>Comoro</exemplarCity>
                         </zone>
+                        <zone type="America/St_Kitts">
+                                <exemplarCity>St. Kitts</exemplarCity>
+                        </zone>
                         <zone type="Asia/Pyongyang">
                                 <exemplarCity>Pyongyang</exemplarCity>
                         </zone>
                         <zone type="Asia/Seoul">
                                 <exemplarCity>Seoul</exemplarCity>

@@ -6045,10 +7092,13 @@
                                 <exemplarCity>Vientiane</exemplarCity>
                         </zone>
                         <zone type="Asia/Beirut">
                                 <exemplarCity>Beiroet</exemplarCity>
                         </zone>
+                        <zone type="America/St_Lucia">
+                                <exemplarCity>St. Lucia</exemplarCity>
+                        </zone>
                         <zone type="Europe/Vaduz">
                                 <exemplarCity>Vaduz</exemplarCity>
                         </zone>
                         <zone type="Asia/Colombo">
                                 <exemplarCity>Colombo</exemplarCity>

@@ -6606,16 +7656,22 @@
                                 <exemplarCity>Tasjkent</exemplarCity>
                         </zone>
                         <zone type="Europe/Vatican">
                                 <exemplarCity>Vaticaanstad</exemplarCity>
                         </zone>
+                        <zone type="America/St_Vincent">
+                                <exemplarCity>St. Vincent</exemplarCity>
+                        </zone>
                         <zone type="America/Caracas">
                                 <exemplarCity>Caracas</exemplarCity>
                         </zone>
                         <zone type="America/Tortola">
                                 <exemplarCity>Tortola</exemplarCity>
                         </zone>
+                        <zone type="America/St_Thomas">
+                                <exemplarCity>St. Thomas</exemplarCity>
+                        </zone>
                         <zone type="Asia/Saigon">
                                 <exemplarCity>Ho Chi Minhstad</exemplarCity>
                         </zone>
                         <zone type="Pacific/Efate">
                                 <exemplarCity>Efate</exemplarCity>

@@ -6679,15 +7735,10 @@
                                 <long>
                                         <generic>Alaska-tijd</generic>
                                         <standard>Alaska-standaardtijd</standard>
                                         <daylight>Alaska-zomertijd</daylight>
                                 </long>
-                                <short>
-                                        <generic draft="contributed">AKT</generic>
-                                        <standard draft="contributed">AKST</standard>
-                                        <daylight draft="contributed">AKDT</daylight>
-                                </short>
                         </metazone>
                         <metazone type="Almaty">
                                 <long>
                                         <generic draft="contributed">Alma-Ata-tijd</generic>
                                         <standard draft="contributed">Alma-Ata-standaardtijd</standard>

@@ -6705,51 +7756,31 @@
                                 <long>
                                         <generic>Central-tijd</generic>
                                         <standard>Central-standaardtijd</standard>
                                         <daylight>Central-zomertijd</daylight>
                                 </long>
-                                <short>
-                                        <generic draft="contributed">CT</generic>
-                                        <standard draft="contributed">CST</standard>
-                                        <daylight draft="contributed">CDT</daylight>
-                                </short>
                         </metazone>
                         <metazone type="America_Eastern">
                                 <long>
                                         <generic>Eastern-tijd</generic>
                                         <standard>Eastern-standaardtijd</standard>
                                         <daylight>Eastern-zomertijd</daylight>
                                 </long>
-                                <short>
-                                        <generic draft="contributed">ET</generic>
-                                        <standard draft="contributed">EST</standard>
-                                        <daylight draft="contributed">EDT</daylight>
-                                </short>
                         </metazone>
                         <metazone type="America_Mountain">
                                 <long>
                                         <generic>Mountain-tijd</generic>
                                         <standard>Mountain-standaardtijd</standard>
                                         <daylight>Mountain-zomertijd</daylight>
                                 </long>
-                                <short>
-                                        <generic draft="contributed">MT</generic>
-                                        <standard draft="contributed">MST</standard>
-                                        <daylight draft="contributed">MDT</daylight>
-                                </short>
                         </metazone>
                         <metazone type="America_Pacific">
                                 <long>
                                         <generic>Pacific-tijd</generic>
                                         <standard>Pacific-standaardtijd</standard>
                                         <daylight>Pacific-zomertijd</daylight>
                                 </long>
-                                <short>
-                                        <generic draft="contributed">PT</generic>
-                                        <standard draft="contributed">PST</standard>
-                                        <daylight draft="contributed">PDT</daylight>
-                                </short>
                         </metazone>
                         <metazone type="Anadyr">
                                 <long>
                                         <generic draft="contributed">Anadyr-tijd</generic>
                                         <standard draft="contributed">Anadyr-standaardtijd</standard>

@@ -6809,15 +7840,10 @@
                                 <long>
                                         <generic>Atlantic-tijd</generic>
                                         <standard>Atlantic-standaardtijd</standard>
                                         <daylight>Atlantic-zomertijd</daylight>
                                 </long>
-                                <short>
-                                        <generic draft="contributed">AT</generic>
-                                        <standard draft="contributed">AST</standard>
-                                        <daylight draft="contributed">ADT</daylight>
-                                </short>
                         </metazone>
                         <metazone type="Australia_Central">
                                 <long>
                                         <generic>Midden-Australische tijd</generic>
                                         <standard>Midden-Australische standaardtijd</standard>

@@ -7080,13 +8106,10 @@
                         </metazone>
                         <metazone type="GMT">
                                 <long>
                                         <standard>Greenwich Mean Time</standard>
                                 </long>
-                                <short>
-                                        <standard draft="contributed">GMT</standard>
-                                </short>
                         </metazone>
                         <metazone type="Greenland_Eastern">
                                 <long>
                                         <generic>Oost-Groenlandse tijd</generic>
                                         <standard>Oost-Groenlandse standaardtijd</standard>

@@ -7119,15 +8142,10 @@
                                 <long>
                                         <generic>Hawaii-Aleoetische tijd</generic>
                                         <standard>Hawaii-Aleoetische standaardtijd</standard>
                                         <daylight>Hawaii-Aleoetische zomertijd</daylight>
                                 </long>
-                                <short>
-                                        <generic draft="contributed">HAT</generic>
-                                        <standard draft="contributed">HAST</standard>
-                                        <daylight draft="contributed">HADT</daylight>
-                                </short>
                         </metazone>
                         <metazone type="Hong_Kong">
                                 <long>
                                         <generic>Hongkongse tijd</generic>
                                         <standard>Hongkongse standaardtijd</standard>

@@ -7657,191 +8675,739 @@
                                 </long>
                         </metazone>
                 </timeZoneNames>
         </dates>
         <numbers>
+                <defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+                <otherNumberingSystems>
+                        <native draft="contributed">latn</native>
+                </otherNumberingSystems>
                 <minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+                <symbols numberSystem="arab">
+                        <decimal draft="contributed">٫</decimal>
+                        <group draft="contributed">٬</group>
+                        <list draft="contributed">؛</list>
+                        <exponential draft="contributed">اس</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">؉</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
+                </symbols>
+                <symbols numberSystem="arabext">
+                        <decimal draft="contributed">٫</decimal>
+                        <group draft="contributed">٬</group>
+                        <list draft="contributed">؛</list>
+                        <percentSign draft="contributed">٪</percentSign>
+                        <plusSign draft="contributed">‎+‎</plusSign>
+                        <minusSign draft="contributed">‎-‎</minusSign>
+                        <exponential draft="contributed">×۱۰^</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">؉</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">٫</timeSeparator>
+                </symbols>
                 <symbols numberSystem="bali">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="beng">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="brah">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="cakm">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="cham">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="deva">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="fullwide">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
-                </symbols>
-                <symbols numberSystem="gong">
-                        <decimal draft="contributed">,</decimal>
-                        <group draft="contributed">.</group>
-                </symbols>
-                <symbols numberSystem="gonm">
-                        <decimal draft="contributed">,</decimal>
-                        <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="gujr">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="guru">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="hanidec">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="java">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="kali">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="khmr">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="knda">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="lana">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="lanatham">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="laoo">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="latn">
                         <decimal>,</decimal>
                         <group>.</group>
+                        <list>;</list>
                         <percentSign>%</percentSign>
+                        <plusSign>+</plusSign>
+                        <minusSign>-</minusSign>
                         <exponential>E</exponential>
                         <superscriptingExponent>×</superscriptingExponent>
                         <perMille>‰</perMille>
                         <infinity>∞</infinity>
                         <nan>NaN</nan>
                         <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="lepc">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="limb">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="mlym">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="mong">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="mtei">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="mymr">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="mymrshan">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="nkoo">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="olck">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="orya">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="osma">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
-                </symbols>
-                <symbols numberSystem="rohg">
-                        <decimal draft="contributed">,</decimal>
-                        <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="saur">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="shrd">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="sora">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="sund">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="takr">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="talu">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="tamldec">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="telu">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="thai">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="tibt">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
                 <symbols numberSystem="vaii">
                         <decimal draft="contributed">,</decimal>
                         <group draft="contributed">.</group>
+                        <list draft="contributed">;</list>
+                        <percentSign draft="contributed">%</percentSign>
+                        <plusSign draft="contributed">+</plusSign>
+                        <minusSign draft="contributed">-</minusSign>
+                        <exponential draft="contributed">E</exponential>
+                        <superscriptingExponent draft="contributed">×</superscriptingExponent>
+                        <perMille draft="contributed">‰</perMille>
+                        <infinity draft="contributed">∞</infinity>
+                        <nan draft="contributed">NaN</nan>
+                        <timeSeparator draft="contributed">:</timeSeparator>
                 </symbols>
+                <decimalFormats numberSystem="arab">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="arabext">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="bali">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="beng">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="brah">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="cakm">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="cham">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="deva">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="fullwide">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="gujr">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="guru">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="hanidec">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="java">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="kali">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="khmr">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="knda">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="lana">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="lanatham">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="laoo">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
                 <decimalFormats numberSystem="latn">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern>#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
                         <decimalFormatLength type="long">
                                 <decimalFormat>
                                         <pattern type="1000" count="one">0 duizend</pattern>
                                         <pattern type="1000" count="other">0 duizend</pattern>
                                         <pattern type="10000" count="one">00 duizend</pattern>

@@ -7895,230 +9461,974 @@
                                         <pattern type="100000000000000" count="one">000 bln'.'</pattern>
                                         <pattern type="100000000000000" count="other">000 bln'.'</pattern>
                                 </decimalFormat>
                         </decimalFormatLength>
                 </decimalFormats>
+                <decimalFormats numberSystem="lepc">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="limb">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="mlym">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="mong">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="mtei">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="mymr">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="mymrshan">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="nkoo">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="olck">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="orya">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="osma">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="saur">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="shrd">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="sora">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="sund">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="takr">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="talu">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="tamldec">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="telu">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="thai">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="tibt">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <decimalFormats numberSystem="vaii">
+                        <decimalFormatLength>
+                                <decimalFormat>
+                                        <pattern draft="contributed">#,##0.###</pattern>
+                                </decimalFormat>
+                        </decimalFormatLength>
+                </decimalFormats>
+                <scientificFormats numberSystem="arab">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="arabext">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="bali">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="beng">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="brah">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="cakm">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="cham">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="deva">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="fullwide">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="gujr">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="guru">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="hanidec">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="java">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="kali">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="khmr">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="knda">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="lana">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="lanatham">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="laoo">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
                 <scientificFormats numberSystem="latn">
                         <scientificFormatLength>
                                 <scientificFormat>
                                         <pattern>#E0</pattern>
                                 </scientificFormat>
                         </scientificFormatLength>
                 </scientificFormats>
+                <scientificFormats numberSystem="lepc">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="limb">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="mlym">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="mong">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="mtei">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="mymr">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="mymrshan">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="nkoo">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="olck">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="orya">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="osma">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="saur">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="shrd">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="sora">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="sund">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="takr">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="talu">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="tamldec">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="telu">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="thai">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="tibt">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
+                <scientificFormats numberSystem="vaii">
+                        <scientificFormatLength>
+                                <scientificFormat>
+                                        <pattern draft="contributed">#E0</pattern>
+                                </scientificFormat>
+                        </scientificFormatLength>
+                </scientificFormats>
                 <percentFormats numberSystem="arab">
                         <percentFormatLength>
                                 <percentFormat>
                                         <pattern draft="contributed">#,##0 %</pattern>
                                 </percentFormat>
                         </percentFormatLength>
                 </percentFormats>
+                <percentFormats numberSystem="arabext">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="bali">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="beng">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="brah">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="cakm">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="cham">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="deva">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="fullwide">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="gujr">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="guru">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="hanidec">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="java">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="kali">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="khmr">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="knda">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="lana">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="lanatham">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="laoo">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
                 <percentFormats numberSystem="latn">
                         <percentFormatLength>
                                 <percentFormat>
                                         <pattern>#,##0%</pattern>
                                 </percentFormat>
                         </percentFormatLength>
                 </percentFormats>
+                <percentFormats numberSystem="lepc">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="limb">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="mlym">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="mong">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="mtei">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="mymr">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="mymrshan">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="nkoo">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="olck">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="orya">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="osma">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="saur">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="shrd">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="sora">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="sund">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="takr">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="talu">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="tamldec">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="telu">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="thai">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="tibt">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <percentFormats numberSystem="vaii">
+                        <percentFormatLength>
+                                <percentFormat>
+                                        <pattern draft="contributed">#,##0%</pattern>
+                                </percentFormat>
+                        </percentFormatLength>
+                </percentFormats>
+                <currencyFormats numberSystem="arab">
+                        <currencyFormatLength>
+                                <currencyFormat type="standard">
+                                        <pattern draft="contributed">#,##0.00 ¤</pattern>
+                                </currencyFormat>
+                        </currencyFormatLength>
+                </currencyFormats>
                 <currencyFormats numberSystem="arabext">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="bali">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="beng">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="brah">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="cakm">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="cham">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="deva">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="fullwide">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
-                </currencyFormats>
-                <currencyFormats numberSystem="gong">
-                        <currencyFormatLength>
-                                <currencyFormat type="standard">
-                                        <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
-                                </currencyFormat>
-                                <currencyFormat type="accounting">
-                                        <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
-                                </currencyFormat>
-                        </currencyFormatLength>
-                </currencyFormats>
-                <currencyFormats numberSystem="gonm">
-                        <currencyFormatLength>
-                                <currencyFormat type="standard">
-                                        <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
-                                </currencyFormat>
-                                <currencyFormat type="accounting">
-                                        <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
-                                </currencyFormat>
-                        </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="gujr">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="guru">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="hanidec">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="java">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="kali">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="khmr">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="knda">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="lana">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="lanatham">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="laoo">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="latn">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern>¤ #,##0.00;¤ -#,##0.00</pattern>

@@ -8165,236 +10475,271 @@
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="limb">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="mlym">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="mong">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="mtei">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="mymr">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="mymrshan">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="nkoo">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="olck">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="orya">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="osma">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
-                </currencyFormats>
-                <currencyFormats numberSystem="rohg">
-                        <currencyFormatLength>
-                                <currencyFormat type="standard">
-                                        <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
-                                </currencyFormat>
-                                <currencyFormat type="accounting">
-                                        <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
-                                </currencyFormat>
-                        </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="saur">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="shrd">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="sora">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="sund">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="takr">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="talu">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="tamldec">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="telu">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="thai">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="tibt">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencyFormats numberSystem="vaii">
                         <currencyFormatLength>
                                 <currencyFormat type="standard">
                                         <pattern draft="contributed">¤ #,##0.00;¤ -#,##0.00</pattern>
                                 </currencyFormat>
                                 <currencyFormat type="accounting">
                                         <pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
+                        <unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
+                        <unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
                 </currencyFormats>
                 <currencies>
                         <currency type="ADP">
                                 <displayName>Andorrese peseta</displayName>
                                 <displayName count="one">Andorrese peseta</displayName>
                                 <displayName count="other">Andorrese peseta</displayName>
+                                <symbol draft="contributed">ADP</symbol>
                         </currency>
                         <currency type="AED">
                                 <displayName>Verenigde Arabische Emiraten-dirham</displayName>
                                 <displayName count="one">VAE-dirham</displayName>
                                 <displayName count="other">VAE-dirham</displayName>

@@ -8402,10 +10747,11 @@
                         </currency>
                         <currency type="AFA">
                                 <displayName>Afghani (1927–2002)</displayName>
                                 <displayName count="one">Afghani (AFA)</displayName>
                                 <displayName count="other">Afghani (AFA)</displayName>
+                                <symbol draft="contributed">AFA</symbol>
                         </currency>
                         <currency type="AFN">
                                 <displayName>Afghaanse afghani</displayName>
                                 <displayName count="one">Afghaanse afghani</displayName>
                                 <displayName count="other">Afghaanse afghani</displayName>

@@ -8413,10 +10759,11 @@
                         </currency>
                         <currency type="ALK">
                                 <displayName draft="contributed">Albanese lek (1946–1965)</displayName>
                                 <displayName count="one" draft="contributed">Albanese lek (1946–1965)</displayName>
                                 <displayName count="other" draft="contributed">Albanese lek (1946–1965)</displayName>
+                                <symbol draft="contributed">ALK</symbol>
                         </currency>
                         <currency type="ALL">
                                 <displayName>Albanese lek</displayName>
                                 <displayName count="one">Albanese lek</displayName>
                                 <displayName count="other">Albanese lek</displayName>

@@ -8443,40 +10790,47 @@
                         </currency>
                         <currency type="AOK">
                                 <displayName>Angolese kwanza (1977–1990)</displayName>
                                 <displayName count="one">Angolese kwanza (1977–1990)</displayName>
                                 <displayName count="other">Angolese kwanza (1977–1990)</displayName>
+                                <symbol draft="contributed">AOK</symbol>
                         </currency>
                         <currency type="AON">
                                 <displayName>Angolese nieuwe kwanza (1990–2000)</displayName>
                                 <displayName count="one">Angolese nieuwe kwanza (1990–2000)</displayName>
                                 <displayName count="other">Angolese nieuwe kwanza (1990–2000)</displayName>
+                                <symbol draft="contributed">AON</symbol>
                         </currency>
                         <currency type="AOR">
                                 <displayName>Angolese kwanza reajustado (1995–1999)</displayName>
                                 <displayName count="one">Angolese kwanza reajustado (1995–1999)</displayName>
                                 <displayName count="other">Angolese kwanza reajustado (1995–1999)</displayName>
+                                <symbol draft="contributed">AOR</symbol>
                         </currency>
                         <currency type="ARA">
                                 <displayName>Argentijnse austral</displayName>
                                 <displayName count="one">Argentijnse austral</displayName>
                                 <displayName count="other">Argentijnse austral</displayName>
+                                <symbol draft="contributed">ARA</symbol>
                         </currency>
                         <currency type="ARL">
                                 <displayName draft="contributed">Argentijnse peso ley (1970–1983)</displayName>
                                 <displayName count="one" draft="contributed">Argentijnse peso ley (1970–1983)</displayName>
                                 <displayName count="other" draft="contributed">Argentijnse peso ley (1970–1983)</displayName>
+                                <symbol draft="contributed">ARL</symbol>
                         </currency>
                         <currency type="ARM">
                                 <displayName draft="contributed">Argentijnse peso (1881–1970)</displayName>
                                 <displayName count="one" draft="contributed">Argentijnse peso (1881–1970)</displayName>
                                 <displayName count="other" draft="contributed">Argentijnse peso (1881–1970)</displayName>
+                                <symbol draft="contributed">ARM</symbol>
                         </currency>
                         <currency type="ARP">
                                 <displayName>Argentijnse peso (1983–1985)</displayName>
                                 <displayName count="one">Argentijnse peso (1983–1985)</displayName>
                                 <displayName count="other">Argentijnse peso (1983–1985)</displayName>
+                                <symbol draft="contributed">ARP</symbol>
                         </currency>
                         <currency type="ARS">
                                 <displayName>Argentijnse peso</displayName>
                                 <displayName count="one">Argentijnse peso</displayName>
                                 <displayName count="other">Argentijnse peso</displayName>

@@ -8485,10 +10839,11 @@
                         </currency>
                         <currency type="ATS">
                                 <displayName>Oostenrijkse schilling</displayName>
                                 <displayName count="one">Oostenrijkse schilling</displayName>
                                 <displayName count="other">Oostenrijkse schilling</displayName>
+                                <symbol draft="contributed">ATS</symbol>
                         </currency>
                         <currency type="AUD">
                                 <displayName>Australische dollar</displayName>
                                 <displayName count="one">Australische dollar</displayName>
                                 <displayName count="other">Australische dollar</displayName>

@@ -8497,15 +10852,17 @@
                         </currency>
                         <currency type="AWG">
                                 <displayName>Arubaanse gulden</displayName>
                                 <displayName count="one">Arubaanse gulden</displayName>
                                 <displayName count="other">Arubaanse gulden</displayName>
+                                <symbol>AWG</symbol>
                         </currency>
                         <currency type="AZM">
                                 <displayName draft="contributed">Azerbeidzjaanse manat (1993–2006)</displayName>
                                 <displayName count="one" draft="contributed">Azerbeidzjaanse manat (1993–2006)</displayName>
                                 <displayName count="other" draft="contributed">Azerbeidzjaanse manat (1993–2006)</displayName>
+                                <symbol draft="contributed">AZM</symbol>
                         </currency>
                         <currency type="AZN">
                                 <displayName>Azerbeidzjaanse manat</displayName>
                                 <displayName count="one">Azerbeidzjaanse manat</displayName>
                                 <displayName count="other">Azerbeidzjaanse manat</displayName>

@@ -8513,10 +10870,11 @@
                         </currency>
                         <currency type="BAD">
                                 <displayName>Bosnische dinar</displayName>
                                 <displayName count="one">Bosnische dinar</displayName>
                                 <displayName count="other">Bosnische dinar</displayName>
+                                <symbol draft="contributed">BAD</symbol>
                         </currency>
                         <currency type="BAM">
                                 <displayName>Bosnische convertibele mark</displayName>
                                 <displayName count="one">Bosnische convertibele mark</displayName>
                                 <displayName count="other">Bosnische convertibele mark</displayName>

@@ -8525,10 +10883,11 @@
                         </currency>
                         <currency type="BAN">
                                 <displayName draft="contributed">Nieuwe Bosnische dinar (1994–1997)</displayName>
                                 <displayName count="one" draft="contributed">Nieuwe Bosnische dinar (1994–1997)</displayName>
                                 <displayName count="other" draft="contributed">Nieuwe Bosnische dinar (1994–1997)</displayName>
+                                <symbol draft="contributed">BAN</symbol>
                         </currency>
                         <currency type="BBD">
                                 <displayName>Barbadaanse dollar</displayName>
                                 <displayName count="one">Barbadaanse dollar</displayName>
                                 <displayName count="other">Barbadaanse dollar</displayName>

@@ -8544,30 +10903,35 @@
                         </currency>
                         <currency type="BEC">
                                 <displayName>Belgische frank (convertibel)</displayName>
                                 <displayName count="one">Belgische frank (convertibel)</displayName>
                                 <displayName count="other">Belgische frank (convertibel)</displayName>
+                                <symbol draft="contributed">BEC</symbol>
                         </currency>
                         <currency type="BEF">
                                 <displayName>Belgische frank</displayName>
                                 <displayName count="one">Belgische frank</displayName>
                                 <displayName count="other">Belgische frank</displayName>
+                                <symbol draft="contributed">BEF</symbol>
                         </currency>
                         <currency type="BEL">
                                 <displayName>Belgische frank (financieel)</displayName>
                                 <displayName count="one">Belgische frank (financieel)</displayName>
                                 <displayName count="other">Belgische frank (financieel)</displayName>
+                                <symbol draft="contributed">BEL</symbol>
                         </currency>
                         <currency type="BGL">
                                 <displayName>Bulgaarse harde lev</displayName>
                                 <displayName count="one">Bulgaarse harde lev</displayName>
                                 <displayName count="other">Bulgaarse harde lev</displayName>
+                                <symbol draft="contributed">BGL</symbol>
                         </currency>
                         <currency type="BGM">
                                 <displayName draft="contributed">Bulgaarse socialistische lev</displayName>
                                 <displayName count="one" draft="contributed">Bulgaarse socialistische lev</displayName>
                                 <displayName count="other" draft="contributed">Bulgaarse socialistische lev</displayName>
+                                <symbol draft="contributed">BGM</symbol>
                         </currency>
                         <currency type="BGN">
                                 <displayName>Bulgaarse lev</displayName>
                                 <displayName count="one">Bulgaarse lev</displayName>
                                 <displayName count="other">Bulgaarse leva</displayName>

@@ -8575,10 +10939,11 @@
                         </currency>
                         <currency type="BGO">
                                 <displayName draft="contributed">Bulgaarse lev (1879–1952)</displayName>
                                 <displayName count="one" draft="contributed">Bulgaarse lev (1879–1952)</displayName>
                                 <displayName count="other" draft="contributed">Bulgaarse lev (1879–1952)</displayName>
+                                <symbol draft="contributed">BGO</symbol>
                         </currency>
                         <currency type="BHD">
                                 <displayName>Bahreinse dinar</displayName>
                                 <displayName count="one">Bahreinse dinar</displayName>
                                 <displayName count="other">Bahreinse dinar</displayName>

@@ -8613,56 +10978,66 @@
                         </currency>
                         <currency type="BOL">
                                 <displayName draft="contributed">Boliviaanse boliviano (1863–1963)</displayName>
                                 <displayName count="one" draft="contributed">Boliviaanse boliviano (1863–1963)</displayName>
                                 <displayName count="other" draft="contributed">Boliviaanse boliviano (1863–1963)</displayName>
+                                <symbol draft="contributed">BOL</symbol>
                         </currency>
                         <currency type="BOP">
                                 <displayName>Boliviaanse peso</displayName>
                                 <displayName count="one">Boliviaanse peso</displayName>
                                 <displayName count="other">Boliviaanse peso</displayName>
+                                <symbol draft="contributed">BOP</symbol>
                         </currency>
                         <currency type="BOV">
                                 <displayName>Boliviaanse mvdol</displayName>
                                 <displayName count="one">Boliviaanse mvdol</displayName>
                                 <displayName count="other">Boliviaanse mvdol</displayName>
+                                <symbol draft="contributed">BOV</symbol>
                         </currency>
                         <currency type="BRB">
                                 <displayName>Braziliaanse cruzeiro novo (1967–1986)</displayName>
                                 <displayName count="one">Braziliaanse cruzeiro novo (1967–1986)</displayName>
                                 <displayName count="other">Braziliaanse cruzeiro novo (1967–1986)</displayName>
+                                <symbol draft="contributed">BRB</symbol>
                         </currency>
                         <currency type="BRC">
                                 <displayName>Braziliaanse cruzado</displayName>
                                 <displayName count="one">Braziliaanse cruzado</displayName>
                                 <displayName count="other">Braziliaanse cruzado</displayName>
+                                <symbol draft="contributed">BRC</symbol>
                         </currency>
                         <currency type="BRE">
                                 <displayName>Braziliaanse cruzeiro (1990–1993)</displayName>
                                 <displayName count="one">Braziliaanse cruzeiro (1990–1993)</displayName>
                                 <displayName count="other">Braziliaanse cruzeiro (1990–1993)</displayName>
+                                <symbol draft="contributed">BRE</symbol>
                         </currency>
                         <currency type="BRL">
                                 <displayName>Braziliaanse real</displayName>
                                 <displayName count="one">Braziliaanse real</displayName>
                                 <displayName count="other">Braziliaanse real</displayName>
+                                <symbol>R$</symbol>
                                 <symbol alt="narrow" draft="contributed">R$</symbol>
                         </currency>
                         <currency type="BRN">
                                 <displayName>Braziliaanse nieuwe cruzado (1989–1990)</displayName>
                                 <displayName count="one">Braziliaanse cruzado novo</displayName>
                                 <displayName count="other">Braziliaanse cruzado novo</displayName>
+                                <symbol draft="contributed">BRN</symbol>
                         </currency>
                         <currency type="BRR">
                                 <displayName>Braziliaanse cruzeiro</displayName>
                                 <displayName count="one">Braziliaanse cruzeiro</displayName>
                                 <displayName count="other">Braziliaanse cruzeiro</displayName>
+                                <symbol draft="contributed">BRR</symbol>
                         </currency>
                         <currency type="BRZ">
                                 <displayName draft="contributed">Braziliaanse cruzeiro (1942–1967)</displayName>
                                 <displayName count="one" draft="contributed">Braziliaanse cruzeiro (1942–1967)</displayName>
                                 <displayName count="other" draft="contributed">Braziliaanse cruzeiro (1942–1967)</displayName>
+                                <symbol draft="contributed">BRZ</symbol>
                         </currency>
                         <currency type="BSD">
                                 <displayName>Bahamaanse dollar</displayName>
                                 <displayName count="one">Bahamaanse dollar</displayName>
                                 <displayName count="other">Bahamaanse dollar</displayName>

@@ -8677,10 +11052,11 @@
                         </currency>
                         <currency type="BUK">
                                 <displayName>Birmese kyat</displayName>
                                 <displayName count="one">Birmese kyat</displayName>
                                 <displayName count="other">Birmese kyat</displayName>
+                                <symbol draft="contributed">BUK</symbol>
                         </currency>
                         <currency type="BWP">
                                 <displayName>Botswaanse pula</displayName>
                                 <displayName count="one">Botswaanse pula</displayName>
                                 <displayName count="other">Botswaanse pula</displayName>

@@ -8689,10 +11065,11 @@
                         </currency>
                         <currency type="BYB">
                                 <displayName>Wit-Russische nieuwe roebel (1994–1999)</displayName>
                                 <displayName count="one">Wit-Russische nieuwe roebel (1994–1999)</displayName>
                                 <displayName count="other">Wit-Russische nieuwe roebel (1994–1999)</displayName>
+                                <symbol draft="contributed">BYB</symbol>
                         </currency>
                         <currency type="BYN">
                                 <displayName>Wit-Russische roebel</displayName>
                                 <displayName count="one">Wit-Russische roebel</displayName>
                                 <displayName count="other">Wit-Russische roebel</displayName>

@@ -8701,10 +11078,11 @@
                         </currency>
                         <currency type="BYR">
                                 <displayName>Wit-Russische roebel (2000–2016)</displayName>
                                 <displayName count="one">Wit-Russische roebel (2000–2016)</displayName>
                                 <displayName count="other">Wit-Russische roebel (2000–2016)</displayName>
+                                <symbol draft="contributed">BYR</symbol>
                         </currency>
                         <currency type="BZD">
                                 <displayName>Belizaanse dollar</displayName>
                                 <displayName count="one">Belizaanse dollar</displayName>
                                 <displayName count="other">Belizaanse dollar</displayName>

@@ -8726,10 +11104,11 @@
                         </currency>
                         <currency type="CHE">
                                 <displayName>WIR euro</displayName>
                                 <displayName count="one">WIR euro</displayName>
                                 <displayName count="other">WIR euro</displayName>
+                                <symbol draft="contributed">CHE</symbol>
                         </currency>
                         <currency type="CHF">
                                 <displayName>Zwitserse frank</displayName>
                                 <displayName count="one">Zwitserse frank</displayName>
                                 <displayName count="other">Zwitserse frank</displayName>

@@ -8737,20 +11116,23 @@
                         </currency>
                         <currency type="CHW">
                                 <displayName>WIR franc</displayName>
                                 <displayName count="one">WIR franc</displayName>
                                 <displayName count="other">WIR franc</displayName>
+                                <symbol draft="contributed">CHW</symbol>
                         </currency>
                         <currency type="CLE">
                                 <displayName draft="contributed">Chileense escudo</displayName>
                                 <displayName count="one" draft="contributed">Chileense escudo</displayName>
                                 <displayName count="other" draft="contributed">Chileense escudo</displayName>
+                                <symbol draft="contributed">CLE</symbol>
                         </currency>
                         <currency type="CLF">
                                 <displayName>Chileense unidades de fomento</displayName>
                                 <displayName count="one">Chileense unidades de fomento</displayName>
                                 <displayName count="other">Chileense unidades de fomento</displayName>
+                                <symbol draft="contributed">CLF</symbol>
                         </currency>
                         <currency type="CLP">
                                 <displayName>Chileense peso</displayName>
                                 <displayName count="one">Chileense peso</displayName>
                                 <displayName count="other">Chileense peso</displayName>

@@ -8759,20 +11141,23 @@
                         </currency>
                         <currency type="CNH">
                                 <displayName>Chinese renminbi (offshore)</displayName>
                                 <displayName count="one">Chinese yuan (offshore)</displayName>
                                 <displayName count="other">Chinese yuan (offshore)</displayName>
+                                <symbol draft="contributed">CNH</symbol>
                         </currency>
                         <currency type="CNX">
                                 <displayName draft="contributed">dollar van de Chinese Volksbank</displayName>
                                 <displayName count="one" draft="contributed">dollar van de Chinese Volksbank</displayName>
                                 <displayName count="other" draft="contributed">dollar van de Chinese Volksbank</displayName>
+                                <symbol draft="contributed">CNX</symbol>
                         </currency>
                         <currency type="CNY">
-                                <displayName>Chinese yuan</displayName>
+                                <displayName>Chinese Yuan</displayName>
                                 <displayName count="one">Chinese yuan</displayName>
                                 <displayName count="other">Chinese yuan</displayName>
+                                <symbol>CN¥</symbol>
                                 <symbol alt="narrow" draft="contributed">¥</symbol>
                         </currency>
                         <currency type="COP">
                                 <displayName>Colombiaanse peso</displayName>
                                 <displayName count="one">Colombiaanse peso</displayName>

@@ -8782,10 +11167,11 @@
                         </currency>
                         <currency type="COU">
                                 <displayName>Unidad de Valor Real</displayName>
                                 <displayName count="one">Unidad de Valor Real</displayName>
                                 <displayName count="other">Unidad de Valor Real</displayName>
+                                <symbol draft="contributed">COU</symbol>
                         </currency>
                         <currency type="CRC">
                                 <displayName>Costa Ricaanse colon</displayName>
                                 <displayName count="one">Costa Ricaanse colon</displayName>
                                 <displayName count="other">Costa Ricaanse colon</displayName>

@@ -8794,15 +11180,17 @@
                         </currency>
                         <currency type="CSD">
                                 <displayName>Oude Servische dinar</displayName>
                                 <displayName count="one">Oude Servische dinar</displayName>
                                 <displayName count="other">Oude Servische dinar</displayName>
+                                <symbol draft="contributed">CSD</symbol>
                         </currency>
                         <currency type="CSK">
                                 <displayName>Tsjechoslowaakse harde koruna</displayName>
                                 <displayName count="one">Tsjechoslowaakse harde koruna</displayName>
                                 <displayName count="other">Tsjechoslowaakse harde koruna</displayName>
+                                <symbol draft="contributed">CSK</symbol>
                         </currency>
                         <currency type="CUC">
                                 <displayName>Cubaanse convertibele peso</displayName>
                                 <displayName count="one">Cubaanse convertibele peso</displayName>
                                 <displayName count="other">Cubaanse convertibele peso</displayName>

@@ -8824,10 +11212,11 @@
                         </currency>
                         <currency type="CYP">
                                 <displayName>Cyprisch pond</displayName>
                                 <displayName count="one">Cyprisch pond</displayName>
                                 <displayName count="other">Cyprisch pond</displayName>
+                                <symbol draft="contributed">CYP</symbol>
                         </currency>
                         <currency type="CZK">
                                 <displayName>Tsjechische kroon</displayName>
                                 <displayName count="one">Tsjechische kroon</displayName>
                                 <displayName count="other">Tsjechische kronen</displayName>

@@ -8836,15 +11225,17 @@
                         </currency>
                         <currency type="DDM">
                                 <displayName>Oost-Duitse ostmark</displayName>
                                 <displayName count="one">Oost-Duitse ostmark</displayName>
                                 <displayName count="other">Oost-Duitse ostmark</displayName>
+                                <symbol draft="contributed">DDM</symbol>
                         </currency>
                         <currency type="DEM">
                                 <displayName>Duitse mark</displayName>
                                 <displayName count="one">Duitse mark</displayName>
                                 <displayName count="other">Duitse mark</displayName>
+                                <symbol draft="contributed">DEM</symbol>
                         </currency>
                         <currency type="DJF">
                                 <displayName>Djiboutiaanse frank</displayName>
                                 <displayName count="one">Djiboutiaanse frank</displayName>
                                 <displayName count="other">Djiboutiaanse frank</displayName>

@@ -8872,20 +11263,23 @@
                         </currency>
                         <currency type="ECS">
                                 <displayName>Ecuadoraanse sucre</displayName>
                                 <displayName count="one">Ecuadoraanse sucre</displayName>
                                 <displayName count="other">Ecuadoraanse sucre</displayName>
+                                <symbol draft="contributed">ECS</symbol>
                         </currency>
                         <currency type="ECV">
                                 <displayName>Ecuadoraanse unidad de valor constante (UVC)</displayName>
                                 <displayName count="one">Ecuadoraanse unidad de valor constante (UVC)</displayName>
                                 <displayName count="other">Ecuadoraanse unidad de valor constante (UVC)</displayName>
+                                <symbol draft="contributed">ECV</symbol>
                         </currency>
                         <currency type="EEK">
                                 <displayName>Estlandse kroon</displayName>
                                 <displayName count="one">Estlandse kroon</displayName>
                                 <displayName count="other">Estlandse kroon</displayName>
+                                <symbol draft="contributed">EEK</symbol>
                         </currency>
                         <currency type="EGP">
                                 <displayName>Egyptisch pond</displayName>
                                 <displayName count="one">Egyptisch pond</displayName>
                                 <displayName count="other">Egyptisch pond</displayName>

@@ -8900,20 +11294,24 @@
                         </currency>
                         <currency type="ESA">
                                 <displayName>Spaanse peseta (account A)</displayName>
                                 <displayName count="one">Spaanse peseta (account A)</displayName>
                                 <displayName count="other">Spaanse peseta (account A)</displayName>
+                                <symbol draft="contributed">ESA</symbol>
                         </currency>
                         <currency type="ESB">
                                 <displayName>Spaanse peseta (convertibele account)</displayName>
                                 <displayName count="one">Spaanse peseta (convertibele account)</displayName>
                                 <displayName count="other">Spaanse peseta (convertibele account)</displayName>
+                                <symbol draft="contributed">ESB</symbol>
                         </currency>
                         <currency type="ESP">
                                 <displayName>Spaanse peseta</displayName>
                                 <displayName count="one">Spaanse peseta</displayName>
                                 <displayName count="other">Spaanse peseta</displayName>
+                                <symbol draft="contributed">ESP</symbol>
+                                <symbol alt="narrow" draft="contributed">₧</symbol>
                         </currency>
                         <currency type="ETB">
                                 <displayName>Ethiopische birr</displayName>
                                 <displayName count="one">Ethiopische birr</displayName>
                                 <displayName count="other">Ethiopische birr</displayName>

@@ -8921,16 +11319,18 @@
                         </currency>
                         <currency type="EUR">
                                 <displayName>Euro</displayName>
                                 <displayName count="one">euro</displayName>
                                 <displayName count="other">euro</displayName>
+                                <symbol>€</symbol>
                                 <symbol alt="narrow" draft="contributed">€</symbol>
                         </currency>
                         <currency type="FIM">
                                 <displayName>Finse markka</displayName>
                                 <displayName count="one">Finse markka</displayName>
                                 <displayName count="other">Finse markka</displayName>
+                                <symbol draft="contributed">FIM</symbol>
                         </currency>
                         <currency type="FJD">
                                 <displayName>Fiji-dollar</displayName>
                                 <displayName count="one">Fiji-dollar</displayName>
                                 <displayName count="other">Fiji-dollar</displayName>

@@ -8946,21 +11346,24 @@
                         </currency>
                         <currency type="FRF">
                                 <displayName>Franse franc</displayName>
                                 <displayName count="one">Franse franc</displayName>
                                 <displayName count="other">Franse franc</displayName>
+                                <symbol draft="contributed">FRF</symbol>
                         </currency>
                         <currency type="GBP">
                                 <displayName>Brits pond</displayName>
                                 <displayName count="one">Brits pond</displayName>
                                 <displayName count="other">Brits pond</displayName>
+                                <symbol>£</symbol>
                                 <symbol alt="narrow" draft="contributed">£</symbol>
                         </currency>
                         <currency type="GEK">
                                 <displayName>Georgische kupon larit</displayName>
                                 <displayName count="one">Georgische kupon larit</displayName>
                                 <displayName count="other">Georgische kupon larit</displayName>
+                                <symbol draft="contributed">GEK</symbol>
                         </currency>
                         <currency type="GEL">
                                 <displayName>Georgische lari</displayName>
                                 <displayName count="one">Georgische lari</displayName>
                                 <displayName count="other">Georgische lari</displayName>

@@ -8970,10 +11373,11 @@
                         </currency>
                         <currency type="GHC">
                                 <displayName>Ghanese cedi (1979–2007)</displayName>
                                 <displayName count="one">Ghanese cedi (1979–2007)</displayName>
                                 <displayName count="other">Ghanese cedi (1979–2007)</displayName>
+                                <symbol draft="contributed">GHC</symbol>
                         </currency>
                         <currency type="GHS">
                                 <displayName>Ghanese cedi</displayName>
                                 <displayName count="one">Ghanese cedi</displayName>
                                 <displayName count="other">Ghanese cedi</displayName>

@@ -9001,20 +11405,23 @@
                         </currency>
                         <currency type="GNS">
                                 <displayName>Guinese syli</displayName>
                                 <displayName count="one">Guinese syli</displayName>
                                 <displayName count="other">Guinese syli</displayName>
+                                <symbol draft="contributed">GNS</symbol>
                         </currency>
                         <currency type="GQE">
                                 <displayName>Equatoriaal-Guinese ekwele guineana</displayName>
                                 <displayName count="one">Equatoriaal-Guinese ekwele guineana</displayName>
                                 <displayName count="other">Equatoriaal-Guinese ekwele guineana</displayName>
+                                <symbol draft="contributed">GQE</symbol>
                         </currency>
                         <currency type="GRD">
                                 <displayName>Griekse drachme</displayName>
                                 <displayName count="one">Griekse drachme</displayName>
                                 <displayName count="other">Griekse drachme</displayName>
+                                <symbol draft="contributed">GRD</symbol>
                         </currency>
                         <currency type="GTQ">
                                 <displayName>Guatemalteekse quetzal</displayName>
                                 <displayName count="one">Guatemalteekse quetzal</displayName>
                                 <displayName count="other">Guatemalteekse quetzal</displayName>

@@ -9023,15 +11430,17 @@
                         </currency>
                         <currency type="GWE">
                                 <displayName>Portugees-Guinese escudo</displayName>
                                 <displayName count="one">Portugees-Guinese escudo</displayName>
                                 <displayName count="other">Portugees-Guinese escudo</displayName>
+                                <symbol draft="contributed">GWE</symbol>
                         </currency>
                         <currency type="GWP">
                                 <displayName>Guinee-Bissause peso</displayName>
                                 <displayName count="one">Guinee-Bissause peso</displayName>
                                 <displayName count="other">Guinee-Bissause peso</displayName>
+                                <symbol draft="contributed">GWP</symbol>
                         </currency>
                         <currency type="GYD">
                                 <displayName>Guyaanse dollar</displayName>
                                 <displayName count="one">Guyaanse dollar</displayName>
                                 <displayName count="other">Guyaanse dollar</displayName>

@@ -9040,10 +11449,11 @@
                         </currency>
                         <currency type="HKD">
                                 <displayName>Hongkongse dollar</displayName>
                                 <displayName count="one">Hongkongse dollar</displayName>
                                 <displayName count="other">Hongkongse dollar</displayName>
+                                <symbol>HK$</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="HNL">
                                 <displayName>Hondurese lempira</displayName>
                                 <displayName count="one">Hondurese lempira</displayName>

@@ -9053,10 +11463,11 @@
                         </currency>
                         <currency type="HRD">
                                 <displayName>Kroatische dinar</displayName>
                                 <displayName count="one">Kroatische dinar</displayName>
                                 <displayName count="other">Kroatische dinar</displayName>
+                                <symbol draft="contributed">HRD</symbol>
                         </currency>
                         <currency type="HRK">
                                 <displayName>Kroatische kuna</displayName>
                                 <displayName count="one">Kroatische kuna</displayName>
                                 <displayName count="other">Kroatische kuna</displayName>

@@ -9085,31 +11496,36 @@
                         </currency>
                         <currency type="IEP">
                                 <displayName>Iers pond</displayName>
                                 <displayName count="one">Iers pond</displayName>
                                 <displayName count="other">Iers pond</displayName>
+                                <symbol draft="contributed">IEP</symbol>
                         </currency>
                         <currency type="ILP">
                                 <displayName>Israëlisch pond</displayName>
                                 <displayName count="one">Israëlisch pond</displayName>
                                 <displayName count="other">Israëlisch pond</displayName>
+                                <symbol draft="contributed">ILP</symbol>
                         </currency>
                         <currency type="ILR">
                                 <displayName draft="contributed">Israëlische sjekel (1980–1985)</displayName>
                                 <displayName count="one" draft="contributed">Israëlische sjekel (1980–1985)</displayName>
                                 <displayName count="other" draft="contributed">Israëlische sjekel (1980–1985)</displayName>
+                                <symbol draft="contributed">ILR</symbol>
                         </currency>
                         <currency type="ILS">
                                 <displayName>Israëlische nieuwe shekel</displayName>
                                 <displayName count="one">Israëlische nieuwe shekel</displayName>
                                 <displayName count="other">Israëlische nieuwe shekel</displayName>
+                                <symbol>₪</symbol>
                                 <symbol alt="narrow" draft="contributed">₪</symbol>
                         </currency>
                         <currency type="INR">
                                 <displayName>Indiase roepie</displayName>
                                 <displayName count="one">Indiase roepie</displayName>
                                 <displayName count="other">Indiase roepie</displayName>
+                                <symbol>₹</symbol>
                                 <symbol alt="narrow" draft="contributed">₹</symbol>
                         </currency>
                         <currency type="IQD">
                                 <displayName>Iraakse dinar</displayName>
                                 <displayName count="one">Iraakse dinar</displayName>

@@ -9124,10 +11540,11 @@
                         </currency>
                         <currency type="ISJ">
                                 <displayName draft="contributed">IJslandse kroon (1918–1981)</displayName>
                                 <displayName count="one" draft="contributed">IJslandse kroon (1918–1981)</displayName>
                                 <displayName count="other" draft="contributed">IJslandse kronen (1918–1981)</displayName>
+                                <symbol draft="contributed">ISJ</symbol>
                         </currency>
                         <currency type="ISK">
                                 <displayName>IJslandse kroon</displayName>
                                 <displayName count="one">IJslandse kroon</displayName>
                                 <displayName count="other">IJslandse kronen</displayName>

@@ -9136,10 +11553,11 @@
                         </currency>
                         <currency type="ITL">
                                 <displayName>Italiaanse lire</displayName>
                                 <displayName count="one">Italiaanse lire</displayName>
                                 <displayName count="other">Italiaanse lire</displayName>
+                                <symbol draft="contributed">ITL</symbol>
                         </currency>
                         <currency type="JMD">
                                 <displayName>Jamaicaanse dollar</displayName>
                                 <displayName count="one">Jamaicaanse dollar</displayName>
                                 <displayName count="other">Jamaicaanse dollar</displayName>

@@ -9154,10 +11572,11 @@
                         </currency>
                         <currency type="JPY">
                                 <displayName>Japanse yen</displayName>
                                 <displayName count="one">Japanse yen</displayName>
                                 <displayName count="other">Japanse yen</displayName>
+                                <symbol>JP¥</symbol>
                                 <symbol alt="narrow" draft="contributed">¥</symbol>
                         </currency>
                         <currency type="KES">
                                 <displayName>Keniaanse shilling</displayName>
                                 <displayName count="one">Keniaanse shilling</displayName>

@@ -9193,20 +11612,23 @@
                         </currency>
                         <currency type="KRH">
                                 <displayName draft="contributed">Zuid-Koreaanse hwan (1953–1962)</displayName>
                                 <displayName count="one" draft="contributed">Zuid-Koreaanse hwan (1953–1962)</displayName>
                                 <displayName count="other" draft="contributed">Zuid-Koreaanse hwan (1953–1962)</displayName>
+                                <symbol draft="contributed">KRH</symbol>
                         </currency>
                         <currency type="KRO">
                                 <displayName draft="contributed">Oude Zuid-Koreaanse won (1945–1953)</displayName>
                                 <displayName count="one" draft="contributed">oude Zuid-Koreaanse won (1945–1953)</displayName>
                                 <displayName count="other" draft="contributed">oude Zuid-Koreaanse won (1945–1953)</displayName>
+                                <symbol draft="contributed">KRO</symbol>
                         </currency>
                         <currency type="KRW">
                                 <displayName>Zuid-Koreaanse won</displayName>
                                 <displayName count="one">Zuid-Koreaanse won</displayName>
                                 <displayName count="other">Zuid-Koreaanse won</displayName>
+                                <symbol>₩</symbol>
                                 <symbol alt="narrow" draft="contributed">₩</symbol>
                         </currency>
                         <currency type="KWD">
                                 <displayName>Koeweitse dinar</displayName>
                                 <displayName count="one">Koeweitse dinar</displayName>

@@ -9257,45 +11679,53 @@
                         </currency>
                         <currency type="LSL">
                                 <displayName>Lesothaanse loti</displayName>
                                 <displayName count="one">Lesothaanse loti</displayName>
                                 <displayName count="other">Lesothaanse loti</displayName>
+                                <symbol draft="contributed">LSL</symbol>
                         </currency>
                         <currency type="LTL">
                                 <displayName>Litouwse litas</displayName>
                                 <displayName count="one">Litouwse litas</displayName>
                                 <displayName count="other">Litouwse litas</displayName>
+                                <symbol draft="contributed">LTL</symbol>
                         </currency>
                         <currency type="LTT">
                                 <displayName>Litouwse talonas</displayName>
                                 <displayName count="one">Litouwse talonas</displayName>
                                 <displayName count="other">Litouwse talonas</displayName>
+                                <symbol draft="contributed">LTT</symbol>
                         </currency>
                         <currency type="LUC">
                                 <displayName>Luxemburgse convertibele franc</displayName>
                                 <displayName count="one">Luxemburgse convertibele franc</displayName>
                                 <displayName count="other">Luxemburgse convertibele franc</displayName>
+                                <symbol draft="contributed">LUC</symbol>
                         </currency>
                         <currency type="LUF">
                                 <displayName>Luxemburgse frank</displayName>
                                 <displayName count="one">Luxemburgse frank</displayName>
                                 <displayName count="other">Luxemburgse frank</displayName>
+                                <symbol draft="contributed">LUF</symbol>
                         </currency>
                         <currency type="LUL">
                                 <displayName>Luxemburgse financiële franc</displayName>
                                 <displayName count="one">Luxemburgse financiële franc</displayName>
                                 <displayName count="other">Luxemburgse financiële franc</displayName>
+                                <symbol draft="contributed">LUL</symbol>
                         </currency>
                         <currency type="LVL">
                                 <displayName>Letse lats</displayName>
                                 <displayName count="one">Letse lats</displayName>
                                 <displayName count="other">Letse lats</displayName>
+                                <symbol draft="contributed">LVL</symbol>
                         </currency>
                         <currency type="LVR">
                                 <displayName>Letse roebel</displayName>
                                 <displayName count="one">Letse roebel</displayName>
                                 <displayName count="other">Letse roebel</displayName>
+                                <symbol draft="contributed">LVR</symbol>
                         </currency>
                         <currency type="LYD">
                                 <displayName>Libische dinar</displayName>
                                 <displayName count="one">Libische dinar</displayName>
                                 <displayName count="other">Libische dinar</displayName>

@@ -9309,20 +11739,23 @@
                         </currency>
                         <currency type="MAF">
                                 <displayName>Marokkaanse franc</displayName>
                                 <displayName count="one">Marokkaanse franc</displayName>
                                 <displayName count="other">Marokkaanse franc</displayName>
+                                <symbol draft="contributed">MAF</symbol>
                         </currency>
                         <currency type="MCF">
                                 <displayName draft="contributed">Monegaskische frank</displayName>
                                 <displayName count="one" draft="contributed">Monegaskische frank</displayName>
                                 <displayName count="other" draft="contributed">Monegaskische frank</displayName>
+                                <symbol draft="contributed">MCF</symbol>
                         </currency>
                         <currency type="MDC">
                                 <displayName draft="contributed">Moldavische cupon</displayName>
                                 <displayName count="one" draft="contributed">Moldavische cupon</displayName>
                                 <displayName count="other" draft="contributed">Moldavische cupon</displayName>
+                                <symbol draft="contributed">MDC</symbol>
                         </currency>
                         <currency type="MDL">
                                 <displayName>Moldavische leu</displayName>
                                 <displayName count="one">Moldavische leu</displayName>
                                 <displayName count="other">Moldavische leu</displayName>

@@ -9337,10 +11770,11 @@
                         </currency>
                         <currency type="MGF">
                                 <displayName>Malagassische franc</displayName>
                                 <displayName count="one">Malagassische franc</displayName>
                                 <displayName count="other">Malagassische franc</displayName>
+                                <symbol draft="contributed">MGF</symbol>
                         </currency>
                         <currency type="MKD">
                                 <displayName>Macedonische denar</displayName>
                                 <displayName count="one">Macedonische denar</displayName>
                                 <displayName count="other">Macedonische denar</displayName>

@@ -9348,15 +11782,17 @@
                         </currency>
                         <currency type="MKN">
                                 <displayName draft="contributed">Macedonische denar (1992–1993)</displayName>
                                 <displayName count="one" draft="contributed">Macedonische denar (1992–1993)</displayName>
                                 <displayName count="other" draft="contributed">Macedonische denar (1992–1993)</displayName>
+                                <symbol draft="contributed">MKN</symbol>
                         </currency>
                         <currency type="MLF">
                                 <displayName>Malinese franc</displayName>
                                 <displayName count="one">Malinese franc</displayName>
                                 <displayName count="other">Malinese franc</displayName>
+                                <symbol draft="contributed">MLF</symbol>
                         </currency>
                         <currency type="MMK">
                                 <displayName>Myanmarese kyat</displayName>
                                 <displayName count="one">Myanmarese kyat</displayName>
                                 <displayName count="other">Myanmarese kyat</displayName>

@@ -9384,21 +11820,22 @@
                         </currency>
                         <currency type="MRU">
                                 <displayName>Mauritaanse ouguiya</displayName>
                                 <displayName count="one">Mauritaanse ouguiya</displayName>
                                 <displayName count="other">Mauritaanse ouguiya</displayName>
-                                <symbol draft="contributed">MRU</symbol>
                         </currency>
                         <currency type="MTL">
                                 <displayName>Maltese lire</displayName>
                                 <displayName count="one">Maltese lire</displayName>
                                 <displayName count="other">Maltese lire</displayName>
+                                <symbol draft="contributed">MTL</symbol>
                         </currency>
                         <currency type="MTP">
                                 <displayName>Maltees pond</displayName>
                                 <displayName count="one">Maltees pond</displayName>
                                 <displayName count="other">Maltees pond</displayName>
+                                <symbol draft="contributed">MTP</symbol>
                         </currency>
                         <currency type="MUR">
                                 <displayName>Mauritiaanse roepie</displayName>
                                 <displayName count="one">Mauritiaanse roepie</displayName>
                                 <displayName count="other">Mauritiaanse roepie</displayName>

@@ -9407,10 +11844,11 @@
                         </currency>
                         <currency type="MVP">
                                 <displayName draft="contributed">Maldivische roepie</displayName>
                                 <displayName count="one" draft="contributed">Maldivische roepie</displayName>
                                 <displayName count="other" draft="contributed">Maldivische roepie</displayName>
+                                <symbol draft="contributed">MVP</symbol>
                         </currency>
                         <currency type="MVR">
                                 <displayName>Maldivische rufiyaa</displayName>
                                 <displayName count="one">Maldivische rufiyaa</displayName>
                                 <displayName count="other">Maldivische rufiyaa</displayName>

@@ -9424,21 +11862,24 @@
                         </currency>
                         <currency type="MXN">
                                 <displayName>Mexicaanse peso</displayName>
                                 <displayName count="one">Mexicaanse peso</displayName>
                                 <displayName count="other">Mexicaanse peso</displayName>
+                                <symbol>MX$</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="MXP">
                                 <displayName>Mexicaanse zilveren peso (1861–1992)</displayName>
                                 <displayName count="one">Mexicaanse zilveren peso (1861–1992)</displayName>
                                 <displayName count="other">Mexicaanse zilveren peso (1861–1992)</displayName>
+                                <symbol draft="contributed">MXP</symbol>
                         </currency>
                         <currency type="MXV">
                                 <displayName>Mexicaanse unidad de inversion (UDI)</displayName>
                                 <displayName count="one">Mexicaanse unidad de inversion (UDI)</displayName>
                                 <displayName count="other">Mexicaanse unidad de inversion (UDI)</displayName>
+                                <symbol draft="contributed">MXV</symbol>
                         </currency>
                         <currency type="MYR">
                                 <displayName>Maleisische ringgit</displayName>
                                 <displayName count="one">Maleisische ringgit</displayName>
                                 <displayName count="other">Maleisische ringgit</displayName>

@@ -9447,15 +11888,17 @@
                         </currency>
                         <currency type="MZE">
                                 <displayName>Mozambikaanse escudo</displayName>
                                 <displayName count="one">Mozambikaanse escudo</displayName>
                                 <displayName count="other">Mozambikaanse escudo</displayName>
+                                <symbol draft="contributed">MZE</symbol>
                         </currency>
                         <currency type="MZM">
                                 <displayName>Oude Mozambikaanse metical</displayName>
                                 <displayName count="one">Oude Mozambikaanse metical</displayName>
                                 <displayName count="other">Oude Mozambikaanse metical</displayName>
+                                <symbol draft="contributed">MZM</symbol>
                         </currency>
                         <currency type="MZN">
                                 <displayName>Mozambikaanse metical</displayName>
                                 <displayName count="one">Mozambikaanse metical</displayName>
                                 <displayName count="other">Mozambikaanse metical</displayName>

@@ -9477,10 +11920,11 @@
                         </currency>
                         <currency type="NIC">
                                 <displayName>Nicaraguaanse córdoba (1988–1991)</displayName>
                                 <displayName count="one">Nicaraguaanse córdoba (1988–1991)</displayName>
                                 <displayName count="other">Nicaraguaanse córdoba (1988–1991)</displayName>
+                                <symbol draft="contributed">NIC</symbol>
                         </currency>
                         <currency type="NIO">
                                 <displayName>Nicaraguaanse córdoba</displayName>
                                 <displayName count="one">Nicaraguaanse córdoba</displayName>
                                 <displayName count="other">Nicaraguaanse córdoba</displayName>

@@ -9489,10 +11933,11 @@
                         </currency>
                         <currency type="NLG">
                                 <displayName>Nederlandse gulden</displayName>
                                 <displayName count="one">Nederlandse gulden</displayName>
                                 <displayName count="other">Nederlandse gulden</displayName>
+                                <symbol draft="contributed">NLG</symbol>
                         </currency>
                         <currency type="NOK">
                                 <displayName>Noorse kroon</displayName>
                                 <displayName count="one">Noorse kroon</displayName>
                                 <displayName count="other">Noorse kronen</displayName>

@@ -9508,10 +11953,11 @@
                         </currency>
                         <currency type="NZD">
                                 <displayName>Nieuw-Zeelandse dollar</displayName>
                                 <displayName count="one">Nieuw-Zeelandse dollar</displayName>
                                 <displayName count="other">Nieuw-Zeelandse dollar</displayName>
+                                <symbol>NZ$</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="OMR">
                                 <displayName>Omaanse rial</displayName>
                                 <displayName count="one">Omaanse rial</displayName>

@@ -9526,10 +11972,11 @@
                         </currency>
                         <currency type="PEI">
                                 <displayName>Peruaanse inti</displayName>
                                 <displayName count="one">Peruaanse inti</displayName>
                                 <displayName count="other">Peruaanse inti</displayName>
+                                <symbol draft="contributed">PEI</symbol>
                         </currency>
                         <currency type="PEN">
                                 <displayName>Peruaanse sol</displayName>
                                 <displayName count="one">Peruaanse sol</displayName>
                                 <displayName count="other">Peruaanse sol</displayName>

@@ -9537,10 +11984,11 @@
                         </currency>
                         <currency type="PES">
                                 <displayName>Peruaanse sol (1863–1965)</displayName>
                                 <displayName count="one">Peruaanse sol (1863–1965)</displayName>
                                 <displayName count="other">Peruaanse sol (1863–1965)</displayName>
+                                <symbol draft="contributed">PES</symbol>
                         </currency>
                         <currency type="PGK">
                                 <displayName>Papoea-Nieuw-Guinese kina</displayName>
                                 <displayName count="one">Papoea-Nieuw-Guinese kina</displayName>
                                 <displayName count="other">Papoea-Nieuw-Guinese kina</displayName>

@@ -9569,15 +12017,17 @@
                         </currency>
                         <currency type="PLZ">
                                 <displayName>Poolse zloty (1950–1995)</displayName>
                                 <displayName count="one">Poolse zloty (1950–1995)</displayName>
                                 <displayName count="other">Poolse zloty (1950–1995)</displayName>
+                                <symbol draft="contributed">PLZ</symbol>
                         </currency>
                         <currency type="PTE">
                                 <displayName>Portugese escudo</displayName>
                                 <displayName count="one">Portugese escudo</displayName>
                                 <displayName count="other">Portugese escudo</displayName>
+                                <symbol draft="contributed">PTE</symbol>
                         </currency>
                         <currency type="PYG">
                                 <displayName>Paraguayaanse guarani</displayName>
                                 <displayName count="one">Paraguayaanse guarani</displayName>
                                 <displayName count="other">Paraguayaanse guarani</displayName>

@@ -9592,15 +12042,17 @@
                         </currency>
                         <currency type="RHD">
                                 <displayName>Rhodesische dollar</displayName>
                                 <displayName count="one">Rhodesische dollar</displayName>
                                 <displayName count="other">Rhodesische dollar</displayName>
+                                <symbol draft="contributed">RHD</symbol>
                         </currency>
                         <currency type="ROL">
                                 <displayName>Oude Roemeense leu</displayName>
                                 <displayName count="one">Oude Roemeense leu</displayName>
                                 <displayName count="other">Oude Roemeense leu</displayName>
+                                <symbol draft="contributed">ROL</symbol>
                         </currency>
                         <currency type="RON">
                                 <displayName>Roemeense leu</displayName>
                                 <displayName count="one">Roemeense leu</displayName>
                                 <displayName count="other">Roemeense leu</displayName>

@@ -9622,10 +12074,12 @@
                         </currency>
                         <currency type="RUR">
                                 <displayName>Russische roebel (1991–1998)</displayName>
                                 <displayName count="one">Russische roebel (1991–1998)</displayName>
                                 <displayName count="other">Russische roebel (1991–1998)</displayName>
+                                <symbol draft="contributed">RUR</symbol>
+                                <symbol alt="narrow" draft="contributed">р.</symbol>
                         </currency>
                         <currency type="RWF">
                                 <displayName>Rwandese frank</displayName>
                                 <displayName count="one">Rwandese frank</displayName>
                                 <displayName count="other">Rwandese frank</displayName>

@@ -9653,10 +12107,11 @@
                         </currency>
                         <currency type="SDD">
                                 <displayName>Soedanese dinar</displayName>
                                 <displayName count="one">Soedanese dinar</displayName>
                                 <displayName count="other">Soedanese dinar</displayName>
+                                <symbol draft="contributed">SDD</symbol>
                         </currency>
                         <currency type="SDG">
                                 <displayName>Soedanees pond</displayName>
                                 <displayName count="one">Soedanees pond</displayName>
                                 <displayName count="other">Soedanees pond</displayName>

@@ -9664,10 +12119,11 @@
                         </currency>
                         <currency type="SDP">
                                 <displayName>Soedanees pond (1957–1998)</displayName>
                                 <displayName count="one">Soedanees pond (1957–1998)</displayName>
                                 <displayName count="other">Soedanees pond (1957–1998)</displayName>
+                                <symbol draft="contributed">SDP</symbol>
                         </currency>
                         <currency type="SEK">
                                 <displayName>Zweedse kroon</displayName>
                                 <displayName count="one">Zweedse kroon</displayName>
                                 <displayName count="other">Zweedse kronen</displayName>

@@ -9690,15 +12146,17 @@
                         </currency>
                         <currency type="SIT">
                                 <displayName>Sloveense tolar</displayName>
                                 <displayName count="one">Sloveense tolar</displayName>
                                 <displayName count="other">Sloveense tolar</displayName>
+                                <symbol draft="contributed">SIT</symbol>
                         </currency>
                         <currency type="SKK">
                                 <displayName>Slowaakse koruna</displayName>
                                 <displayName count="one">Slowaakse koruna</displayName>
                                 <displayName count="other">Slowaakse koruna</displayName>
+                                <symbol draft="contributed">SKK</symbol>
                         </currency>
                         <currency type="SLL">
                                 <displayName>Sierraleoonse leone</displayName>
                                 <displayName count="one">Sierraleoonse leone</displayName>
                                 <displayName count="other">Sierraleoonse leone</displayName>

@@ -9719,10 +12177,11 @@
                         </currency>
                         <currency type="SRG">
                                 <displayName>Surinaamse gulden</displayName>
                                 <displayName count="one">Surinaamse gulden</displayName>
                                 <displayName count="other">Surinaamse gulden</displayName>
+                                <symbol draft="contributed">SRG</symbol>
                         </currency>
                         <currency type="SSP">
                                 <displayName>Zuid-Soedanees pond</displayName>
                                 <displayName count="one">Zuid-Soedanees pond</displayName>
                                 <displayName count="other">Zuid-Soedanees pond</displayName>

@@ -9744,15 +12203,17 @@
                         </currency>
                         <currency type="SUR">
                                 <displayName>Sovjet-roebel</displayName>
                                 <displayName count="one">Sovjet-roebel</displayName>
                                 <displayName count="other">Sovjet-roebel</displayName>
+                                <symbol draft="contributed">SUR</symbol>
                         </currency>
                         <currency type="SVC">
                                 <displayName>Salvadoraanse colón</displayName>
                                 <displayName count="one">Salvadoraanse colón</displayName>
                                 <displayName count="other">Salvadoraanse colón</displayName>
+                                <symbol draft="contributed">SVC</symbol>
                         </currency>
                         <currency type="SYP">
                                 <displayName>Syrisch pond</displayName>
                                 <displayName count="one">Syrisch pond</displayName>
                                 <displayName count="other">Syrisch pond</displayName>

@@ -9774,10 +12235,11 @@
                         </currency>
                         <currency type="TJR">
                                 <displayName>Tadzjikistaanse roebel</displayName>
                                 <displayName count="one">Tadzjikistaanse roebel</displayName>
                                 <displayName count="other">Tadzjikistaanse roebel</displayName>
+                                <symbol draft="contributed">TJR</symbol>
                         </currency>
                         <currency type="TJS">
                                 <displayName>Tadzjiekse somoni</displayName>
                                 <displayName count="one">Tadzjiekse somoni</displayName>
                                 <displayName count="other">Tadzjiekse somoni</displayName>

@@ -9785,10 +12247,11 @@
                         </currency>
                         <currency type="TMM">
                                 <displayName>Turkmeense manat (1993–2009)</displayName>
                                 <displayName count="one">Turkmeense manat (1993–2009)</displayName>
                                 <displayName count="other">Turkmeense manat (1993–2009)</displayName>
+                                <symbol draft="contributed">TMM</symbol>
                         </currency>
                         <currency type="TMT">
                                 <displayName>Turkmeense manat</displayName>
                                 <displayName count="one">Turkmeense manat</displayName>
                                 <displayName count="other">Turkmeense manat</displayName>

@@ -9809,15 +12272,17 @@
                         </currency>
                         <currency type="TPE">
                                 <displayName>Timorese escudo</displayName>
                                 <displayName count="one">Timorese escudo</displayName>
                                 <displayName count="other">Timorese escudo</displayName>
+                                <symbol draft="contributed">TPE</symbol>
                         </currency>
                         <currency type="TRL">
                                 <displayName>Turkse lire</displayName>
                                 <displayName count="one" draft="contributed">oude Turkse lira</displayName>
                                 <displayName count="other" draft="contributed">oude Turkse lira</displayName>
+                                <symbol draft="contributed">TRL</symbol>
                         </currency>
                         <currency type="TRY">
                                 <displayName>Turkse lira</displayName>
                                 <displayName count="one">Turkse lira</displayName>
                                 <displayName count="other">Turkse lira</displayName>

@@ -9834,10 +12299,11 @@
                         </currency>
                         <currency type="TWD">
                                 <displayName>Nieuwe Taiwanese dollar</displayName>
                                 <displayName count="one">Nieuwe Taiwanese dollar</displayName>
                                 <displayName count="other">Nieuwe Taiwanese dollar</displayName>
+                                <symbol>NT$</symbol>
                                 <symbol alt="narrow" draft="contributed">NT$</symbol>
                         </currency>
                         <currency type="TZS">
                                 <displayName>Tanzaniaanse shilling</displayName>
                                 <displayName count="one">Tanzaniaanse shilling</displayName>

@@ -9853,15 +12319,17 @@
                         </currency>
                         <currency type="UAK">
                                 <displayName>Oekraïense karbovanetz</displayName>
                                 <displayName count="one">Oekraïense karbovanetz</displayName>
                                 <displayName count="other">Oekraïense karbovanetz</displayName>
+                                <symbol draft="contributed">UAK</symbol>
                         </currency>
                         <currency type="UGS">
                                 <displayName>Oegandese shilling (1966–1987)</displayName>
                                 <displayName count="one">Oegandese shilling (1966–1987)</displayName>
                                 <displayName count="other">Oegandese shilling (1966–1987)</displayName>
+                                <symbol draft="contributed">UGS</symbol>
                         </currency>
                         <currency type="UGX">
                                 <displayName>Oegandese shilling</displayName>
                                 <displayName count="one">Oegandese shilling</displayName>
                                 <displayName count="other">Oegandese shilling</displayName>

@@ -9869,79 +12337,75 @@
                         </currency>
                         <currency type="USD">
                                 <displayName>Amerikaanse dollar</displayName>
                                 <displayName count="one">Amerikaanse dollar</displayName>
                                 <displayName count="other">Amerikaanse dollar</displayName>
+                                <symbol>US$</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="USN">
                                 <displayName>Amerikaanse dollar (volgende dag)</displayName>
                                 <displayName count="one">Amerikaanse dollar (volgende dag)</displayName>
                                 <displayName count="other">Amerikaanse dollar (volgende dag)</displayName>
+                                <symbol draft="contributed">USN</symbol>
                         </currency>
                         <currency type="USS">
                                 <displayName>Amerikaanse dollar (zelfde dag)</displayName>
                                 <displayName count="one">Amerikaanse dollar (zelfde dag)</displayName>
                                 <displayName count="other">Amerikaanse dollar (zelfde dag)</displayName>
+                                <symbol draft="contributed">USS</symbol>
                         </currency>
                         <currency type="UYI">
                                 <displayName>Uruguayaanse peso en geïndexeerde eenheden</displayName>
                                 <displayName count="one">Uruguayaanse peso en geïndexeerde eenheden</displayName>
                                 <displayName count="other">Uruguayaanse peso en geïndexeerde eenheden</displayName>
+                                <symbol draft="contributed">UYI</symbol>
                         </currency>
                         <currency type="UYP">
                                 <displayName>Uruguayaanse peso (1975–1993)</displayName>
                                 <displayName count="one">Uruguayaanse peso (1975–1993)</displayName>
                                 <displayName count="other">Uruguayaanse peso (1975–1993)</displayName>
+                                <symbol draft="contributed">UYP</symbol>
                         </currency>
                         <currency type="UYU">
                                 <displayName>Uruguayaanse peso</displayName>
                                 <displayName count="one">Uruguayaanse peso</displayName>
                                 <displayName count="other">Uruguayaanse peso</displayName>
                                 <symbol draft="contributed">UYU</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
-                        <currency type="UYW">
-                                <displayName draft="contributed">Uruguayaanse nominale salarisindexeenheid</displayName>
-                                <displayName count="one" draft="contributed">Uruguayaanse nominale salarisindexeenheid</displayName>
-                                <displayName count="other" draft="contributed">Uruguayaanse nominale salarisindexeenheid</displayName>
-                                <symbol draft="contributed">UYW</symbol>
-                        </currency>
                         <currency type="UZS">
                                 <displayName>Oezbeekse sum</displayName>
                                 <displayName count="one">Oezbeekse sum</displayName>
                                 <displayName count="other">Oezbeekse sum</displayName>
                                 <symbol draft="contributed">UZS</symbol>
                         </currency>
                         <currency type="VEB">
                                 <displayName>Venezolaanse bolivar (1871–2008)</displayName>
                                 <displayName count="one">Venezolaanse bolivar (1871–2008)</displayName>
                                 <displayName count="other">Venezolaanse bolivar (1871–2008)</displayName>
+                                <symbol draft="contributed">VEB</symbol>
                         </currency>
                         <currency type="VEF">
-                                <displayName>Venezolaanse bolivar (2008–2018)</displayName>
-                                <displayName count="one">Venezolaanse bolivar (2008–2018)</displayName>
-                                <displayName count="other">Venezolaanse bolivar (2008–2018)</displayName>
-                                <symbol draft="contributed">VEF</symbol>
-                                <symbol alt="narrow" draft="contributed">Bs</symbol>
-                        </currency>
-                        <currency type="VES">
                                 <displayName>Venezolaanse bolivar</displayName>
                                 <displayName count="one">Venezolaanse bolivar</displayName>
                                 <displayName count="other">Venezolaanse bolivar</displayName>
-                                <symbol draft="contributed">VES</symbol>
+                                <symbol draft="contributed">VEF</symbol>
+                                <symbol alt="narrow" draft="contributed">Bs</symbol>
                         </currency>
                         <currency type="VND">
                                 <displayName>Vietnamese dong</displayName>
                                 <displayName count="one">Vietnamese dong</displayName>
                                 <displayName count="other">Vietnamese dong</displayName>
+                                <symbol>₫</symbol>
                                 <symbol alt="narrow" draft="contributed">₫</symbol>
                         </currency>
                         <currency type="VNN">
                                 <displayName draft="contributed">Vietnamese dong (1978–1985)</displayName>
                                 <displayName count="one" draft="contributed">Vietnamese dong (1978–1985)</displayName>
                                 <displayName count="other" draft="contributed">Vietnamese dong (1978–1985)</displayName>
+                                <symbol draft="contributed">VNN</symbol>
                         </currency>
                         <currency type="VUV">
                                 <displayName>Vanuatuaanse vatu</displayName>
                                 <displayName count="one">Vanuatuaanse vatu</displayName>
                                 <displayName count="other">Vanuatuaanse vatu</displayName>

@@ -9955,76 +12419,90 @@
                         </currency>
                         <currency type="XAF">
                                 <displayName>CFA-frank</displayName>
                                 <displayName count="one">CFA-frank</displayName>
                                 <displayName count="other">CFA-frank</displayName>
+                                <symbol>FCFA</symbol>
                         </currency>
                         <currency type="XAG">
                                 <displayName>Zilver</displayName>
                                 <displayName count="one" draft="contributed">Troy ounce zilver</displayName>
                                 <displayName count="other" draft="contributed">Troy ounces zilver</displayName>
+                                <symbol draft="contributed">XAG</symbol>
                         </currency>
                         <currency type="XAU">
                                 <displayName>Goud</displayName>
                                 <displayName count="one" draft="contributed">Troy ounce goud</displayName>
                                 <displayName count="other" draft="contributed">Troy ounces goud</displayName>
+                                <symbol draft="contributed">XAU</symbol>
                         </currency>
                         <currency type="XBA">
                                 <displayName>Europese samengestelde eenheid</displayName>
                                 <displayName count="one">Europese samengestelde eenheid</displayName>
                                 <displayName count="other">Europese samengestelde eenheid</displayName>
+                                <symbol draft="contributed">XBA</symbol>
                         </currency>
                         <currency type="XBB">
                                 <displayName>Europese monetaire eenheid</displayName>
                                 <displayName count="one">Europese monetaire eenheid</displayName>
                                 <displayName count="other">Europese monetaire eenheid</displayName>
+                                <symbol draft="contributed">XBB</symbol>
                         </currency>
                         <currency type="XBC">
                                 <displayName>Europese rekeneenheid (XBC)</displayName>
                                 <displayName count="one">Europese rekeneenheid (XBC)</displayName>
                                 <displayName count="other">Europese rekeneenheid (XBC)</displayName>
+                                <symbol draft="contributed">XBC</symbol>
                         </currency>
                         <currency type="XBD">
                                 <displayName>Europese rekeneenheid (XBD)</displayName>
                                 <displayName count="one">Europese rekeneenheid (XBD)</displayName>
                                 <displayName count="other">Europese rekeneenheid (XBD)</displayName>
+                                <symbol draft="contributed">XBD</symbol>
                         </currency>
                         <currency type="XCD">
                                 <displayName>Oost-Caribische dollar</displayName>
                                 <displayName count="one">Oost-Caribische dollar</displayName>
                                 <displayName count="other">Oost-Caribische dollar</displayName>
+                                <symbol>EC$</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="XDR">
                                 <displayName>Special Drawing Rights</displayName>
                                 <displayName count="one">Special Drawing Rights</displayName>
                                 <displayName count="other">Special Drawing Rights</displayName>
+                                <symbol draft="contributed">XDR</symbol>
                         </currency>
                         <currency type="XEU">
                                 <displayName>European Currency Unit</displayName>
                                 <displayName count="one">European Currency Unit</displayName>
                                 <displayName count="other">European Currency Unit</displayName>
+                                <symbol draft="contributed">XEU</symbol>
                         </currency>
                         <currency type="XFO">
                                 <displayName>Franse gouden franc</displayName>
                                 <displayName count="one">Franse gouden franc</displayName>
                                 <displayName count="other">Franse gouden franc</displayName>
+                                <symbol draft="contributed">XFO</symbol>
                         </currency>
                         <currency type="XFU">
                                 <displayName>Franse UIC-franc</displayName>
                                 <displayName count="one">Franse UIC-franc</displayName>
                                 <displayName count="other">Franse UIC-franc</displayName>
+                                <symbol draft="contributed">XFU</symbol>
                         </currency>
                         <currency type="XOF">
                                 <displayName>CFA-franc BCEAO</displayName>
                                 <displayName count="one">CFA-franc BCEAO</displayName>
                                 <displayName count="other">CFA-franc BCEAO</displayName>
+                                <symbol>CFA</symbol>
                         </currency>
                         <currency type="XPD">
                                 <displayName>Palladium</displayName>
                                 <displayName count="one" draft="contributed">Troy ounce palladium</displayName>
                                 <displayName count="other" draft="contributed">Troy ounces palladium</displayName>
+                                <symbol draft="contributed">XPD</symbol>
                         </currency>
                         <currency type="XPF">
                                 <displayName>CFP-frank</displayName>
                                 <displayName count="one">CFP-frank</displayName>
                                 <displayName count="other">CFP-frank</displayName>

@@ -10032,30 +12510,35 @@
                         </currency>
                         <currency type="XPT">
                                 <displayName>Platina</displayName>
                                 <displayName count="one" draft="contributed">Troy ounce platina</displayName>
                                 <displayName count="other" draft="contributed">Troy ounces platina</displayName>
+                                <symbol draft="contributed">XPT</symbol>
                         </currency>
                         <currency type="XRE">
                                 <displayName>RINET-fondsen</displayName>
                                 <displayName count="one">RINET-fondsen</displayName>
                                 <displayName count="other">RINET-fondsen</displayName>
+                                <symbol draft="contributed">XRE</symbol>
                         </currency>
                         <currency type="XSU">
                                 <displayName draft="contributed">Sucre</displayName>
                                 <displayName count="one" draft="contributed">Sucre</displayName>
                                 <displayName count="other" draft="contributed">Sucre</displayName>
+                                <symbol draft="contributed">XSU</symbol>
                         </currency>
                         <currency type="XTS">
                                 <displayName>Valutacode voor testdoeleinden</displayName>
                                 <displayName count="one">Valutacode voor testdoeleinden</displayName>
                                 <displayName count="other">Valutacode voor testdoeleinden</displayName>
+                                <symbol draft="contributed">XTS</symbol>
                         </currency>
                         <currency type="XUA">
                                 <displayName draft="contributed">ADB-rekeneenheid</displayName>
                                 <displayName count="one" draft="contributed">ADB-rekeneenheid</displayName>
                                 <displayName count="other" draft="contributed">ADB-rekeneenheid</displayName>
+                                <symbol draft="contributed">XUA</symbol>
                         </currency>
                         <currency type="XXX">
                                 <displayName>onbekende munteenheid</displayName>
                                 <displayName count="one">onbekende munteenheid</displayName>
                                 <displayName count="other">onbekende munteenheid</displayName>

@@ -10063,10 +12546,11 @@
                         </currency>
                         <currency type="YDD">
                                 <displayName>Jemenitische dinar</displayName>
                                 <displayName count="one">Jemenitische dinar</displayName>
                                 <displayName count="other">Jemenitische dinar</displayName>
+                                <symbol draft="contributed">YDD</symbol>
                         </currency>
                         <currency type="YER">
                                 <displayName>Jemenitische rial</displayName>
                                 <displayName count="one">Jemenitische rial</displayName>
                                 <displayName count="other">Jemenitische rial</displayName>

@@ -10074,30 +12558,35 @@
                         </currency>
                         <currency type="YUD">
                                 <displayName>Joegoslavische harde dinar</displayName>
                                 <displayName count="one">Joegoslavische harde dinar</displayName>
                                 <displayName count="other">Joegoslavische harde dinar</displayName>
+                                <symbol draft="contributed">YUD</symbol>
                         </currency>
                         <currency type="YUM">
                                 <displayName>Joegoslavische noviy-dinar</displayName>
                                 <displayName count="one">Joegoslavische noviy-dinar</displayName>
                                 <displayName count="other">Joegoslavische noviy-dinar</displayName>
+                                <symbol draft="contributed">YUM</symbol>
                         </currency>
                         <currency type="YUN">
                                 <displayName>Joegoslavische convertibele dinar</displayName>
                                 <displayName count="one">Joegoslavische convertibele dinar</displayName>
                                 <displayName count="other">Joegoslavische convertibele dinar</displayName>
+                                <symbol draft="contributed">YUN</symbol>
                         </currency>
                         <currency type="YUR">
                                 <displayName draft="contributed">Joegoslavische hervormde dinar (1992–1993)</displayName>
                                 <displayName count="one" draft="contributed">Joegoslavische hervormde dinar (1992–1993)</displayName>
                                 <displayName count="other" draft="contributed">Joegoslavische hervormde dinar (1992–1993)</displayName>
+                                <symbol draft="contributed">YUR</symbol>
                         </currency>
                         <currency type="ZAL">
                                 <displayName>Zuid-Afrikaanse rand (financieel)</displayName>
                                 <displayName count="one">Zuid-Afrikaanse rand (financieel)</displayName>
                                 <displayName count="other">Zuid-Afrikaanse rand (financieel)</displayName>
+                                <symbol draft="contributed">ZAL</symbol>
                         </currency>
                         <currency type="ZAR">
                                 <displayName>Zuid-Afrikaanse rand</displayName>
                                 <displayName count="one">Zuid-Afrikaanse rand</displayName>
                                 <displayName count="other">Zuid-Afrikaanse rand</displayName>

@@ -10106,10 +12595,11 @@
                         </currency>
                         <currency type="ZMK">
                                 <displayName>Zambiaanse kwacha (1968–2012)</displayName>
                                 <displayName count="one">Zambiaanse kwacha (1968–2012)</displayName>
                                 <displayName count="other">Zambiaanse kwacha (1968–2012)</displayName>
+                                <symbol draft="contributed">ZMK</symbol>
                         </currency>
                         <currency type="ZMW">
                                 <displayName>Zambiaanse kwacha</displayName>
                                 <displayName count="one">Zambiaanse kwacha</displayName>
                                 <displayName count="other">Zambiaanse kwacha</displayName>

@@ -10118,30 +12608,35 @@
                         </currency>
                         <currency type="ZRN">
                                 <displayName>Zaïrese nieuwe zaïre</displayName>
                                 <displayName count="one">Zaïrese nieuwe zaïre</displayName>
                                 <displayName count="other">Zaïrese nieuwe zaïre</displayName>
+                                <symbol draft="contributed">ZRN</symbol>
                         </currency>
                         <currency type="ZRZ">
                                 <displayName>Zaïrese zaïre</displayName>
                                 <displayName count="one">Zaïrese zaïre</displayName>
                                 <displayName count="other">Zaïrese zaïre</displayName>
+                                <symbol draft="contributed">ZRZ</symbol>
                         </currency>
                         <currency type="ZWD">
                                 <displayName>Zimbabwaanse dollar</displayName>
                                 <displayName count="one">Zimbabwaanse dollar</displayName>
                                 <displayName count="other">Zimbabwaanse dollar</displayName>
+                                <symbol draft="contributed">ZWD</symbol>
                         </currency>
                         <currency type="ZWL">
                                 <displayName draft="contributed">Zimbabwaanse dollar (2009)</displayName>
                                 <displayName count="one" draft="contributed">Zimbabwaanse dollar (2009)</displayName>
                                 <displayName count="other" draft="contributed">Zimbabwaanse dollar (2009)</displayName>
+                                <symbol draft="contributed">ZWL</symbol>
                         </currency>
                         <currency type="ZWR">
                                 <displayName draft="contributed">Zimbabwaanse dollar (2008)</displayName>
                                 <displayName count="one" draft="contributed">Zimbabwaanse dollar (2008)</displayName>
                                 <displayName count="other" draft="contributed">Zimbabwaanse dollar (2008)</displayName>
+                                <symbol draft="contributed">ZWR</symbol>
                         </currency>
                 </currencies>
                 <miscPatterns numberSystem="arab">
                         <pattern type="atLeast" draft="contributed">{0}+</pattern>
                         <pattern type="range" draft="contributed">{0}-{1}</pattern>

@@ -10176,18 +12671,10 @@
                 </miscPatterns>
                 <miscPatterns numberSystem="fullwide">
                         <pattern type="atLeast" draft="contributed">{0}+</pattern>
                         <pattern type="range" draft="contributed">{0}-{1}</pattern>
                 </miscPatterns>
-                <miscPatterns numberSystem="gong">
-                        <pattern type="atLeast" draft="contributed">{0}+</pattern>
-                        <pattern type="range" draft="contributed">{0}-{1}</pattern>
-                </miscPatterns>
-                <miscPatterns numberSystem="gonm">
-                        <pattern type="atLeast" draft="contributed">{0}+</pattern>
-                        <pattern type="range" draft="contributed">{0}-{1}</pattern>
-                </miscPatterns>
                 <miscPatterns numberSystem="gujr">
                         <pattern type="atLeast" draft="contributed">{0}+</pattern>
                         <pattern type="range" draft="contributed">{0}-{1}</pattern>
                 </miscPatterns>
                 <miscPatterns numberSystem="guru">

@@ -10225,13 +12712,11 @@
                 <miscPatterns numberSystem="laoo">
                         <pattern type="atLeast" draft="contributed">{0}+</pattern>
                         <pattern type="range" draft="contributed">{0}-{1}</pattern>
                 </miscPatterns>
                 <miscPatterns numberSystem="latn">
-                        <pattern type="approximately">~{0}</pattern>
                         <pattern type="atLeast">{0}+</pattern>
-                        <pattern type="atMost">≤{0}</pattern>
                         <pattern type="range">{0}-{1}</pattern>
                 </miscPatterns>
                 <miscPatterns numberSystem="lepc">
                         <pattern type="atLeast" draft="contributed">{0}+</pattern>
                         <pattern type="range" draft="contributed">{0}-{1}</pattern>

@@ -10274,14 +12759,10 @@
                 </miscPatterns>
                 <miscPatterns numberSystem="osma">
                         <pattern type="atLeast" draft="contributed">{0}+</pattern>
                         <pattern type="range" draft="contributed">{0}-{1}</pattern>
                 </miscPatterns>
-                <miscPatterns numberSystem="rohg">
-                        <pattern type="atLeast" draft="contributed">{0}+</pattern>
-                        <pattern type="range" draft="contributed">{0}-{1}</pattern>
-                </miscPatterns>
                 <miscPatterns numberSystem="saur">
                         <pattern type="atLeast" draft="contributed">{0}+</pattern>
                         <pattern type="range" draft="contributed">{0}-{1}</pattern>
                 </miscPatterns>
                 <miscPatterns numberSystem="shrd">

@@ -10375,10 +12856,11 @@
                                 <unitPattern count="one">{0} vierkante kilometer</unitPattern>
                                 <unitPattern count="other">{0} vierkante kilometer</unitPattern>
                                 <perUnitPattern>{0} per vierkante kilometer</perUnitPattern>
                         </unit>
                         <unit type="area-hectare">
+                                <displayName>hectare</displayName>
                                 <unitPattern count="one">{0} hectare</unitPattern>
                                 <unitPattern count="other">{0} hectare</unitPattern>
                         </unit>
                         <unit type="area-square-meter">
                                 <displayName>vierkante meter</displayName>

@@ -10397,10 +12879,11 @@
                                 <unitPattern count="one">{0} vierkante mijl</unitPattern>
                                 <unitPattern count="other">{0} vierkante mijl</unitPattern>
                                 <perUnitPattern>{0} per vierkante mijl</perUnitPattern>
                         </unit>
                         <unit type="area-acre">
+                                <displayName>acre</displayName>
                                 <unitPattern count="one">{0} acre</unitPattern>
                                 <unitPattern count="other">{0} acres</unitPattern>
                         </unit>
                         <unit type="area-square-yard">
                                 <displayName>vierkante yard</displayName>

@@ -10416,15 +12899,10 @@
                                 <displayName>vierkante inch</displayName>
                                 <unitPattern count="one">{0} vierkante inch</unitPattern>
                                 <unitPattern count="other">{0} vierkante inch</unitPattern>
                                 <perUnitPattern>{0} per vierkante inch</perUnitPattern>
                         </unit>
-                        <unit type="area-dunam">
-                                <displayName>dunam</displayName>
-                                <unitPattern count="one" draft="contributed">{0} dunam</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} dunam</unitPattern>
-                        </unit>
                         <unit type="concentr-karat">
                                 <displayName>karaat</displayName>
                                 <unitPattern count="one">{0} karaat</unitPattern>
                                 <unitPattern count="other">{0} karaat</unitPattern>
                         </unit>

@@ -10436,29 +12914,14 @@
                         <unit type="concentr-millimole-per-liter">
                                 <displayName>millimol per liter</displayName>
                                 <unitPattern count="one">{0} millimol per liter</unitPattern>
                                 <unitPattern count="other">{0} millimol per liter</unitPattern>
                         </unit>
-                        <unit type="concentr-percent">
-                                <displayName>procent</displayName>
-                                <unitPattern count="one">{0} procent</unitPattern>
-                                <unitPattern count="other">{0} procent</unitPattern>
-                        </unit>
-                        <unit type="concentr-permille">
-                                <displayName>promille</displayName>
-                                <unitPattern count="one">{0} promille</unitPattern>
-                                <unitPattern count="other">{0} promille</unitPattern>
-                        </unit>
-                        <unit type="concentr-permyriad">
-                                <displayName draft="contributed">basispunt</displayName>
-                                <unitPattern count="one" draft="contributed">{0} basispunt</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} basispunten</unitPattern>
-                        </unit>
-                        <unit type="concentr-mole">
-                                <displayName draft="contributed">mol</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mol</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mol</unitPattern>
+                        <unit type="concentr-part-per-million">
+                                <displayName>ppm</displayName>
+                                <unitPattern count="one">{0} ppm</unitPattern>
+                                <unitPattern count="other">{0} ppm</unitPattern>
                         </unit>
                         <unit type="consumption-liter-per-kilometer">
                                 <displayName>liter per kilometer</displayName>
                                 <unitPattern count="one">{0} liter per kilometer</unitPattern>
                                 <unitPattern count="other">{0} liter per kilometer</unitPattern>

@@ -10476,15 +12939,10 @@
                         <unit type="consumption-mile-per-gallon-imperial">
                                 <displayName>mijl per imp. gallon</displayName>
                                 <unitPattern count="one">{0} mijl per imp. gallon</unitPattern>
                                 <unitPattern count="other">{0} mijl per imp. gallon</unitPattern>
                         </unit>
-                        <unit type="digital-petabyte">
-                                <displayName>petabyte</displayName>
-                                <unitPattern count="one">{0} petabyte</unitPattern>
-                                <unitPattern count="other">{0} petabyte</unitPattern>
-                        </unit>
                         <unit type="digital-terabyte">
                                 <displayName>terabyte</displayName>
                                 <unitPattern count="one">{0} terabyte</unitPattern>
                                 <unitPattern count="other">{0} terabyte</unitPattern>
                         </unit>

@@ -10521,11 +12979,17 @@
                         <unit type="digital-kilobit">
                                 <displayName>kilobit</displayName>
                                 <unitPattern count="one">{0} kilobit</unitPattern>
                                 <unitPattern count="other">{0} kilobits</unitPattern>
                         </unit>
+                        <unit type="digital-byte">
+                                <displayName>byte</displayName>
+                                <unitPattern count="one">{0} byte</unitPattern>
+                                <unitPattern count="other">{0} byte</unitPattern>
+                        </unit>
                         <unit type="digital-bit">
+                                <displayName>bit</displayName>
                                 <unitPattern count="one">{0} bit</unitPattern>
                                 <unitPattern count="other">{0} bits</unitPattern>
                         </unit>
                         <unit type="duration-century">
                                 <displayName>eeuwen</displayName>

@@ -10598,14 +13062,16 @@
                                 <displayName>milliampère</displayName>
                                 <unitPattern count="one">{0} milliampère</unitPattern>
                                 <unitPattern count="other">{0} milliampère</unitPattern>
                         </unit>
                         <unit type="electric-ohm">
+                                <displayName>ohm</displayName>
                                 <unitPattern count="one">{0} ohm</unitPattern>
                                 <unitPattern count="other">{0} ohm</unitPattern>
                         </unit>
                         <unit type="electric-volt">
+                                <displayName>volt</displayName>
                                 <unitPattern count="one">{0} volt</unitPattern>
                                 <unitPattern count="other">{0} volt</unitPattern>
                         </unit>
                         <unit type="energy-kilocalorie">
                                 <displayName>kilocalorie</displayName>

@@ -10626,38 +13092,19 @@
                                 <displayName>kilojoule</displayName>
                                 <unitPattern count="one">{0} kilojoule</unitPattern>
                                 <unitPattern count="other">{0} kilojoules</unitPattern>
                         </unit>
                         <unit type="energy-joule">
+                                <displayName>joule</displayName>
                                 <unitPattern count="one">{0} joule</unitPattern>
                                 <unitPattern count="other">{0} joules</unitPattern>
                         </unit>
                         <unit type="energy-kilowatt-hour">
                                 <displayName>kilowattuur</displayName>
                                 <unitPattern count="one">{0} kilowattuur</unitPattern>
                                 <unitPattern count="other">{0} kilowattuur</unitPattern>
                         </unit>
-                        <unit type="energy-electronvolt">
-                                <displayName draft="contributed">elektronvolt</displayName>
-                                <unitPattern count="one" draft="contributed">{0} elektronvolt</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} elektronvolt</unitPattern>
-                        </unit>
-                        <unit type="energy-british-thermal-unit">
-                                <displayName draft="contributed">British thermal unit</displayName>
-                                <unitPattern count="one" draft="contributed">{0} British thermal unit</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} British thermal unit</unitPattern>
-                        </unit>
-                        <unit type="force-pound-force">
-                                <displayName draft="contributed">pound of force</displayName>
-                                <unitPattern count="one" draft="contributed">{0} pound of force</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} pound of force</unitPattern>
-                        </unit>
-                        <unit type="force-newton">
-                                <displayName draft="contributed">newton</displayName>
-                                <unitPattern count="one" draft="contributed">{0} newton</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} newton</unitPattern>
-                        </unit>
                         <unit type="frequency-gigahertz">
                                 <displayName>gigahertz</displayName>
                                 <unitPattern count="one">{0} gigahertz</unitPattern>
                                 <unitPattern count="other">{0} gigahertz</unitPattern>
                         </unit>

@@ -10681,10 +13128,11 @@
                                 <unitPattern count="one">{0} kilometer</unitPattern>
                                 <unitPattern count="other">{0} kilometer</unitPattern>
                                 <perUnitPattern>{0} per kilometer</perUnitPattern>
                         </unit>
                         <unit type="length-meter">
+                                <displayName>meter</displayName>
                                 <unitPattern count="one">{0} meter</unitPattern>
                                 <unitPattern count="other">{0} meter</unitPattern>
                                 <perUnitPattern>{0} per meter</perUnitPattern>
                         </unit>
                         <unit type="length-decimeter">

@@ -10778,25 +13226,15 @@
                         <unit type="length-point">
                                 <displayName>punten</displayName>
                                 <unitPattern count="one">{0} punt</unitPattern>
                                 <unitPattern count="other">{0} punten</unitPattern>
                         </unit>
-                        <unit type="length-solar-radius">
-                                <displayName draft="contributed">solar radii</displayName>
-                                <unitPattern count="one" draft="contributed">{0} solar radius</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} solar radii</unitPattern>
-                        </unit>
                         <unit type="light-lux">
                                 <displayName>lux</displayName>
                                 <unitPattern count="one">{0} lux</unitPattern>
                                 <unitPattern count="other">{0} lux</unitPattern>
                         </unit>
-                        <unit type="light-solar-luminosity">
-                                <displayName draft="contributed">solar luminosity</displayName>
-                                <unitPattern count="one" draft="contributed">{0} solar luminosity</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} solar luminosity</unitPattern>
-                        </unit>
                         <unit type="mass-metric-ton">
                                 <displayName>tonne</displayName>
                                 <unitPattern count="one">{0} tonne</unitPattern>
                                 <unitPattern count="other">{0} tonnes</unitPattern>
                         </unit>

@@ -10805,10 +13243,11 @@
                                 <unitPattern count="one">{0} kilogram</unitPattern>
                                 <unitPattern count="other">{0} kilogram</unitPattern>
                                 <perUnitPattern>{0} per kilogram</perUnitPattern>
                         </unit>
                         <unit type="mass-gram">
+                                <displayName>gram</displayName>
                                 <unitPattern count="one">{0} gram</unitPattern>
                                 <unitPattern count="other">{0} gram</unitPattern>
                                 <perUnitPattern>{0} per gram</perUnitPattern>
                         </unit>
                         <unit type="mass-milligram">

@@ -10851,25 +13290,10 @@
                         <unit type="mass-carat">
                                 <displayName>karaat</displayName>
                                 <unitPattern count="one">{0} karaat</unitPattern>
                                 <unitPattern count="other">{0} karaat</unitPattern>
                         </unit>
-                        <unit type="mass-dalton">
-                                <displayName draft="contributed">dalton</displayName>
-                                <unitPattern count="one" draft="contributed">{0} dalton</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} dalton</unitPattern>
-                        </unit>
-                        <unit type="mass-earth-mass">
-                                <displayName draft="contributed">aardmassa</displayName>
-                                <unitPattern count="one" draft="contributed">{0} aardmassa</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} aardmassa</unitPattern>
-                        </unit>
-                        <unit type="mass-solar-mass">
-                                <displayName draft="contributed">zonnemassa</displayName>
-                                <unitPattern count="one" draft="contributed">{0} zonnemassa</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} zonnemassa</unitPattern>
-                        </unit>
                         <unit type="power-gigawatt">
                                 <displayName>gigawatt</displayName>
                                 <unitPattern count="one">{0} gigawatt</unitPattern>
                                 <unitPattern count="other">{0} gigawatt</unitPattern>
                         </unit>

@@ -10882,10 +13306,11 @@
                                 <displayName>kilowatt</displayName>
                                 <unitPattern count="one">{0} kilowatt</unitPattern>
                                 <unitPattern count="other">{0} kilowatt</unitPattern>
                         </unit>
                         <unit type="power-watt">
+                                <displayName>watt</displayName>
                                 <unitPattern count="one">{0} watt</unitPattern>
                                 <unitPattern count="other">{0} watt</unitPattern>
                         </unit>
                         <unit type="power-milliwatt">
                                 <displayName>milliwatt</displayName>

@@ -10905,35 +13330,25 @@
                         <unit type="pressure-millimeter-of-mercury">
                                 <displayName>millimeter-kwikdruk</displayName>
                                 <unitPattern count="one">{0} millimeter-kwikdruk</unitPattern>
                                 <unitPattern count="other">{0} millimeter-kwikdruk</unitPattern>
                         </unit>
+                        <unit type="pressure-pound-per-square-inch">
+                                <displayName>psi</displayName>
+                                <unitPattern count="one">{0} psi</unitPattern>
+                                <unitPattern count="other">{0} psi</unitPattern>
+                        </unit>
                         <unit type="pressure-inch-hg">
                                 <displayName>inch-kwikdruk</displayName>
                                 <unitPattern count="one">{0} inch-kwikdruk</unitPattern>
                                 <unitPattern count="other">{0} inch-kwikdruk</unitPattern>
                         </unit>
                         <unit type="pressure-millibar">
                                 <displayName>millibar</displayName>
                                 <unitPattern count="one">{0} millibar</unitPattern>
                                 <unitPattern count="other">{0} millibar</unitPattern>
                         </unit>
-                        <unit type="pressure-atmosphere">
-                                <displayName>atmosfeer</displayName>
-                                <unitPattern count="one">{0} atmosfeer</unitPattern>
-                                <unitPattern count="other">{0} atmosfeer</unitPattern>
-                        </unit>
-                        <unit type="pressure-kilopascal">
-                                <displayName draft="contributed">kilopascal</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kilopascal</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kilopascal</unitPattern>
-                        </unit>
-                        <unit type="pressure-megapascal">
-                                <displayName draft="contributed">megapascal</displayName>
-                                <unitPattern count="one" draft="contributed">{0} megapascal</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} megapascal</unitPattern>
-                        </unit>
                         <unit type="speed-kilometer-per-hour">
                                 <displayName>kilometer per uur</displayName>
                                 <unitPattern count="one">{0} kilometer per uur</unitPattern>
                                 <unitPattern count="other">{0} kilometer per uur</unitPattern>
                         </unit>

@@ -10950,10 +13365,15 @@
                         <unit type="speed-knot">
                                 <displayName>knoop</displayName>
                                 <unitPattern count="one">{0} knoop</unitPattern>
                                 <unitPattern count="other">{0} knopen</unitPattern>
                         </unit>
+                        <unit type="temperature-generic">
+                                <displayName>°</displayName>
+                                <unitPattern count="one">{0}°</unitPattern>
+                                <unitPattern count="other">{0}°</unitPattern>
+                        </unit>
                         <unit type="temperature-celsius">
                                 <displayName>graden Celsius</displayName>
                                 <unitPattern count="one">{0} graad Celsius</unitPattern>
                                 <unitPattern count="other">{0} graden Celsius</unitPattern>
                         </unit>

@@ -10965,20 +13385,10 @@
                         <unit type="temperature-kelvin">
                                 <displayName>kelvin</displayName>
                                 <unitPattern count="one">{0} kelvin</unitPattern>
                                 <unitPattern count="other">{0} kelvin</unitPattern>
                         </unit>
-                        <unit type="torque-pound-foot">
-                                <displayName draft="contributed">pound-feet</displayName>
-                                <unitPattern count="one" draft="contributed">{0} pound-foot</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} pound-feet</unitPattern>
-                        </unit>
-                        <unit type="torque-newton-meter">
-                                <displayName draft="contributed">newtonmeter</displayName>
-                                <unitPattern count="one" draft="contributed">{0} newtonmeter</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} newtonmeter</unitPattern>
-                        </unit>
                         <unit type="volume-cubic-kilometer">
                                 <displayName>kubieke kilometer</displayName>
                                 <unitPattern count="one">{0} kubieke kilometer</unitPattern>
                                 <unitPattern count="other">{0} kubieke kilometer</unitPattern>
                         </unit>

@@ -11023,10 +13433,11 @@
                                 <displayName>hectoliter</displayName>
                                 <unitPattern count="one">{0} hectoliter</unitPattern>
                                 <unitPattern count="other">{0} hectoliter</unitPattern>
                         </unit>
                         <unit type="volume-liter">
+                                <displayName>liter</displayName>
                                 <unitPattern count="one">{0} liter</unitPattern>
                                 <unitPattern count="other">{0} liter</unitPattern>
                                 <perUnitPattern>{0} per liter</perUnitPattern>
                         </unit>
                         <unit type="volume-deciliter">

@@ -11085,91 +13496,125 @@
                                 <displayName>pint</displayName>
                                 <unitPattern count="one">{0} pint</unitPattern>
                                 <unitPattern count="other">{0} pint</unitPattern>
                         </unit>
                         <unit type="volume-cup">
+                                <displayName>cup</displayName>
                                 <unitPattern count="one">{0} cup</unitPattern>
                                 <unitPattern count="other">{0} cup</unitPattern>
                         </unit>
                         <unit type="volume-fluid-ounce">
                                 <displayName>fluid ounce</displayName>
                                 <unitPattern count="one">{0} fluid ounce</unitPattern>
                                 <unitPattern count="other">{0} fluid ounce</unitPattern>
                         </unit>
-                        <unit type="volume-fluid-ounce-imperial">
-                                <displayName draft="contributed">Imp. fluid ounce</displayName>
-                                <unitPattern count="one" draft="contributed">{0} Imp. fluid ounce</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} Imp. fluid ounce</unitPattern>
-                        </unit>
                         <unit type="volume-tablespoon">
                                 <displayName>eetlepel</displayName>
                                 <unitPattern count="one">{0} eetlepel</unitPattern>
                                 <unitPattern count="other">{0} eetlepels</unitPattern>
                         </unit>
                         <unit type="volume-teaspoon">
                                 <displayName>theelepel</displayName>
                                 <unitPattern count="one">{0} theelepel</unitPattern>
                                 <unitPattern count="other">{0} theelepels</unitPattern>
                         </unit>
-                        <unit type="volume-barrel">
-                                <displayName draft="contributed">barrels</displayName>
-                                <unitPattern count="one" draft="contributed">{0} barrel</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} barrels</unitPattern>
-                        </unit>
                         <coordinateUnit>
-                                <displayName>windstreek</displayName>
                                 <coordinateUnitPattern type="east">{0} oosterlengte</coordinateUnitPattern>
                                 <coordinateUnitPattern type="north">{0} noorderbreedte</coordinateUnitPattern>
                                 <coordinateUnitPattern type="south">{0} zuiderbreedte</coordinateUnitPattern>
                                 <coordinateUnitPattern type="west">{0} westerlengte</coordinateUnitPattern>
                         </coordinateUnit>
                 </unitLength>
                 <unitLength type="short">
+                        <compoundUnit type="per">
+                                <compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+                        </compoundUnit>
                         <unit type="acceleration-g-force">
                                 <displayName>G</displayName>
+                                <unitPattern count="one">{0} G</unitPattern>
+                                <unitPattern count="other">{0} G</unitPattern>
+                        </unit>
+                        <unit type="acceleration-meter-per-second-squared">
+                                <displayName>m/s²</displayName>
+                                <unitPattern count="one">{0} m/s²</unitPattern>
+                                <unitPattern count="other">{0} m/s²</unitPattern>
                         </unit>
                         <unit type="angle-revolution">
                                 <displayName>tr</displayName>
                                 <unitPattern count="one">{0} tr</unitPattern>
                                 <unitPattern count="other">{0} tr</unitPattern>
                         </unit>
+                        <unit type="angle-radian">
+                                <displayName>rad</displayName>
+                                <unitPattern count="one">{0} rad</unitPattern>
+                                <unitPattern count="other">{0} rad</unitPattern>
+                        </unit>
                         <unit type="angle-degree">
                                 <displayName>°</displayName>
+                                <unitPattern count="one">{0}°</unitPattern>
+                                <unitPattern count="other">{0}°</unitPattern>
                         </unit>
                         <unit type="angle-arc-minute">
                                 <displayName>′</displayName>
+                                <unitPattern count="one">{0}′</unitPattern>
+                                <unitPattern count="other">{0}′</unitPattern>
                         </unit>
                         <unit type="angle-arc-second">
                                 <displayName>″</displayName>
+                                <unitPattern count="one">{0}″</unitPattern>
+                                <unitPattern count="other">{0}″</unitPattern>
                         </unit>
                         <unit type="area-square-kilometer">
+                                <displayName>km²</displayName>
+                                <unitPattern count="one">{0} km²</unitPattern>
+                                <unitPattern count="other">{0} km²</unitPattern>
                                 <perUnitPattern>{0} per km²</perUnitPattern>
                         </unit>
                         <unit type="area-hectare">
                                 <displayName>ha</displayName>
+                                <unitPattern count="one">{0} ha</unitPattern>
+                                <unitPattern count="other">{0} ha</unitPattern>
                         </unit>
                         <unit type="area-square-meter">
+                                <displayName>m²</displayName>
+                                <unitPattern count="one">{0} m²</unitPattern>
+                                <unitPattern count="other">{0} m²</unitPattern>
                                 <perUnitPattern>{0} per m²</perUnitPattern>
                         </unit>
                         <unit type="area-square-centimeter">
+                                <displayName>cm²</displayName>
+                                <unitPattern count="one">{0} cm²</unitPattern>
+                                <unitPattern count="other">{0} cm²</unitPattern>
                                 <perUnitPattern>{0} per cm²</perUnitPattern>
                         </unit>
                         <unit type="area-square-mile">
+                                <displayName>mi²</displayName>
+                                <unitPattern count="one">{0} mi²</unitPattern>
+                                <unitPattern count="other">{0} mi²</unitPattern>
                                 <perUnitPattern>{0} per mi²</perUnitPattern>
                         </unit>
                         <unit type="area-acre">
+                                <displayName>acre</displayName>
                                 <unitPattern count="one">{0} acre</unitPattern>
                                 <unitPattern count="other">{0} acres</unitPattern>
                         </unit>
+                        <unit type="area-square-yard">
+                                <displayName>yd²</displayName>
+                                <unitPattern count="one">{0} yd²</unitPattern>
+                                <unitPattern count="other">{0} yd²</unitPattern>
+                        </unit>
+                        <unit type="area-square-foot">
+                                <displayName>ft²</displayName>
+                                <unitPattern count="one">{0} ft²</unitPattern>
+                                <unitPattern count="other">{0} ft²</unitPattern>
+                        </unit>
                         <unit type="area-square-inch">
+                                <displayName>in²</displayName>
+                                <unitPattern count="one">{0} in²</unitPattern>
+                                <unitPattern count="other">{0} in²</unitPattern>
                                 <perUnitPattern>{0} per in²</perUnitPattern>
                         </unit>
-                        <unit type="area-dunam">
-                                <displayName>dunam</displayName>
-                                <unitPattern count="one" draft="contributed">{0} dunam</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} dunam</unitPattern>
-                        </unit>
                         <unit type="concentr-karat">
                                 <displayName>K</displayName>
                                 <unitPattern count="one">{0} K</unitPattern>
                                 <unitPattern count="other">{0} K</unitPattern>
                         </unit>

@@ -11181,25 +13626,14 @@
                         <unit type="concentr-millimole-per-liter">
                                 <displayName>millimol/liter</displayName>
                                 <unitPattern count="one">{0} mmol/l</unitPattern>
                                 <unitPattern count="other">{0} mmol/l</unitPattern>
                         </unit>
-                        <unit type="concentr-percent">
-                                <displayName>procent</displayName>
-                        </unit>
-                        <unit type="concentr-permille">
-                                <displayName>promille</displayName>
-                        </unit>
-                        <unit type="concentr-permyriad">
-                                <displayName draft="contributed">‱</displayName>
-                                <unitPattern count="one" draft="contributed">{0}‱</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0}‱</unitPattern>
-                        </unit>
-                        <unit type="concentr-mole">
-                                <displayName draft="contributed">mol</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mol</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mol</unitPattern>
+                        <unit type="concentr-part-per-million">
+                                <displayName>ppm</displayName>
+                                <unitPattern count="one">{0} ppm</unitPattern>
+                                <unitPattern count="other">{0} ppm</unitPattern>
                         </unit>
                         <unit type="consumption-liter-per-kilometer">
                                 <displayName>l/km</displayName>
                                 <unitPattern count="one">{0} l/km</unitPattern>
                                 <unitPattern count="other">{0} l/km</unitPattern>

@@ -11217,11 +13651,57 @@
                         <unit type="consumption-mile-per-gallon-imperial">
                                 <displayName>mijl/imp. gal</displayName>
                                 <unitPattern count="one">{0} mpg imp.</unitPattern>
                                 <unitPattern count="other">{0} mpg imp.</unitPattern>
                         </unit>
+                        <unit type="digital-terabyte">
+                                <displayName>TB</displayName>
+                                <unitPattern count="one">{0} TB</unitPattern>
+                                <unitPattern count="other">{0} TB</unitPattern>
+                        </unit>
+                        <unit type="digital-terabit">
+                                <displayName>Tb</displayName>
+                                <unitPattern count="one">{0} Tb</unitPattern>
+                                <unitPattern count="other">{0} Tb</unitPattern>
+                        </unit>
+                        <unit type="digital-gigabyte">
+                                <displayName>GB</displayName>
+                                <unitPattern count="one">{0} GB</unitPattern>
+                                <unitPattern count="other">{0} GB</unitPattern>
+                        </unit>
+                        <unit type="digital-gigabit">
+                                <displayName>Gb</displayName>
+                                <unitPattern count="one">{0} Gb</unitPattern>
+                                <unitPattern count="other">{0} Gb</unitPattern>
+                        </unit>
+                        <unit type="digital-megabyte">
+                                <displayName>MB</displayName>
+                                <unitPattern count="one">{0} MB</unitPattern>
+                                <unitPattern count="other">{0} MB</unitPattern>
+                        </unit>
+                        <unit type="digital-megabit">
+                                <displayName>Mb</displayName>
+                                <unitPattern count="one">{0} Mb</unitPattern>
+                                <unitPattern count="other">{0} Mb</unitPattern>
+                        </unit>
+                        <unit type="digital-kilobyte">
+                                <displayName>kB</displayName>
+                                <unitPattern count="one">{0} kB</unitPattern>
+                                <unitPattern count="other">{0} kB</unitPattern>
+                        </unit>
+                        <unit type="digital-kilobit">
+                                <displayName>kb</displayName>
+                                <unitPattern count="one">{0} kb</unitPattern>
+                                <unitPattern count="other">{0} kb</unitPattern>
+                        </unit>
+                        <unit type="digital-byte">
+                                <displayName>byte</displayName>
+                                <unitPattern count="one">{0} byte</unitPattern>
+                                <unitPattern count="other">{0} byte</unitPattern>
+                        </unit>
                         <unit type="digital-bit">
+                                <displayName>bit</displayName>
                                 <unitPattern count="one">{0} bit</unitPattern>
                                 <unitPattern count="other">{0} bits</unitPattern>
                         </unit>
                         <unit type="duration-century">
                                 <displayName>eeuwen</displayName>

@@ -11285,53 +13765,147 @@
                                 <unitPattern count="one">{0} ns</unitPattern>
                                 <unitPattern count="other">{0} ns</unitPattern>
                         </unit>
                         <unit type="electric-ampere">
                                 <displayName>A</displayName>
+                                <unitPattern count="one">{0} A</unitPattern>
+                                <unitPattern count="other">{0} A</unitPattern>
+                        </unit>
+                        <unit type="electric-milliampere">
+                                <displayName>mA</displayName>
+                                <unitPattern count="one">{0} mA</unitPattern>
+                                <unitPattern count="other">{0} mA</unitPattern>
                         </unit>
                         <unit type="electric-ohm">
                                 <displayName>Ω</displayName>
+                                <unitPattern count="one">{0} Ω</unitPattern>
+                                <unitPattern count="other">{0} Ω</unitPattern>
                         </unit>
                         <unit type="electric-volt">
                                 <displayName>V</displayName>
+                                <unitPattern count="one">{0} V</unitPattern>
+                                <unitPattern count="other">{0} V</unitPattern>
+                        </unit>
+                        <unit type="energy-kilocalorie">
+                                <displayName>kcal</displayName>
+                                <unitPattern count="one">{0} kcal</unitPattern>
+                                <unitPattern count="other">{0} kcal</unitPattern>
+                        </unit>
+                        <unit type="energy-calorie">
+                                <displayName>cal</displayName>
+                                <unitPattern count="one">{0} cal</unitPattern>
+                                <unitPattern count="other">{0} cal</unitPattern>
                         </unit>
                         <unit type="energy-foodcalorie">
                                 <displayName>kcal</displayName>
                                 <unitPattern count="one">{0} kcal</unitPattern>
                                 <unitPattern count="other">{0} kcal</unitPattern>
                         </unit>
+                        <unit type="energy-kilojoule">
+                                <displayName>kJ</displayName>
+                                <unitPattern count="one">{0} kJ</unitPattern>
+                                <unitPattern count="other">{0} kJ</unitPattern>
+                        </unit>
                         <unit type="energy-joule">
                                 <displayName>J</displayName>
+                                <unitPattern count="one">{0} J</unitPattern>
+                                <unitPattern count="other">{0} J</unitPattern>
+                        </unit>
+                        <unit type="energy-kilowatt-hour">
+                                <displayName>kWh</displayName>
+                                <unitPattern count="one">{0} kWh</unitPattern>
+                                <unitPattern count="other">{0} kWh</unitPattern>
                         </unit>
-                        <unit type="energy-electronvolt">
-                                <displayName draft="contributed">eV</displayName>
-                                <unitPattern count="one" draft="contributed">{0} eV</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} eV</unitPattern>
-                        </unit>
-                        <unit type="energy-british-thermal-unit">
-                                <displayName draft="contributed">Btu</displayName>
-                                <unitPattern count="one" draft="contributed">{0} Btu</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} Btu</unitPattern>
-                        </unit>
-                        <unit type="force-pound-force">
-                                <displayName draft="contributed">lbf</displayName>
-                                <unitPattern count="one" draft="contributed">{0} lbf</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} lbf</unitPattern>
-                        </unit>
-                        <unit type="force-newton">
-                                <displayName>N</displayName>
-                                <unitPattern count="one" draft="contributed">{0} N</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} N</unitPattern>
+                        <unit type="frequency-gigahertz">
+                                <displayName>GHz</displayName>
+                                <unitPattern count="one">{0} GHz</unitPattern>
+                                <unitPattern count="other">{0} GHz</unitPattern>
+                        </unit>
+                        <unit type="frequency-megahertz">
+                                <displayName>MHz</displayName>
+                                <unitPattern count="one">{0} MHz</unitPattern>
+                                <unitPattern count="other">{0} MHz</unitPattern>
+                        </unit>
+                        <unit type="frequency-kilohertz">
+                                <displayName>kHz</displayName>
+                                <unitPattern count="one">{0} kHz</unitPattern>
+                                <unitPattern count="other">{0} kHz</unitPattern>
+                        </unit>
+                        <unit type="frequency-hertz">
+                                <displayName>Hz</displayName>
+                                <unitPattern count="one">{0} Hz</unitPattern>
+                                <unitPattern count="other">{0} Hz</unitPattern>
+                        </unit>
+                        <unit type="length-kilometer">
+                                <displayName>km</displayName>
+                                <unitPattern count="one">{0} km</unitPattern>
+                                <unitPattern count="other">{0} km</unitPattern>
+                                <perUnitPattern>{0}/km</perUnitPattern>
                         </unit>
                         <unit type="length-meter">
                                 <displayName>m</displayName>
+                                <unitPattern count="one">{0} m</unitPattern>
+                                <unitPattern count="other">{0} m</unitPattern>
+                                <perUnitPattern>{0}/m</perUnitPattern>
+                        </unit>
+                        <unit type="length-decimeter">
+                                <displayName>dm</displayName>
+                                <unitPattern count="one">{0} dm</unitPattern>
+                                <unitPattern count="other">{0} dm</unitPattern>
+                        </unit>
+                        <unit type="length-centimeter">
+                                <displayName>cm</displayName>
+                                <unitPattern count="one">{0} cm</unitPattern>
+                                <unitPattern count="other">{0} cm</unitPattern>
+                                <perUnitPattern>{0}/cm</perUnitPattern>
+                        </unit>
+                        <unit type="length-millimeter">
+                                <displayName>mm</displayName>
+                                <unitPattern count="one">{0} mm</unitPattern>
+                                <unitPattern count="other">{0} mm</unitPattern>
+                        </unit>
+                        <unit type="length-micrometer">
+                                <displayName>µm</displayName>
+                                <unitPattern count="one">{0} µm</unitPattern>
+                                <unitPattern count="other">{0} µm</unitPattern>
+                        </unit>
+                        <unit type="length-nanometer">
+                                <displayName>nm</displayName>
+                                <unitPattern count="one">{0} nm</unitPattern>
+                                <unitPattern count="other">{0} nm</unitPattern>
+                        </unit>
+                        <unit type="length-picometer">
+                                <displayName>pm</displayName>
+                                <unitPattern count="one">{0} pm</unitPattern>
+                                <unitPattern count="other">{0} pm</unitPattern>
+                        </unit>
+                        <unit type="length-mile">
+                                <displayName>mi</displayName>
+                                <unitPattern count="one">{0} mi</unitPattern>
+                                <unitPattern count="other">{0} mi</unitPattern>
                         </unit>
                         <unit type="length-yard">
                                 <displayName>yards</displayName>
+                                <unitPattern count="one">{0} yd</unitPattern>
+                                <unitPattern count="other">{0} yd</unitPattern>
+                        </unit>
+                        <unit type="length-foot">
+                                <displayName>ft</displayName>
+                                <unitPattern count="one">{0} ft</unitPattern>
+                                <unitPattern count="other">{0} ft</unitPattern>
+                                <perUnitPattern>{0}/ft</perUnitPattern>
                         </unit>
                         <unit type="length-inch">
                                 <displayName>inches</displayName>
+                                <unitPattern count="one">{0} in</unitPattern>
+                                <unitPattern count="other">{0} in</unitPattern>
+                                <perUnitPattern>{0}/in</perUnitPattern>
+                        </unit>
+                        <unit type="length-parsec">
+                                <displayName>pc</displayName>
+                                <unitPattern count="one">{0} pc</unitPattern>
+                                <unitPattern count="other">{0} pc</unitPattern>
                         </unit>
                         <unit type="length-light-year">
                                 <displayName>lj</displayName>
                                 <unitPattern count="one">{0} lj</unitPattern>
                                 <unitPattern count="other">{0} lj</unitPattern>

@@ -11339,100 +13913,246 @@
                         <unit type="length-astronomical-unit">
                                 <displayName>AE</displayName>
                                 <unitPattern count="one">{0} AE</unitPattern>
                                 <unitPattern count="other">{0} AE</unitPattern>
                         </unit>
+                        <unit type="length-furlong">
+                                <displayName draft="contributed">fur</displayName>
+                                <unitPattern count="one" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+                        </unit>
                         <unit type="length-fathom">
-                                <unitPattern count="one" draft="contributed">{0} fth</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} fth</unitPattern>
+                                <displayName draft="contributed">fm</displayName>
+                                <unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} fm</unitPattern>
+                        </unit>
+                        <unit type="length-nautical-mile">
+                                <displayName>nmi</displayName>
+                                <unitPattern count="one">{0} nmi</unitPattern>
+                                <unitPattern count="other">{0} nmi</unitPattern>
+                        </unit>
+                        <unit type="length-mile-scandinavian">
+                                <displayName>smi</displayName>
+                                <unitPattern count="one">{0} smi</unitPattern>
+                                <unitPattern count="other">{0} smi</unitPattern>
                         </unit>
                         <unit type="length-point">
                                 <displayName>punten</displayName>
+                                <unitPattern count="one">{0} pt</unitPattern>
+                                <unitPattern count="other">{0} pt</unitPattern>
+                        </unit>
+                        <unit type="light-lux">
+                                <displayName>lx</displayName>
+                                <unitPattern count="one">{0} lx</unitPattern>
+                                <unitPattern count="other">{0} lx</unitPattern>
+                        </unit>
+                        <unit type="mass-metric-ton">
+                                <displayName>t</displayName>
+                                <unitPattern count="one">{0} t</unitPattern>
+                                <unitPattern count="other">{0} t</unitPattern>
                         </unit>
-                        <unit type="length-solar-radius">
-                                <displayName>R☉</displayName>
-                                <unitPattern count="one" draft="contributed">{0} R☉</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} R☉</unitPattern>
-                        </unit>
-                        <unit type="light-solar-luminosity">
-                                <displayName draft="contributed">L☉</displayName>
-                                <unitPattern count="one" draft="contributed">{0} L☉</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} L☉</unitPattern>
+                        <unit type="mass-kilogram">
+                                <displayName>kg</displayName>
+                                <unitPattern count="one">{0} kg</unitPattern>
+                                <unitPattern count="other">{0} kg</unitPattern>
+                                <perUnitPattern>{0}/kg</perUnitPattern>
                         </unit>
                         <unit type="mass-gram">
                                 <displayName>g</displayName>
+                                <unitPattern count="one">{0} g</unitPattern>
+                                <unitPattern count="other">{0} g</unitPattern>
+                                <perUnitPattern>{0}/g</perUnitPattern>
+                        </unit>
+                        <unit type="mass-milligram">
+                                <displayName>mg</displayName>
+                                <unitPattern count="one">{0} mg</unitPattern>
+                                <unitPattern count="other">{0} mg</unitPattern>
+                        </unit>
+                        <unit type="mass-microgram">
+                                <displayName>µg</displayName>
+                                <unitPattern count="one">{0} µg</unitPattern>
+                                <unitPattern count="other">{0} µg</unitPattern>
                         </unit>
                         <unit type="mass-ton">
                                 <displayName>ton</displayName>
                                 <unitPattern count="one">{0} ton</unitPattern>