--- a/web/lib/Zend/Locale/Data/en.xml	Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Locale/Data/en.xml	Thu May 07 15:16:02 2015 +0200
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
 <ldml>
 	<identity>
-		<version number="$Revision: 1.234 $"/>
-		<generation date="$Date: 2009/06/17 16:15:14 $"/>
+		<version number="$Revision: 9876 $"/>
+		<generation date="$Date: 2014-03-05 23:14:25 -0600 (Wed, 05 Mar 2014) $"/>
 		<language type="en"/>
 	</identity>
 	<localeDisplayNames>
 		<localeDisplayPattern>
 			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
 			<language type="aa">Afar</language>
@@ -19,71 +25,70 @@
 			<language type="ady">Adyghe</language>
 			<language type="ae">Avestan</language>
 			<language type="af">Afrikaans</language>
-			<language type="afa">Afro-Asiatic Language</language>
 			<language type="afh">Afrihili</language>
+			<language type="agq">Aghem</language>
 			<language type="ain">Ainu</language>
 			<language type="ak">Akan</language>
 			<language type="akk">Akkadian</language>
 			<language type="ale">Aleut</language>
-			<language type="alg">Algonquian Language</language>
 			<language type="alt">Southern Altai</language>
 			<language type="am">Amharic</language>
 			<language type="an">Aragonese</language>
 			<language type="ang">Old English</language>
 			<language type="anp">Angika</language>
-			<language type="apa">Apache Language</language>
 			<language type="ar">Arabic</language>
+			<language type="ar_001">Modern Standard Arabic</language>
 			<language type="arc">Aramaic</language>
-			<language type="arn">Araucanian</language>
+			<language type="arn">Mapuche</language>
 			<language type="arp">Arapaho</language>
-			<language type="art">Artificial Language</language>
 			<language type="arw">Arawak</language>
 			<language type="as">Assamese</language>
+			<language type="asa">Asu</language>
 			<language type="ast">Asturian</language>
-			<language type="ath">Athapascan Language</language>
-			<language type="aus">Australian Language</language>
 			<language type="av">Avaric</language>
 			<language type="awa">Awadhi</language>
 			<language type="ay">Aymara</language>
 			<language type="az">Azerbaijani</language>
+			<language type="az" alt="short">Azeri</language>
 			<language type="ba">Bashkir</language>
-			<language type="bad">Banda</language>
-			<language type="bai">Bamileke Language</language>
 			<language type="bal">Baluchi</language>
 			<language type="ban">Balinese</language>
-			<language type="bas">Basa</language>
-			<language type="bat">Baltic Language</language>
+			<language type="bas">Basaa</language>
+			<language type="bax">Bamun</language>
+			<language type="bbj">Ghomala</language>
 			<language type="be">Belarusian</language>
 			<language type="bej">Beja</language>
 			<language type="bem">Bemba</language>
-			<language type="ber">Berber</language>
+			<language type="bez">Bena</language>
+			<language type="bfd">Bafut</language>
 			<language type="bg">Bulgarian</language>
-			<language type="bh">Bihari</language>
 			<language type="bho">Bhojpuri</language>
 			<language type="bi">Bislama</language>
 			<language type="bik">Bikol</language>
 			<language type="bin">Bini</language>
+			<language type="bkm">Kom</language>
 			<language type="bla">Siksika</language>
 			<language type="bm">Bambara</language>
 			<language type="bn">Bengali</language>
-			<language type="bnt">Bantu</language>
 			<language type="bo">Tibetan</language>
 			<language type="br">Breton</language>
 			<language type="bra">Braj</language>
+			<language type="brx">Bodo</language>
 			<language type="bs">Bosnian</language>
-			<language type="btk">Batak</language>
+			<language type="bss">Akoose</language>
 			<language type="bua">Buriat</language>
 			<language type="bug">Buginese</language>
+			<language type="bum">Bulu</language>
 			<language type="byn">Blin</language>
+			<language type="byv">Medumba</language>
 			<language type="ca">Catalan</language>
 			<language type="cad">Caddo</language>
-			<language type="cai">Central American Indian Language</language>
 			<language type="car">Carib</language>
-			<language type="cau">Caucasian Language</language>
+			<language type="cay">Cayuga</language>
 			<language type="cch">Atsam</language>
 			<language type="ce">Chechen</language>
 			<language type="ceb">Cebuano</language>
-			<language type="cel">Celtic Language</language>
+			<language type="cgg">Chiga</language>
 			<language type="ch">Chamorro</language>
 			<language type="chb">Chibcha</language>
 			<language type="chg">Chagatai</language>
@@ -94,25 +99,20 @@
 			<language type="chp">Chipewyan</language>
 			<language type="chr">Cherokee</language>
 			<language type="chy">Cheyenne</language>
-			<language type="cmc">Chamic Language</language>
+			<language type="ckb">Sorani Kurdish</language>
 			<language type="co">Corsican</language>
 			<language type="cop">Coptic</language>
-			<language type="cpe">English-based Creole or Pidgin</language>
-			<language type="cpf">French-based Creole or Pidgin</language>
-			<language type="cpp">Portuguese-based Creole or Pidgin</language>
 			<language type="cr">Cree</language>
 			<language type="crh">Crimean Turkish</language>
-			<language type="crp">Creole or Pidgin</language>
 			<language type="cs">Czech</language>
 			<language type="csb">Kashubian</language>
 			<language type="cu">Church Slavic</language>
-			<language type="cus">Cushitic Language</language>
 			<language type="cv">Chuvash</language>
 			<language type="cy">Welsh</language>
 			<language type="da">Danish</language>
 			<language type="dak">Dakota</language>
 			<language type="dar">Dargwa</language>
-			<language type="day">Dayak</language>
+			<language type="dav">Taita</language>
 			<language type="de">German</language>
 			<language type="de_AT">Austrian German</language>
 			<language type="de_CH">Swiss High German</language>
@@ -120,14 +120,17 @@
 			<language type="den">Slave</language>
 			<language type="dgr">Dogrib</language>
 			<language type="din">Dinka</language>
+			<language type="dje">Zarma</language>
 			<language type="doi">Dogri</language>
-			<language type="dra">Dravidian Language</language>
 			<language type="dsb">Lower Sorbian</language>
 			<language type="dua">Duala</language>
 			<language type="dum">Middle Dutch</language>
 			<language type="dv">Divehi</language>
+			<language type="dyo">Jola-Fonyi</language>
 			<language type="dyu">Dyula</language>
 			<language type="dz">Dzongkha</language>
+			<language type="dzg">Dazaga</language>
+			<language type="ebu">Embu</language>
 			<language type="ee">Ewe</language>
 			<language type="efi">Efik</language>
 			<language type="egy">Ancient Egyptian</language>
@@ -138,12 +141,15 @@
 			<language type="en_AU">Australian English</language>
 			<language type="en_CA">Canadian English</language>
 			<language type="en_GB">British English</language>
-			<language type="en_US">U.S. English</language>
+			<language type="en_GB" alt="short">U.K. English</language>
+			<language type="en_US">American English</language>
+			<language type="en_US" alt="short">U.S. English</language>
 			<language type="enm">Middle English</language>
 			<language type="eo">Esperanto</language>
 			<language type="es">Spanish</language>
 			<language type="es_419">Latin American Spanish</language>
-			<language type="es_ES">Iberian Spanish</language>
+			<language type="es_ES">European Spanish</language>
+			<language type="es_MX">Mexican Spanish</language>
 			<language type="et">Estonian</language>
 			<language type="eu">Basque</language>
 			<language type="ewo">Ewondo</language>
@@ -153,7 +159,6 @@
 			<language type="ff">Fulah</language>
 			<language type="fi">Finnish</language>
 			<language type="fil">Filipino</language>
-			<language type="fiu">Finno-Ugrian Language</language>
 			<language type="fj">Fijian</language>
 			<language type="fo">Faroese</language>
 			<language type="fon">Fon</language>
@@ -171,7 +176,6 @@
 			<language type="gay">Gayo</language>
 			<language type="gba">Gbaya</language>
 			<language type="gd">Scottish Gaelic</language>
-			<language type="gem">Germanic Language</language>
 			<language type="gez">Geez</language>
 			<language type="gil">Gilbertese</language>
 			<language type="gl">Galician</language>
@@ -185,6 +189,7 @@
 			<language type="grc">Ancient Greek</language>
 			<language type="gsw">Swiss German</language>
 			<language type="gu">Gujarati</language>
+			<language type="guz">Gusii</language>
 			<language type="gv">Manx</language>
 			<language type="gwi">Gwichʼin</language>
 			<language type="ha">Hausa</language>
@@ -193,7 +198,6 @@
 			<language type="he">Hebrew</language>
 			<language type="hi">Hindi</language>
 			<language type="hil">Hiligaynon</language>
-			<language type="him">Himachali</language>
 			<language type="hit">Hittite</language>
 			<language type="hmn">Hmong</language>
 			<language type="ho">Hiri Motu</language>
@@ -206,24 +210,22 @@
 			<language type="hz">Herero</language>
 			<language type="ia">Interlingua</language>
 			<language type="iba">Iban</language>
+			<language type="ibb">Ibibio</language>
 			<language type="id">Indonesian</language>
 			<language type="ie">Interlingue</language>
 			<language type="ig">Igbo</language>
 			<language type="ii">Sichuan Yi</language>
-			<language type="ijo">Ijo</language>
 			<language type="ik">Inupiaq</language>
 			<language type="ilo">Iloko</language>
-			<language type="inc">Indic Language</language>
-			<language type="ine">Indo-European Language</language>
 			<language type="inh">Ingush</language>
 			<language type="io">Ido</language>
-			<language type="ira">Iranian Language</language>
-			<language type="iro">Iroquoian Language</language>
 			<language type="is">Icelandic</language>
 			<language type="it">Italian</language>
 			<language type="iu">Inuktitut</language>
 			<language type="ja">Japanese</language>
 			<language type="jbo">Lojban</language>
+			<language type="jgo">Ngomba</language>
+			<language type="jmc">Machame</language>
 			<language type="jpr">Judeo-Persian</language>
 			<language type="jrb">Judeo-Arabic</language>
 			<language type="jv">Javanese</language>
@@ -233,19 +235,23 @@
 			<language type="kac">Kachin</language>
 			<language type="kaj">Jju</language>
 			<language type="kam">Kamba</language>
-			<language type="kar">Karen</language>
 			<language type="kaw">Kawi</language>
 			<language type="kbd">Kabardian</language>
+			<language type="kbl">Kanembu</language>
 			<language type="kcg">Tyap</language>
+			<language type="kde">Makonde</language>
+			<language type="kea">Kabuverdianu</language>
 			<language type="kfo">Koro</language>
 			<language type="kg">Kongo</language>
 			<language type="kha">Khasi</language>
-			<language type="khi">Khoisan Language</language>
 			<language type="kho">Khotanese</language>
+			<language type="khq">Koyra Chiini</language>
 			<language type="ki">Kikuyu</language>
 			<language type="kj">Kuanyama</language>
 			<language type="kk">Kazakh</language>
+			<language type="kkj">Kako</language>
 			<language type="kl">Kalaallisut</language>
+			<language type="kln">Kalenjin</language>
 			<language type="km">Khmer</language>
 			<language type="kmb">Kimbundu</language>
 			<language type="kn">Kannada</language>
@@ -256,23 +262,28 @@
 			<language type="kr">Kanuri</language>
 			<language type="krc">Karachay-Balkar</language>
 			<language type="krl">Karelian</language>
-			<language type="kro">Kru</language>
 			<language type="kru">Kurukh</language>
 			<language type="ks">Kashmiri</language>
+			<language type="ksb">Shambala</language>
+			<language type="ksf">Bafia</language>
+			<language type="ksh">Colognian</language>
 			<language type="ku">Kurdish</language>
 			<language type="kum">Kumyk</language>
 			<language type="kut">Kutenai</language>
 			<language type="kv">Komi</language>
 			<language type="kw">Cornish</language>
-			<language type="ky">Kirghiz</language>
+			<language type="ky">Kyrgyz</language>
+			<language type="ky" alt="variant">Kirghiz</language>
 			<language type="la">Latin</language>
 			<language type="lad">Ladino</language>
+			<language type="lag">Langi</language>
 			<language type="lah">Lahnda</language>
 			<language type="lam">Lamba</language>
 			<language type="lb">Luxembourgish</language>
 			<language type="lez">Lezghian</language>
 			<language type="lg">Ganda</language>
 			<language type="li">Limburgish</language>
+			<language type="lkt">Lakota</language>
 			<language type="ln">Lingala</language>
 			<language type="lo">Lao</language>
 			<language type="lol">Mongo</language>
@@ -283,51 +294,51 @@
 			<language type="lui">Luiseno</language>
 			<language type="lun">Lunda</language>
 			<language type="luo">Luo</language>
-			<language type="lus">Lushai</language>
+			<language type="lus">Mizo</language>
+			<language type="luy">Luyia</language>
 			<language type="lv">Latvian</language>
 			<language type="mad">Madurese</language>
+			<language type="maf">Mafa</language>
 			<language type="mag">Magahi</language>
 			<language type="mai">Maithili</language>
 			<language type="mak">Makasar</language>
 			<language type="man">Mandingo</language>
-			<language type="map">Austronesian Language</language>
 			<language type="mas">Masai</language>
+			<language type="mde">Maba</language>
 			<language type="mdf">Moksha</language>
 			<language type="mdr">Mandar</language>
-            <language type="men">Mende</language>
-            <language type="mfe">Morisyen</language>
+			<language type="men">Mende</language>
+			<language type="mer">Meru</language>
+			<language type="mfe">Morisyen</language>
 			<language type="mg">Malagasy</language>
 			<language type="mga">Middle Irish</language>
+			<language type="mgh">Makhuwa-Meetto</language>
+			<language type="mgo">Meta'</language>
 			<language type="mh">Marshallese</language>
 			<language type="mi">Maori</language>
 			<language type="mic">Micmac</language>
 			<language type="min">Minangkabau</language>
-			<language type="mis">Miscellaneous Language</language>
 			<language type="mk">Macedonian</language>
-			<language type="mkh">Mon-Khmer Language</language>
 			<language type="ml">Malayalam</language>
 			<language type="mn">Mongolian</language>
 			<language type="mnc">Manchu</language>
 			<language type="mni">Manipuri</language>
-			<language type="mno">Manobo Language</language>
-			<language type="mo">Moldavian</language>
 			<language type="moh">Mohawk</language>
 			<language type="mos">Mossi</language>
 			<language type="mr">Marathi</language>
 			<language type="ms">Malay</language>
 			<language type="mt">Maltese</language>
+			<language type="mua">Mundang</language>
 			<language type="mul">Multiple Languages</language>
-			<language type="mun">Munda Language</language>
 			<language type="mus">Creek</language>
 			<language type="mwl">Mirandese</language>
 			<language type="mwr">Marwari</language>
 			<language type="my">Burmese</language>
-			<language type="myn">Mayan Language</language>
+			<language type="mye">Myene</language>
 			<language type="myv">Erzya</language>
 			<language type="na">Nauru</language>
-			<language type="nah">Nahuatl</language>
-			<language type="nai">North American Indian Language</language>
 			<language type="nap">Neapolitan</language>
+			<language type="naq">Nama</language>
 			<language type="nb">Norwegian Bokmål</language>
 			<language type="nd">North Ndebele</language>
 			<language type="nds">Low German</language>
@@ -335,18 +346,19 @@
 			<language type="new">Newari</language>
 			<language type="ng">Ndonga</language>
 			<language type="nia">Nias</language>
-			<language type="nic">Niger-Kordofanian Language</language>
 			<language type="niu">Niuean</language>
 			<language type="nl">Dutch</language>
 			<language type="nl_BE">Flemish</language>
+			<language type="nmg">Kwasio</language>
 			<language type="nn">Norwegian Nynorsk</language>
+			<language type="nnh">Ngiemboon</language>
 			<language type="no">Norwegian</language>
 			<language type="nog">Nogai</language>
 			<language type="non">Old Norse</language>
 			<language type="nqo">N’Ko</language>
 			<language type="nr">South Ndebele</language>
 			<language type="nso">Northern Sotho</language>
-			<language type="nub">Nubian Language</language>
+			<language type="nus">Nuer</language>
 			<language type="nv">Navajo</language>
 			<language type="nwc">Classical Newari</language>
 			<language type="ny">Nyanja</language>
@@ -361,69 +373,68 @@
 			<language type="os">Ossetic</language>
 			<language type="osa">Osage</language>
 			<language type="ota">Ottoman Turkish</language>
-			<language type="oto">Otomian Language</language>
 			<language type="pa">Punjabi</language>
-			<language type="paa">Papuan Language</language>
 			<language type="pag">Pangasinan</language>
 			<language type="pal">Pahlavi</language>
 			<language type="pam">Pampanga</language>
 			<language type="pap">Papiamento</language>
 			<language type="pau">Palauan</language>
 			<language type="peo">Old Persian</language>
-			<language type="phi">Philippine Language</language>
 			<language type="phn">Phoenician</language>
 			<language type="pi">Pali</language>
 			<language type="pl">Polish</language>
 			<language type="pon">Pohnpeian</language>
-			<language type="pra">Prakrit Language</language>
 			<language type="pro">Old Provençal</language>
 			<language type="ps">Pashto</language>
+			<language type="ps" alt="variant">Pushto</language>
 			<language type="pt">Portuguese</language>
 			<language type="pt_BR">Brazilian Portuguese</language>
-			<language type="pt_PT">Iberian Portuguese</language>
+			<language type="pt_PT">European Portuguese</language>
 			<language type="qu">Quechua</language>
 			<language type="raj">Rajasthani</language>
 			<language type="rap">Rapanui</language>
 			<language type="rar">Rarotongan</language>
-			<language type="rm">Rhaeto-Romance</language>
+			<language type="rm">Romansh</language>
 			<language type="rn">Rundi</language>
 			<language type="ro">Romanian</language>
-			<language type="roa">Romance Language</language>
+			<language type="ro_MD">Moldavian</language>
+			<language type="rof">Rombo</language>
 			<language type="rom">Romany</language>
 			<language type="root">Root</language>
 			<language type="ru">Russian</language>
 			<language type="rup">Aromanian</language>
 			<language type="rw">Kinyarwanda</language>
+			<language type="rwk">Rwa</language>
 			<language type="sa">Sanskrit</language>
 			<language type="sad">Sandawe</language>
-			<language type="sah">Yakut</language>
-			<language type="sai">South American Indian Language</language>
-			<language type="sal">Salishan Language</language>
+			<language type="sah">Sakha</language>
 			<language type="sam">Samaritan Aramaic</language>
+			<language type="saq">Samburu</language>
 			<language type="sas">Sasak</language>
 			<language type="sat">Santali</language>
+			<language type="sba">Ngambay</language>
+			<language type="sbp">Sangu</language>
 			<language type="sc">Sardinian</language>
 			<language type="scn">Sicilian</language>
 			<language type="sco">Scots</language>
 			<language type="sd">Sindhi</language>
 			<language type="se">Northern Sami</language>
+			<language type="see">Seneca</language>
+			<language type="seh">Sena</language>
 			<language type="sel">Selkup</language>
-			<language type="sem">Semitic Language</language>
+			<language type="ses">Koyraboro Senni</language>
 			<language type="sg">Sango</language>
 			<language type="sga">Old Irish</language>
-			<language type="sgn">Sign Language</language>
 			<language type="sh">Serbo-Croatian</language>
+			<language type="shi">Tachelhit</language>
 			<language type="shn">Shan</language>
+			<language type="shu">Chadian Arabic</language>
 			<language type="si">Sinhala</language>
 			<language type="sid">Sidamo</language>
-			<language type="sio">Siouan Language</language>
-			<language type="sit">Sino-Tibetan Language</language>
 			<language type="sk">Slovak</language>
 			<language type="sl">Slovenian</language>
-			<language type="sla">Slavic Language</language>
 			<language type="sm">Samoan</language>
 			<language type="sma">Southern Sami</language>
-			<language type="smi">Sami Language</language>
 			<language type="smj">Lule Sami</language>
 			<language type="smn">Inari Sami</language>
 			<language type="sms">Skolt Sami</language>
@@ -431,13 +442,12 @@
 			<language type="snk">Soninke</language>
 			<language type="so">Somali</language>
 			<language type="sog">Sogdien</language>
-			<language type="son">Songhai</language>
 			<language type="sq">Albanian</language>
 			<language type="sr">Serbian</language>
 			<language type="srn">Sranan Tongo</language>
 			<language type="srr">Serer</language>
 			<language type="ss">Swati</language>
-			<language type="ssa">Nilo-Saharan Language</language>
+			<language type="ssy">Saho</language>
 			<language type="st">Southern Sotho</language>
 			<language type="su">Sundanese</language>
 			<language type="suk">Sukuma</language>
@@ -445,12 +455,14 @@
 			<language type="sux">Sumerian</language>
 			<language type="sv">Swedish</language>
 			<language type="sw">Swahili</language>
+			<language type="swb">Comorian</language>
+			<language type="swc">Congo Swahili</language>
 			<language type="syc">Classical Syriac</language>
 			<language type="syr">Syriac</language>
 			<language type="ta">Tamil</language>
-			<language type="tai">Tai Language</language>
 			<language type="te">Telugu</language>
 			<language type="tem">Timne</language>
+			<language type="teo">Teso</language>
 			<language type="ter">Tereno</language>
 			<language type="tet">Tetum</language>
 			<language type="tg">Tajik</language>
@@ -465,7 +477,7 @@
 			<language type="tli">Tlingit</language>
 			<language type="tmh">Tamashek</language>
 			<language type="tn">Tswana</language>
-			<language type="to">Tonga</language>
+			<language type="to">Tongan</language>
 			<language type="tog">Nyasa Tonga</language>
 			<language type="tpi">Tok Pisin</language>
 			<language type="tr">Turkish</language>
@@ -474,18 +486,19 @@
 			<language type="tsi">Tsimshian</language>
 			<language type="tt">Tatar</language>
 			<language type="tum">Tumbuka</language>
-			<language type="tup">Tupi Language</language>
-			<language type="tut">Altaic Language</language>
 			<language type="tvl">Tuvalu</language>
 			<language type="tw">Twi</language>
+			<language type="twq">Tasawaq</language>
 			<language type="ty">Tahitian</language>
 			<language type="tyv">Tuvinian</language>
+			<language type="tzm">Central Atlas Tamazight</language>
 			<language type="udm">Udmurt</language>
-			<language type="ug">Uighur</language>
+			<language type="ug">Uyghur</language>
+			<language type="ug" alt="variant">Uighur</language>
 			<language type="uga">Ugaritic</language>
 			<language type="uk">Ukrainian</language>
 			<language type="umb">Umbundu</language>
-			<language type="und">Unknown or Invalid Language</language>
+			<language type="und">Unknown Language</language>
 			<language type="ur">Urdu</language>
 			<language type="uz">Uzbek</language>
 			<language type="vai">Vai</language>
@@ -493,39 +506,46 @@
 			<language type="vi">Vietnamese</language>
 			<language type="vo">Volapük</language>
 			<language type="vot">Votic</language>
+			<language type="vun">Vunjo</language>
 			<language type="wa">Walloon</language>
-			<language type="wak">Wakashan Language</language>
-			<language type="wal">Walamo</language>
+			<language type="wae">Walser</language>
+			<language type="wal">Wolaytta</language>
 			<language type="war">Waray</language>
 			<language type="was">Washo</language>
-			<language type="wen">Sorbian Language</language>
 			<language type="wo">Wolof</language>
 			<language type="xal">Kalmyk</language>
 			<language type="xh">Xhosa</language>
+			<language type="xog">Soga</language>
 			<language type="yao">Yao</language>
 			<language type="yap">Yapese</language>
+			<language type="yav">Yangben</language>
+			<language type="ybb">Yemba</language>
 			<language type="yi">Yiddish</language>
 			<language type="yo">Yoruba</language>
-			<language type="ypk">Yupik Language</language>
+			<language type="yue">Cantonese</language>
 			<language type="za">Zhuang</language>
 			<language type="zap">Zapotec</language>
 			<language type="zbl">Blissymbols</language>
 			<language type="zen">Zenaga</language>
+			<language type="zgh">Standard Moroccan Tamazight</language>
 			<language type="zh">Chinese</language>
 			<language type="zh_Hans">Simplified Chinese</language>
 			<language type="zh_Hant">Traditional Chinese</language>
-			<language type="znd">Zande</language>
 			<language type="zu">Zulu</language>
 			<language type="zun">Zuni</language>
 			<language type="zxx">No linguistic content</language>
 			<language type="zza">Zaza</language>
 		</languages>
 		<scripts>
+			<script type="Afak">Afaka</script>
 			<script type="Arab">Arabic</script>
+			<script type="Arab" alt="variant">Perso-Arabic</script>
 			<script type="Armi">Imperial Aramaic</script>
 			<script type="Armn">Armenian</script>
 			<script type="Avst">Avestan</script>
 			<script type="Bali">Balinese</script>
+			<script type="Bamu">Bamum</script>
+			<script type="Bass">Bassa Vah</script>
 			<script type="Batk">Batak</script>
 			<script type="Beng">Bengali</script>
 			<script type="Blis">Blissymbols</script>
@@ -546,6 +566,7 @@
 			<script type="Cyrs">Old Church Slavonic Cyrillic</script>
 			<script type="Deva">Devanagari</script>
 			<script type="Dsrt">Deseret</script>
+			<script type="Dupl">Duployan shorthand</script>
 			<script type="Egyd">Egyptian demotic</script>
 			<script type="Egyh">Egyptian hieratic</script>
 			<script type="Egyp">Egyptian hieroglyphs</script>
@@ -554,29 +575,36 @@
 			<script type="Geor">Georgian</script>
 			<script type="Glag">Glagolitic</script>
 			<script type="Goth">Gothic</script>
+			<script type="Gran">Grantha</script>
 			<script type="Grek">Greek</script>
 			<script type="Gujr">Gujarati</script>
 			<script type="Guru">Gurmukhi</script>
 			<script type="Hang">Hangul</script>
 			<script type="Hani">Han</script>
 			<script type="Hano">Hanunoo</script>
-			<script type="Hans">Simplified Han</script>
-			<script type="Hant">Traditional Han</script>
+			<script type="Hans">Simplified</script>
+			<script type="Hans" alt="stand-alone">Simplified Han</script>
+			<script type="Hant">Traditional</script>
+			<script type="Hant" alt="stand-alone">Traditional Han</script>
 			<script type="Hebr">Hebrew</script>
 			<script type="Hira">Hiragana</script>
+			<script type="Hluw">Anatolian Hieroglyphs</script>
 			<script type="Hmng">Pahawh Hmong</script>
-			<script type="Hrkt">Katakana or Hiragana</script>
+			<script type="Hrkt">Japanese syllabaries</script>
 			<script type="Hung">Old Hungarian</script>
 			<script type="Inds">Indus</script>
 			<script type="Ital">Old Italic</script>
 			<script type="Java">Javanese</script>
 			<script type="Jpan">Japanese</script>
+			<script type="Jurc">Jurchen</script>
 			<script type="Kali">Kayah Li</script>
 			<script type="Kana">Katakana</script>
 			<script type="Khar">Kharoshthi</script>
 			<script type="Khmr">Khmer</script>
+			<script type="Khoj">Khojki</script>
 			<script type="Knda">Kannada</script>
 			<script type="Kore">Korean</script>
+			<script type="Kpel">Kpelle</script>
 			<script type="Kthi">Kaithi</script>
 			<script type="Lana">Lanna</script>
 			<script type="Laoo">Lao</script>
@@ -587,23 +615,33 @@
 			<script type="Limb">Limbu</script>
 			<script type="Lina">Linear A</script>
 			<script type="Linb">Linear B</script>
+			<script type="Lisu">Fraser</script>
+			<script type="Loma">Loma</script>
 			<script type="Lyci">Lycian</script>
 			<script type="Lydi">Lydian</script>
 			<script type="Mand">Mandaean</script>
 			<script type="Mani">Manichaean</script>
 			<script type="Maya">Mayan hieroglyphs</script>
+			<script type="Mend">Mende</script>
+			<script type="Merc">Meroitic Cursive</script>
 			<script type="Mero">Meroitic</script>
 			<script type="Mlym">Malayalam</script>
 			<script type="Mong">Mongolian</script>
 			<script type="Moon">Moon</script>
+			<script type="Mroo">Mro</script>
 			<script type="Mtei">Meitei Mayek</script>
 			<script type="Mymr">Myanmar</script>
+			<script type="Narb">Old North Arabian</script>
+			<script type="Nbat">Nabataean</script>
+			<script type="Nkgb">Naxi Geba</script>
 			<script type="Nkoo">N’Ko</script>
+			<script type="Nshu">Nüshu</script>
 			<script type="Ogam">Ogham</script>
 			<script type="Olck">Ol Chiki</script>
 			<script type="Orkh">Orkhon</script>
 			<script type="Orya">Oriya</script>
 			<script type="Osma">Osmanya</script>
+			<script type="Palm">Palmyrene</script>
 			<script type="Perm">Old Permic</script>
 			<script type="Phag">Phags-pa</script>
 			<script type="Phli">Inscriptional Pahlavi</script>
@@ -612,16 +650,19 @@
 			<script type="Phnx">Phoenician</script>
 			<script type="Plrd">Pollard Phonetic</script>
 			<script type="Prti">Inscriptional Parthian</script>
-			<script type="Qaai">Inherited</script>
 			<script type="Rjng">Rejang</script>
 			<script type="Roro">Rongorongo</script>
 			<script type="Runr">Runic</script>
 			<script type="Samr">Samaritan</script>
 			<script type="Sara">Sarati</script>
+			<script type="Sarb">Old South Arabian</script>
 			<script type="Saur">Saurashtra</script>
 			<script type="Sgnw">SignWriting</script>
 			<script type="Shaw">Shavian</script>
+			<script type="Shrd">Sharada</script>
+			<script type="Sind">Khudawadi</script>
 			<script type="Sinh">Sinhala</script>
+			<script type="Sora">Sora Sompeng</script>
 			<script type="Sund">Sundanese</script>
 			<script type="Sylo">Syloti Nagri</script>
 			<script type="Syrc">Syriac</script>
@@ -629,9 +670,11 @@
 			<script type="Syrj">Western Syriac</script>
 			<script type="Syrn">Eastern Syriac</script>
 			<script type="Tagb">Tagbanwa</script>
+			<script type="Takr">Takri</script>
 			<script type="Tale">Tai Le</script>
 			<script type="Talu">New Tai Lue</script>
 			<script type="Taml">Tamil</script>
+			<script type="Tang">Tangut</script>
 			<script type="Tavt">Tai Viet</script>
 			<script type="Telu">Telugu</script>
 			<script type="Teng">Tengwar</script>
@@ -640,20 +683,25 @@
 			<script type="Thaa">Thaana</script>
 			<script type="Thai">Thai</script>
 			<script type="Tibt">Tibetan</script>
+			<script type="Tirh">Tirhuta</script>
 			<script type="Ugar">Ugaritic</script>
 			<script type="Vaii">Vai</script>
 			<script type="Visp">Visible Speech</script>
+			<script type="Wara">Varang Kshiti</script>
+			<script type="Wole">Woleai</script>
 			<script type="Xpeo">Old Persian</script>
 			<script type="Xsux">Sumero-Akkadian Cuneiform</script>
 			<script type="Yiii">Yi</script>
+			<script type="Zinh">Inherited</script>
 			<script type="Zmth">Mathematical Notation</script>
 			<script type="Zsym">Symbols</script>
 			<script type="Zxxx">Unwritten</script>
 			<script type="Zyyy">Common</script>
-			<script type="Zzzz">Unknown or Invalid Script</script>
+			<script type="Zzzz">Unknown Script</script>
 		</scripts>
 		<territories>
 			<territory type="001">World</territory>
+			<!-- UN codes -->
 			<territory type="002">Africa</territory>
 			<territory type="003">North America</territory>
 			<territory type="005">South America</territory>
@@ -671,11 +719,10 @@
 			<territory type="034">Southern Asia</territory>
 			<territory type="035">South-Eastern Asia</territory>
 			<territory type="039">Southern Europe</territory>
-			<territory type="053">Australia and New Zealand</territory>
+			<territory type="053">Australasia</territory>
 			<territory type="054">Melanesia</territory>
 			<territory type="057">Micronesian Region</territory>
 			<territory type="061">Polynesia</territory>
-			<territory type="062">South-Central Asia</territory>
 			<territory type="142">Asia</territory>
 			<territory type="143">Central Asia</territory>
 			<territory type="145">Western Asia</territory>
@@ -683,10 +730,8 @@
 			<territory type="151">Eastern Europe</territory>
 			<territory type="154">Northern Europe</territory>
 			<territory type="155">Western Europe</territory>
-			<territory type="172">Commonwealth of Independent States</territory>
-			<territory type="200">Czechoslovakia</territory>
-			<territory type="419">Latin America and the Caribbean</territory>
-			<territory type="830">Channel Islands</territory>
+			<territory type="419">Latin America</territory>
+			<territory type="AC">Ascension Island</territory>
 			<territory type="AD">Andorra</territory>
 			<territory type="AE">United Arab Emirates</territory>
 			<territory type="AF">Afghanistan</territory>
@@ -717,7 +762,7 @@
 			<territory type="BM">Bermuda</territory>
 			<territory type="BN">Brunei</territory>
 			<territory type="BO">Bolivia</territory>
-			<territory type="BQ">British Antarctic Territory</territory>
+			<territory type="BQ">Caribbean Netherlands</territory>
 			<territory type="BR">Brazil</territory>
 			<territory type="BS">Bahamas</territory>
 			<territory type="BT">Bhutan</territory>
@@ -726,32 +771,36 @@
 			<territory type="BY">Belarus</territory>
 			<territory type="BZ">Belize</territory>
 			<territory type="CA">Canada</territory>
-			<territory type="CC">Cocos [Keeling] Islands</territory>
+			<territory type="CC">Cocos (Keeling) Islands</territory>
 			<territory type="CD">Congo - Kinshasa</territory>
+			<territory type="CD" alt="variant">Congo (DRC)</territory>
 			<territory type="CF">Central African Republic</territory>
 			<territory type="CG">Congo - Brazzaville</territory>
+			<territory type="CG" alt="variant">Congo (Republic)</territory>
 			<territory type="CH">Switzerland</territory>
 			<territory type="CI">Côte d’Ivoire</territory>
+			<territory type="CI" alt="variant">Ivory Coast</territory>
 			<territory type="CK">Cook Islands</territory>
 			<territory type="CL">Chile</territory>
 			<territory type="CM">Cameroon</territory>
 			<territory type="CN">China</territory>
 			<territory type="CO">Colombia</territory>
+			<territory type="CP">Clipperton Island</territory>
 			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia and Montenegro</territory>
-			<territory type="CT">Canton and Enderbury Islands</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cape Verde</territory>
+			<territory type="CW">Curaçao</territory>
 			<territory type="CX">Christmas Island</territory>
 			<territory type="CY">Cyprus</territory>
 			<territory type="CZ">Czech Republic</territory>
-			<territory type="DD">East Germany</territory>
 			<territory type="DE">Germany</territory>
+			<territory type="DG">Diego Garcia</territory>
 			<territory type="DJ">Djibouti</territory>
 			<territory type="DK">Denmark</territory>
 			<territory type="DM">Dominica</territory>
 			<territory type="DO">Dominican Republic</territory>
 			<territory type="DZ">Algeria</territory>
+			<territory type="EA">Ceuta and Melilla</territory>
 			<territory type="EC">Ecuador</territory>
 			<territory type="EE">Estonia</territory>
 			<territory type="EG">Egypt</territory>
@@ -759,16 +808,17 @@
 			<territory type="ER">Eritrea</territory>
 			<territory type="ES">Spain</territory>
 			<territory type="ET">Ethiopia</territory>
+			<territory type="EU">European Union</territory>
 			<territory type="FI">Finland</territory>
 			<territory type="FJ">Fiji</territory>
 			<territory type="FK">Falkland Islands</territory>
+			<territory type="FK" alt="variant">Falkland Islands (Islas Malvinas)</territory>
 			<territory type="FM">Micronesia</territory>
 			<territory type="FO">Faroe Islands</territory>
-			<territory type="FQ">French Southern and Antarctic Territories</territory>
 			<territory type="FR">France</territory>
-			<territory type="FX">Metropolitan France</territory>
 			<territory type="GA">Gabon</territory>
 			<territory type="GB">United Kingdom</territory>
+			<territory type="GB" alt="short">U.K.</territory>
 			<territory type="GD">Grenada</territory>
 			<territory type="GE">Georgia</territory>
 			<territory type="GF">French Guiana</territory>
@@ -781,17 +831,19 @@
 			<territory type="GP">Guadeloupe</territory>
 			<territory type="GQ">Equatorial Guinea</territory>
 			<territory type="GR">Greece</territory>
-			<territory type="GS">South Georgia and the South Sandwich Islands</territory>
+			<territory type="GS">South Georgia &amp; South Sandwich Islands</territory>
 			<territory type="GT">Guatemala</territory>
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Guinea-Bissau</territory>
 			<territory type="GY">Guyana</territory>
 			<territory type="HK">Hong Kong SAR China</territory>
-			<territory type="HM">Heard Island and McDonald Islands</territory>
+			<territory type="HK" alt="short">Hong Kong</territory>
+			<territory type="HM">Heard &amp; McDonald Islands</territory>
 			<territory type="HN">Honduras</territory>
 			<territory type="HR">Croatia</territory>
 			<territory type="HT">Haiti</territory>
 			<territory type="HU">Hungary</territory>
+			<territory type="IC">Canary Islands</territory>
 			<territory type="ID">Indonesia</territory>
 			<territory type="IE">Ireland</territory>
 			<territory type="IL">Israel</territory>
@@ -806,7 +858,6 @@
 			<territory type="JM">Jamaica</territory>
 			<territory type="JO">Jordan</territory>
 			<territory type="JP">Japan</territory>
-			<territory type="JT">Johnston Island</territory>
 			<territory type="KE">Kenya</territory>
 			<territory type="KG">Kyrgyzstan</territory>
 			<territory type="KH">Cambodia</territory>
@@ -836,12 +887,13 @@
 			<territory type="MF">Saint Martin</territory>
 			<territory type="MG">Madagascar</territory>
 			<territory type="MH">Marshall Islands</territory>
-			<territory type="MI">Midway Islands</territory>
 			<territory type="MK">Macedonia</territory>
+			<territory type="MK" alt="variant">Macedonia (FYROM)</territory>
 			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar [Burma]</territory>
+			<territory type="MM">Myanmar (Burma)</territory>
 			<territory type="MN">Mongolia</territory>
 			<territory type="MO">Macau SAR China</territory>
+			<territory type="MO" alt="short">Macau</territory>
 			<territory type="MP">Northern Mariana Islands</territory>
 			<territory type="MQ">Martinique</territory>
 			<territory type="MR">Mauritania</territory>
@@ -862,14 +914,11 @@
 			<territory type="NL">Netherlands</territory>
 			<territory type="NO">Norway</territory>
 			<territory type="NP">Nepal</territory>
-			<territory type="NQ">Dronning Maud Land</territory>
 			<territory type="NR">Nauru</territory>
-			<territory type="NT">Neutral Zone</territory>
 			<territory type="NU">Niue</territory>
 			<territory type="NZ">New Zealand</territory>
 			<territory type="OM">Oman</territory>
 			<territory type="PA">Panama</territory>
-			<territory type="PC">Pacific Islands Trust Territory</territory>
 			<territory type="PE">Peru</territory>
 			<territory type="PF">French Polynesia</territory>
 			<territory type="PG">Papua New Guinea</territory>
@@ -880,14 +929,12 @@
 			<territory type="PN">Pitcairn Islands</territory>
 			<territory type="PR">Puerto Rico</territory>
 			<territory type="PS">Palestinian Territories</territory>
+			<territory type="PS" alt="short">Palestine</territory>
 			<territory type="PT">Portugal</territory>
-			<territory type="PU">U.S. Miscellaneous Pacific Islands</territory>
 			<territory type="PW">Palau</territory>
 			<territory type="PY">Paraguay</territory>
-			<territory type="PZ">Panama Canal Zone</territory>
 			<territory type="QA">Qatar</territory>
 			<territory type="QO">Outlying Oceania</territory>
-			<territory type="QU">European Union</territory>
 			<territory type="RE">Réunion</territory>
 			<territory type="RO">Romania</territory>
 			<territory type="RS">Serbia</territory>
@@ -908,11 +955,13 @@
 			<territory type="SN">Senegal</territory>
 			<territory type="SO">Somalia</territory>
 			<territory type="SR">Suriname</territory>
+			<territory type="SS">South Sudan</territory>
 			<territory type="ST">São Tomé and Príncipe</territory>
-			<territory type="SU">Union of Soviet Socialist Republics</territory>
 			<territory type="SV">El Salvador</territory>
+			<territory type="SX">Sint Maarten</territory>
 			<territory type="SY">Syria</territory>
 			<territory type="SZ">Swaziland</territory>
+			<territory type="TA">Tristan da Cunha</territory>
 			<territory type="TC">Turks and Caicos Islands</territory>
 			<territory type="TD">Chad</territory>
 			<territory type="TF">French Southern Territories</territory>
@@ -921,6 +970,7 @@
 			<territory type="TJ">Tajikistan</territory>
 			<territory type="TK">Tokelau</territory>
 			<territory type="TL">Timor-Leste</territory>
+			<territory type="TL" alt="variant">East Timor</territory>
 			<territory type="TM">Turkmenistan</territory>
 			<territory type="TN">Tunisia</territory>
 			<territory type="TO">Tonga</territory>
@@ -931,28 +981,27 @@
 			<territory type="TZ">Tanzania</territory>
 			<territory type="UA">Ukraine</territory>
 			<territory type="UG">Uganda</territory>
-			<territory type="UM">U.S. Minor Outlying Islands</territory>
+			<territory type="UM">U.S. Outlying Islands</territory>
 			<territory type="US">United States</territory>
+			<territory type="US" alt="short">U.S.</territory>
 			<territory type="UY">Uruguay</territory>
 			<territory type="UZ">Uzbekistan</territory>
 			<territory type="VA">Vatican City</territory>
-			<territory type="VC">Saint Vincent and the Grenadines</territory>
-			<territory type="VD">North Vietnam</territory>
+			<territory type="VC">St. Vincent &amp; Grenadines</territory>
 			<territory type="VE">Venezuela</territory>
 			<territory type="VG">British Virgin Islands</territory>
 			<territory type="VI">U.S. Virgin Islands</territory>
 			<territory type="VN">Vietnam</territory>
 			<territory type="VU">Vanuatu</territory>
 			<territory type="WF">Wallis and Futuna</territory>
-			<territory type="WK">Wake Island</territory>
 			<territory type="WS">Samoa</territory>
-			<territory type="YD">People's Democratic Republic of Yemen</territory>
+			<territory type="XK">Kosovo</territory>
 			<territory type="YE">Yemen</territory>
 			<territory type="YT">Mayotte</territory>
 			<territory type="ZA">South Africa</territory>
 			<territory type="ZM">Zambia</territory>
 			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Unknown or Invalid Region</territory>
+			<territory type="ZZ">Unknown Region</territory>
 		</territories>
 		<variants>
 			<variant type="1901">Traditional German orthography</variant>
@@ -961,49 +1010,96 @@
 			<variant type="1606NICT">Late Middle French to 1606</variant>
 			<variant type="1694ACAD">Early Modern French</variant>
 			<variant type="1959ACAD">Academic</variant>
+			<variant type="ALALC97">ALA-LC Romanization, 1997 edition</variant>
+			<variant type="ALUKU">Aluku dialect</variant>
 			<variant type="AREVELA">Eastern Armenian</variant>
 			<variant type="AREVMDA">Western Armenian</variant>
 			<variant type="BAKU1926">Unified Turkic Latin Alphabet</variant>
+			<variant type="BALANKA">Balanka dialect of Anii</variant>
+			<variant type="BARLA">&gt;Barlavento dialect group of Kabuverdianu</variant>
 			<variant type="BISKE">San Giorgio/Bila dialect</variant>
+			<variant type="BOHORIC">Bohorič alphabet</variant>
 			<variant type="BOONT">Boontling</variant>
+			<variant type="DAJNKO">Dajnko alphabet</variant>
+			<variant type="EKAVSK">Serbian with Ekavian pronunciation</variant>
+			<variant type="EMODENG">Early Modern English</variant>
 			<variant type="FONIPA">IPA Phonetics</variant>
 			<variant type="FONUPA">UPA Phonetics</variant>
+			<variant type="HEPBURN">Hepburn romanization</variant>
+			<variant type="HEPLOC">Hepburn romanization, Library of Congress method</variant>
+			<variant type="IJEKAVSK">Serbian with Ijekavian pronunciation</variant>
 			<variant type="KKCOR">Common Orthography</variant>
+			<variant type="KSCOR">Standard Orthography</variant>
 			<variant type="LIPAW">The Lipovaz dialect of Resian</variant>
+			<variant type="METELKO">Metelko alphabet</variant>
 			<variant type="MONOTON">Monotonic</variant>
+			<variant type="NDYUKA">Ndyuka dialect</variant>
 			<variant type="NEDIS">Natisone dialect</variant>
 			<variant type="NJIVA">Gniva/Njiva dialect</variant>
+			<variant type="NULIK">Modern Volapük</variant>
 			<variant type="OSOJS">Oseacco/Osojane dialect</variant>
+			<variant type="PAMAKA">Pamaka dialect</variant>
 			<variant type="PINYIN">Pinyin Romanization</variant>
 			<variant type="POLYTON">Polytonic</variant>
 			<variant type="POSIX">Computer</variant>
 			<variant type="REVISED">Revised Orthography</variant>
+			<variant type="RIGIK">Classic Volapük</variant>
 			<variant type="ROZAJ">Resian</variant>
 			<variant type="SAAHO">Saho</variant>
 			<variant type="SCOTLAND">Scottish Standard English</variant>
 			<variant type="SCOUSE">Scouse</variant>
 			<variant type="SOLBA">Stolvizza/Solbica dialect</variant>
+			<variant type="SOTAV">Sotavento dialect group of Kabuverdianu</variant>
 			<variant type="TARASK">Taraskievica orthography</variant>
 			<variant type="UCCOR">Unified Orthography</variant>
 			<variant type="UCRCOR">Unified Revised Orthography</variant>
+			<variant type="UNIFON">Unifon phonetic alphabet</variant>
 			<variant type="VALENCIA">Valencian</variant>
 			<variant type="WADEGILE">Wade-Giles Romanization</variant>
 		</variants>
+		<keys>
+			<key type="calendar">Calendar</key>
+			<key type="colAlternate">Ignore Symbols Sorting</key>
+			<key type="colBackwards">Reversed Accent Sorting</key>
+			<key type="colCaseFirst">Uppercase/Lowercase Ordering</key>
+			<key type="colCaseLevel">Case Sensitive Sorting</key>
+			<key type="colHiraganaQuaternary">Kana Sorting</key>
+			<key type="collation">Sort Order</key>
+			<key type="colNormalization">Normalized Sorting</key>
+			<key type="colNumeric">Numeric Sorting</key>
+			<key type="colReorder">Script/Block Reordering</key>
+			<key type="colStrength">Sorting Strength</key>
+			<key type="currency">Currency</key>
+			<key type="kv">Highest Ignored</key>
+			<key type="numbers">Numbers</key>
+			<key type="timezone">Time Zone</key>
+			<key type="va">Locale Variant</key>
+			<key type="variableTop">Sort As Symbols</key>
+			<key type="x">Private-Use</key>
+		</keys>
 		<types>
 			<type type="arab" key="numbers">Arabic-Indic Digits</type>
 			<type type="arabext" key="numbers">Extended Arabic-Indic Digits</type>
 			<type type="armn" key="numbers">Armenian Numerals</type>
 			<type type="armnlow" key="numbers">Armenian Lowercase Numerals</type>
+			<type type="bali" key="numbers">Balinese Digits</type>
 			<type type="beng" key="numbers">Bengali Digits</type>
 			<type type="big5han" key="collation">Traditional Chinese Sort Order - Big5</type>
+			<type type="brah" key="numbers">Brahmi Digits</type>
 			<type type="buddhist" key="calendar">Buddhist Calendar</type>
+			<type type="cakm" key="numbers">Chakma Digits</type>
+			<type type="cham" key="numbers">Cham Digits</type>
 			<type type="chinese" key="calendar">Chinese Calendar</type>
 			<type type="coptic" key="calendar">Coptic Calendar</type>
+			<type type="dangi" key="calendar">Dangi Calendar</type>
 			<type type="deva" key="numbers">Devanagari Digits</type>
-			<type type="direct" key="collation">Direct Sort Order</type>
+			<type type="dictionary" key="collation">Dictionary Sort Order</type>
+			<type type="ducet" key="collation">Default Unicode Sort Order</type>
+			<type type="eor" key="collation">European Ordering Rules</type>
 			<type type="ethi" key="numbers">Ethiopic Numerals</type>
 			<type type="ethiopic" key="calendar">Ethiopic Calendar</type>
 			<type type="ethiopic-amete-alem" key="calendar">Ethiopic Amete Alem Calendar</type>
+			<type type="finance" key="numbers">Financial Numerals</type>
 			<type type="fullwide" key="numbers">Full Width Digits</type>
 			<type type="gb2312han" key="collation">Simplified Chinese Sort Order - GB2312</type>
 			<type type="geor" key="numbers">Georgian Numerals</type>
@@ -1012,41 +1108,109 @@
 			<type type="greklow" key="numbers">Greek Lowercase Numerals</type>
 			<type type="gujr" key="numbers">Gujarati Digits</type>
 			<type type="guru" key="numbers">Gurmukhi Digits</type>
+			<type type="hanidays" key="numbers">Chinese Calendar Day-of-Month Numerals</type>
+			<type type="hanidec" key="numbers">Chinese Decimal Numerals</type>
 			<type type="hans" key="numbers">Simplified Chinese Numerals</type>
 			<type type="hansfin" key="numbers">Simplified Chinese Financial Numerals</type>
 			<type type="hant" key="numbers">Traditional Chinese Numerals</type>
 			<type type="hantfin" key="numbers">Traditional Chinese Financial Numerals</type>
 			<type type="hebr" key="numbers">Hebrew Numerals</type>
 			<type type="hebrew" key="calendar">Hebrew Calendar</type>
+			<type type="identical" key="colStrength">Sort All</type>
 			<type type="indian" key="calendar">Indian National Calendar</type>
 			<type type="islamic" key="calendar">Islamic Calendar</type>
-			<type type="islamic-civil" key="calendar">Islamic-Civil Calendar</type>
+			<type type="islamic-civil" key="calendar">Islamic Calendar (tabular, civil epoch)</type>
+			<type type="islamic-rgsa" key="calendar">Islamic Calendar (Saudi Arabia, sighting)</type>
+			<type type="islamic-tbla" key="calendar">Islamic Calendar (tabular, astronomical epoch)</type>
+			<type type="islamic-umalqura" key="calendar">Islamic Calendar (Umm al-Qura)</type>
+			<type type="iso8601" key="calendar">ISO-8601 Calendar</type>
 			<type type="japanese" key="calendar">Japanese Calendar</type>
+			<type type="java" key="numbers">Javanese Digits</type>
 			<type type="jpan" key="numbers">Japanese Numerals</type>
 			<type type="jpanfin" key="numbers">Japanese Financial Numerals</type>
+			<type type="kali" key="numbers">Kayah Li Digits</type>
 			<type type="khmr" key="numbers">Khmer Digits</type>
 			<type type="knda" key="numbers">Kannada Digits</type>
+			<type type="lana" key="numbers">Tai Tham Hora Digits</type>
+			<type type="lanatham" key="numbers">Tai Tham Tham Digits</type>
 			<type type="laoo" key="numbers">Lao Digits</type>
 			<type type="latn" key="numbers">Western Digits</type>
+			<type type="lepc" key="numbers">Lepcha Digits</type>
+			<type type="limb" key="numbers">Limbu Digits</type>
+			<type type="lower" key="colCaseFirst">Sort Lowercase First</type>
 			<type type="mlym" key="numbers">Malayalam Digits</type>
 			<type type="mong" key="numbers">Mongolian Digits</type>
+			<type type="mtei" key="numbers">Meetei Mayek Digits</type>
 			<type type="mymr" key="numbers">Myanmar Digits</type>
+			<type type="mymrshan" key="numbers">Myanmar Shan Digits</type>
+			<type type="native" key="numbers">Native Digits</type>
+			<type type="nkoo" key="numbers">N'Ko Digits</type>
+			<type type="no" key="colBackwards">Sort Accents Normally</type>
+			<type type="no" key="colCaseFirst">Sort Normal Case Order</type>
+			<type type="no" key="colCaseLevel">Sort Case Insensitive</type>
+			<type type="no" key="colHiraganaQuaternary">Sort Kana Separately</type>
+			<type type="no" key="colNormalization">Sort Without Normalization</type>
+			<type type="no" key="colNumeric">Sort Digits Individually</type>
+			<type type="non-ignorable" key="colAlternate">Sort Symbols</type>
+			<type type="olck" key="numbers">Ol Chiki Digits</type>
 			<type type="orya" key="numbers">Oriya Digits</type>
+			<type type="osma" key="numbers">Osmanya Digits</type>
 			<type type="persian" key="calendar">Persian Calendar</type>
 			<type type="phonebook" key="collation">Phonebook Sort Order</type>
-			<type type="pinyin" key="collation">Simplified Chinese Pinyin Sort Order</type>
-			<type type="roc" key="calendar">Republic of China Calendar</type>
+			<type type="phonetic" key="collation">Phonetic Sort Order</type>
+			<type type="pinyin" key="collation">Pinyin Sort Order</type>
+			<type type="posix" key="va">POSIX Compliant Locale</type>
+			<type type="primary" key="colStrength">Sort Base Letters Only</type>
+			<type type="quaternary" key="colStrength">Sort Accents/Case/Width/Kana</type>
+			<type type="reformed" key="collation">Reformed Sort Order</type>
+			<type type="roc" key="calendar">Minguo Calendar</type>
 			<type type="roman" key="numbers">Roman Numerals</type>
 			<type type="romanlow" key="numbers">Roman Lowercase Numerals</type>
-			<type type="stroke" key="collation">Traditional Chinese Stroke Sort Order</type>
-			<type type="taml" key="numbers">Tamil Numerals</type>
+			<type type="saur" key="numbers">Saurashtra Digits</type>
+			<type type="search" key="collation">General-Purpose Search</type>
+			<type type="searchjl" key="collation">Search By Hangul Initial Consonant</type>
+			<type type="secondary" key="colStrength">Sort Accents</type>
+			<type type="shifted" key="colAlternate">Sort Ignoring Symbols</type>
+			<type type="shrd" key="numbers">Sharada Digits</type>
+			<type type="sora" key="numbers">Sora Sompeng Digits</type>
+			<type type="standard" key="collation">Standard Sort Order</type>
+			<type type="stroke" key="collation">Stroke Sort Order</type>
+			<type type="sund" key="numbers">Sundanese Digits</type>
+			<type type="takr" key="numbers">Takri Digits</type>
+			<type type="talu" key="numbers">New Tai Lue Digits</type>
+			<type type="taml" key="numbers">Traditional Tamil Numerals</type>
+			<type type="tamldec" key="numbers">Tamil Digits</type>
 			<type type="telu" key="numbers">Telugu Digits</type>
+			<type type="tertiary" key="colStrength">Sort Accents/Case/Width</type>
 			<type type="thai" key="numbers">Thai Digits</type>
 			<type type="tibt" key="numbers">Tibetan Digits</type>
 			<type type="traditional" key="collation">Traditional Sort Order</type>
+			<type type="traditional" key="numbers">Traditional Numerals</type>
+			<type type="unihan" key="collation">Radical-Stroke Sort Order</type>
+			<type type="upper" key="colCaseFirst">Sort Uppercase First</type>
+			<type type="vaii" key="numbers">Vai Digits</type>
+			<type type="yes" key="colBackwards">Sort Accents Reversed</type>
+			<type type="yes" key="colCaseLevel">Sort Case Sensitive</type>
+			<type type="yes" key="colHiraganaQuaternary">Sort Kana Differently</type>
+			<type type="yes" key="colNormalization">Sort Unicode Normalized</type>
+			<type type="yes" key="colNumeric">Sort Digits Numerically</type>
+			<type type="zhuyin" key="collation">Zhuyin Sort Order</type>
 		</types>
+		<transformNames>
+			<transformName type="BGN">BGN</transformName>
+			<transformName type="Numeric">Numeric</transformName>
+			<transformName type="Tone">Tone</transformName>
+			<transformName type="UNGEGN">UNGEGN</transformName>
+			<transformName type="x-Accents">Accents</transformName>
+			<transformName type="x-Fullwidth">Fullwidth</transformName>
+			<transformName type="x-Halfwidth">Halfwidth</transformName>
+			<transformName type="x-Jamo">Jamo</transformName>
+			<transformName type="x-Pinyin">Pinyin</transformName>
+			<transformName type="x-Publishing">Publishing</transformName>
+		</transformNames>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metric</measurementSystemName>
+			<measurementSystemName type="UK">UK</measurementSystemName>
 			<measurementSystemName type="US">US</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
@@ -1055,10 +1219,29 @@
 			<codePattern type="territory">Region: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
+	<contextTransforms>
+		<contextTransformUsage type="calendar-field">
+			<contextTransform type="stand-alone">titlecase-firstword</contextTransform>
+			<contextTransform type="uiListOrMenu">titlecase-firstword</contextTransform>
+		</contextTransformUsage>
+		<contextTransformUsage type="keyValue">
+			<contextTransform type="stand-alone">titlecase-firstword</contextTransform>
+			<contextTransform type="uiListOrMenu">titlecase-firstword</contextTransform>
+		</contextTransformUsage>
+		<contextTransformUsage type="number-spellout">
+			<contextTransform type="stand-alone">titlecase-firstword</contextTransform>
+			<contextTransform type="uiListOrMenu">titlecase-firstword</contextTransform>
+		</contextTransformUsage>
+		<contextTransformUsage type="relative">
+			<contextTransform type="stand-alone">titlecase-firstword</contextTransform>
+			<contextTransform type="uiListOrMenu">titlecase-firstword</contextTransform>
+		</contextTransformUsage>
+	</contextTransforms>
 	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ă â å ä ã ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ß ú ù ŭ û ü ū ÿ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c č d-l ł m-z]</exemplarCharacters>
+		<exemplarCharacters>[a b c d e f g h i j k l m n o p q r s t u v w x y z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[á à ă â å ä ã ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ]</exemplarCharacters>
+		<exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>“</quotationStart>
@@ -1068,6 +1251,431 @@
 	</delimiters>
 	<dates>
 		<calendars>
+			<calendar type="buddhist">
+				<eras>
+					<eraAbbr>
+						<era type="0">BE</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+			<calendar type="chinese">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">Mo1</month>
+							<month type="2">Mo2</month>
+							<month type="3">Mo3</month>
+							<month type="4">Mo4</month>
+							<month type="5">Mo5</month>
+							<month type="6">Mo6</month>
+							<month type="7">Mo7</month>
+							<month type="8">Mo8</month>
+							<month type="9">Mo9</month>
+							<month type="10">Mo10</month>
+							<month type="11">Mo11</month>
+							<month type="12">Mo12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Month1</month>
+							<month type="2">Month2</month>
+							<month type="3">Month3</month>
+							<month type="4">Month4</month>
+							<month type="5">Month5</month>
+							<month type="6">Month6</month>
+							<month type="7">Month7</month>
+							<month type="8">Month8</month>
+							<month type="9">Month9</month>
+							<month type="10">Month10</month>
+							<month type="11">Month11</month>
+							<month type="12">Month12</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<cyclicNameSets>
+					<cyclicNameSet type="zodiacs">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">Rat</cyclicName>
+								<cyclicName type="2">Ox</cyclicName>
+								<cyclicName type="3">Tiger</cyclicName>
+								<cyclicName type="4">Rabbit</cyclicName>
+								<cyclicName type="5">Dragon</cyclicName>
+								<cyclicName type="6">Snake</cyclicName>
+								<cyclicName type="7">Horse</cyclicName>
+								<cyclicName type="8">Goat</cyclicName>
+								<cyclicName type="9">Monkey</cyclicName>
+								<cyclicName type="10">Rooster</cyclicName>
+								<cyclicName type="11">Dog</cyclicName>
+								<cyclicName type="12">Pig</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, MMMM d, U</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>MMMM d, U</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>MMM d, U</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>M/d/yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">U</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM U</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d, U</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, MMM d, U</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">U</dateFormatItem>
+						<dateFormatItem id="yMd">M/d/y</dateFormatItem>
+						<dateFormatItem id="yyyy">U</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y</dateFormatItem>
+						<dateFormatItem id="yyyyMd">M/d/y</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, M/d/y</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM U</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">MMM d, U</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, MMM d, U</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ U</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ U</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">M/d – M/d</greatestDifference>
+							<greatestDifference id="M">M/d – M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, M/d – E, M/d</greatestDifference>
+							<greatestDifference id="M">E, M/d – E, M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM d – d</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
+							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">U – U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">M/d/y – M/d/y</greatestDifference>
+							<greatestDifference id="M">M/d/y – M/d/y</greatestDifference>
+							<greatestDifference id="y">M/d/y – M/d/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, M/d/y – E, M/d/y</greatestDifference>
+							<greatestDifference id="M">E, M/d/y – E, M/d/y</greatestDifference>
+							<greatestDifference id="y">E, M/d/y – E, M/d/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM – MMM U</greatestDifference>
+							<greatestDifference id="y">MMM U – MMM U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">MMM d – d, U</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d, U</greatestDifference>
+							<greatestDifference id="y">MMM d, U – MMM d, U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, MMM d – E, MMM d, U</greatestDifference>
+							<greatestDifference id="M">E, MMM d – E, MMM d, U</greatestDifference>
+							<greatestDifference id="y">E, MMM d, U – E, MMM d, U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM – MMMM U</greatestDifference>
+							<greatestDifference id="y">MMMM U – MMMM U</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, MMMM d, y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>MMMM d, y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>MMM d, y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>M/d/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">MMM d, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, MMM d, y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
+					</availableFormats>
+					<appendItems>
+						<appendItem request="Day">{0} ({2}: {1})</appendItem>
+						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
+						<appendItem request="Era">{0} {1}</appendItem>
+						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
+						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
+						<appendItem request="Month">{0} ({2}: {1})</appendItem>
+						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
+						<appendItem request="Second">{0} ({2}: {1})</appendItem>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+						<appendItem request="Week">{0} ({2}: {1})</appendItem>
+						<appendItem request="Year">{0} {1}</appendItem>
+					</appendItems>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">M/d – M/d</greatestDifference>
+							<greatestDifference id="M">M/d – M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, M/d – E, M/d</greatestDifference>
+							<greatestDifference id="M">E, M/d – E, M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM d – d</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
+							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/d/y – M/d/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">MMM d – d, y G</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d, y G</greatestDifference>
+							<greatestDifference id="y">MMM d, y – MMM d, y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, MMM d – E, MMM d, y G</greatestDifference>
+							<greatestDifference id="M">E, MMM d – E, MMM d, y G</greatestDifference>
+							<greatestDifference id="y">E, MMM d, y – E, MMM d, y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
@@ -1128,6 +1736,15 @@
 							<day type="fri">Fri</day>
 							<day type="sat">Sat</day>
 						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">Su</day>
+							<day type="mon">Mo</day>
+							<day type="tue">Tu</day>
+							<day type="wed">We</day>
+							<day type="thu">Th</day>
+							<day type="fri">Fr</day>
+							<day type="sat">Sa</day>
+						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">Sunday</day>
 							<day type="mon">Monday</day>
@@ -1174,16 +1791,34 @@
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">n</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="am" alt="variant">am</dayPeriod>
+							<dayPeriod type="noon">noon</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="pm" alt="variant">pm</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">Before Christ</era>
+						<era type="0" alt="variant">Before Common Era</era>
 						<era type="1">Anno Domini</era>
+						<era type="1" alt="variant">Common Era</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">BC</era>
+						<era type="0" alt="variant">BCE</era>
 						<era type="1">AD</era>
+						<era type="1" alt="variant">CE</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">B</era>
@@ -1237,73 +1872,110 @@
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1} 'at' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1} 'at' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, M/d/yyyy</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
+						<dateFormatItem id="yMd">M/d/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, M/d/y</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, MMM d, y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
+						<dateFormatItem id="yMMMd">MMM d, y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, MMM d, y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
+					<appendItems>
+						<appendItem request="Day">{0} ({2}: {1})</appendItem>
+						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
+						<appendItem request="Era">{0} {1}</appendItem>
+						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
+						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
+						<appendItem request="Month">{0} ({2}: {1})</appendItem>
+						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
+						<appendItem request="Second">{0} ({2}: {1})</appendItem>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+						<appendItem request="Week">{0} ({2}: {1})</appendItem>
+						<appendItem request="Year">{0} {1}</appendItem>
+					</appendItems>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
-							<greatestDifference id="d">d–d</greatestDifference>
+							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
+							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">M/d – M/d</greatestDifference>
@@ -1314,42 +1986,39 @@
 							<greatestDifference id="M">E, M/d – E, M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d–d</greatestDifference>
+							<greatestDifference id="d">MMM d – d</greatestDifference>
 							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
 							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
+							<greatestDifference id="y">y – y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy – M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy – M/yy</greatestDifference>
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/yy – M/d/yy</greatestDifference>
-							<greatestDifference id="M">M/d/yy – M/d/yy</greatestDifference>
-							<greatestDifference id="y">M/d/yy – M/d/yy</greatestDifference>
+							<greatestDifference id="d">M/d/y – M/d/y</greatestDifference>
+							<greatestDifference id="M">M/d/y – M/d/y</greatestDifference>
+							<greatestDifference id="y">M/d/y – M/d/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, M/d/yy – E, M/d/yy</greatestDifference>
-							<greatestDifference id="M">E, M/d/yy – E, M/d/yy</greatestDifference>
-							<greatestDifference id="y">E, M/d/yy – E, M/d/yy</greatestDifference>
+							<greatestDifference id="d">E, M/d/y – E, M/d/y</greatestDifference>
+							<greatestDifference id="M">E, M/d/y – E, M/d/y</greatestDifference>
+							<greatestDifference id="y">E, M/d/y – E, M/d/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y</greatestDifference>
 							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">MMM d–d, y</greatestDifference>
+							<greatestDifference id="d">MMM d – d, y</greatestDifference>
 							<greatestDifference id="M">MMM d – MMM d, y</greatestDifference>
 							<greatestDifference id="y">MMM d, y – MMM d, y</greatestDifference>
 						</intervalFormatItem>
@@ -1359,81 +2028,253 @@
 							<greatestDifference id="y">E, MMM d, y – E, MMM d, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
 							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Era</displayName>
-					</field>
-					<field type="year">
-						<displayName>Year</displayName>
-					</field>
-					<field type="month">
-						<displayName>Month</displayName>
-					</field>
-					<field type="week">
-						<displayName>Week</displayName>
-					</field>
-					<field type="day">
-						<displayName>Day</displayName>
-						<relative type="-1">Yesterday</relative>
-						<relative type="0">Today</relative>
-						<relative type="1">Tomorrow</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Day of the Week</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>AM/PM</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Hour</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minute</displayName>
-					</field>
-					<field type="second">
-						<displayName>Second</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
+			</calendar>
+			<calendar type="hebrew">
+				<eras>
+					<eraAbbr>
+						<era type="0">AM</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+			<calendar type="islamic">
+				<eras>
+					<eraAbbr>
+						<era type="0">AH</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+			<calendar type="japanese">
+				<!-- need some non-empty element here to make inheritance work,
+					 this copy of generic dateFormats above is smaller than root japanese eras
+				-->
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, MMMM d, y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>MMMM d, y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>MMM d, y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>M/d/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+			</calendar>
+			<calendar type="roc">
+				<eras>
+					<eraAbbr>
+						<era type="0">Before R.O.C.</era>
+						<era type="1">Minguo</era>
+					</eraAbbr>
+				</eras>
 			</calendar>
 		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>Era</displayName>
+			</field>
+			<field type="year">
+				<displayName>Year</displayName>
+				<relative type="-1">last year</relative>
+				<relative type="0">this year</relative>
+				<relative type="1">next year</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} year</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} years</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} year ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} years ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>Month</displayName>
+				<relative type="-1">last month</relative>
+				<relative type="0">this month</relative>
+				<relative type="1">next month</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} month</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} months</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} month ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} months ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>Week</displayName>
+				<relative type="-1">last week</relative>
+				<relative type="0">this week</relative>
+				<relative type="1">next week</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} week</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} weeks</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} week ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} weeks ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>Day</displayName>
+				<relative type="-1">yesterday</relative>
+				<relative type="0">today</relative>
+				<relative type="1">tomorrow</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} day</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} days</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} day ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} days ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>Day of the Week</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">last Sunday</relative>
+				<relative type="0">this Sunday</relative>
+				<relative type="1">next Sunday</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">last Monday</relative>
+				<relative type="0">this Monday</relative>
+				<relative type="1">next Monday</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">last Tuesday</relative>
+				<relative type="0">this Tuesday</relative>
+				<relative type="1">next Tuesday</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">last Wednesday</relative>
+				<relative type="0">this Wednesday</relative>
+				<relative type="1">next Wednesday</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">last Thursday</relative>
+				<relative type="0">this Thursday</relative>
+				<relative type="1">next Thursday</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">last Friday</relative>
+				<relative type="0">this Friday</relative>
+				<relative type="1">next Friday</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">last Saturday</relative>
+				<relative type="0">this Saturday</relative>
+				<relative type="1">next Saturday</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="hour">
+				<displayName>Hour</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} hour</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} hours</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} hour ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} hours ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>Minute</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} minute</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} minutes</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} minute ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} minutes ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>Second</displayName>
+				<relative type="0">now</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} second</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} seconds</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} second ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} seconds ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>Time Zone</displayName>
+			</field>
+		</fields>
 		<timeZoneNames>
 			<hourFormat>+HH:mm;-HH:mm</hourFormat>
 			<gmtFormat>GMT{0}</gmtFormat>
 			<regionFormat>{0} Time</regionFormat>
+			<regionFormat type="daylight">{0} Daylight Time</regionFormat>
+			<regionFormat type="standard">{0} Standard Time</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Unknown</exemplarCity>
+				<exemplarCity>Unknown City</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
 				<exemplarCity>Dumont d’Urville</exemplarCity>
 			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>Saint Barthélemy</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Curaçao</exemplarCity>
+			</zone>
 			<zone type="Europe/London">
 				<long>
 					<daylight>British Summer Time</daylight>
 				</long>
-				<short>
-					<daylight>BST</daylight>
-				</short>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
 					<daylight>Irish Summer Time</daylight>
 				</long>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Asunción</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Réunion</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>São Tomé</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
 				<short>
-					<daylight>IST (Irish)</daylight>
+					<generic>HST</generic>
+					<standard>HST</standard>
+					<daylight>HDT</daylight>
 				</short>
 			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Ho Chi Minh City</exemplarCity>
+			</zone>
 			<metazone type="Acre">
 				<long>
-					<standard>Acre Time</standard>
+					<generic>Acre Time</generic>
+					<standard>Acre Standard Time</standard>
 					<daylight>Acre Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1454,25 +2295,16 @@
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<generic>South Africa Time</generic>
 					<standard>South Africa Standard Time</standard>
 				</long>
-				<short>
-					<generic>SAT</generic>
-				</short>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<standard>West Africa Time</standard>
+					<generic>West Africa Time</generic>
+					<standard>West Africa Standard Time</standard>
 					<daylight>West Africa Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktyubinsk Time</standard>
-					<daylight>Aktyubinsk Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Alaska">
 				<long>
 					<generic>Alaska Time</generic>
@@ -1481,28 +2313,21 @@
 				</long>
 				<short>
 					<generic>AKT</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Alaska-Hawaii Time</generic>
-					<standard>Alaska-Hawaii Standard Time</standard>
-					<daylight>Alaska-Hawaii Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>AHT</generic>
+					<standard>AKST</standard>
+					<daylight>AKDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Almaty">
 				<long>
-					<standard>Almaty Time</standard>
+					<generic>Almaty Time</generic>
+					<standard>Almaty Standard Time</standard>
 					<daylight>Almaty Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<standard>Amazon Time</standard>
+					<generic>Amazon Time</generic>
+					<standard>Amazon Standard Time</standard>
 					<daylight>Amazon Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1514,8 +2339,9 @@
 				</long>
 				<short>
 					<generic>CT</generic>
+					<standard>CST</standard>
+					<daylight>CDT</daylight>
 				</short>
-				<commonlyUsed>true</commonlyUsed>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -1525,8 +2351,9 @@
 				</long>
 				<short>
 					<generic>ET</generic>
+					<standard>EST</standard>
+					<daylight>EDT</daylight>
 				</short>
-				<commonlyUsed>true</commonlyUsed>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -1536,8 +2363,9 @@
 				</long>
 				<short>
 					<generic>MT</generic>
+					<standard>MST</standard>
+					<daylight>MDT</daylight>
 				</short>
-				<commonlyUsed>true</commonlyUsed>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -1547,24 +2375,28 @@
 				</long>
 				<short>
 					<generic>PT</generic>
+					<standard>PST</standard>
+					<daylight>PDT</daylight>
 				</short>
-				<commonlyUsed>true</commonlyUsed>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
-					<standard>Anadyr Time</standard>
+					<generic>Anadyr Time</generic>
+					<standard>Anadyr Standard Time</standard>
 					<daylight>Anadyr Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
 				<long>
-					<standard>Aqtau Time</standard>
+					<generic>Aqtau Time</generic>
+					<standard>Aqtau Standard Time</standard>
 					<daylight>Aqtau Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtobe">
 				<long>
-					<standard>Aqtobe Time</standard>
+					<generic>Aqtobe Time</generic>
+					<standard>Aqtobe Standard Time</standard>
 					<daylight>Aqtobe Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1574,38 +2406,27 @@
 					<standard>Arabian Standard Time</standard>
 					<daylight>Arabian Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>AT (Arabian)</generic>
-					<standard>AST (Arabian)</standard>
-					<daylight>ADT (Arabian)</daylight>
-				</short>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<standard>Argentina Time</standard>
+					<generic>Argentina Time</generic>
+					<standard>Argentina Standard Time</standard>
 					<daylight>Argentina Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<standard>Western Argentina Time</standard>
+					<generic>Western Argentina Time</generic>
+					<standard>Western Argentina Standard Time</standard>
+					<daylight>Western Argentina Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<standard>Armenia Time</standard>
+					<generic>Armenia Time</generic>
+					<standard>Armenia Standard Time</standard>
 					<daylight>Armenia Summer Time</daylight>
 				</long>
-				<short>
-					<standard>AMT (Armenia)</standard>
-					<daylight>AMST (Armenia)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>Ashkhabad Time</standard>
-					<daylight>Ashkhabad Summer Time</daylight>
-				</long>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
@@ -1615,8 +2436,9 @@
 				</long>
 				<short>
 					<generic>AT</generic>
+					<standard>AST</standard>
+					<daylight>ADT</daylight>
 				</short>
-				<commonlyUsed>true</commonlyUsed>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -1624,9 +2446,6 @@
 					<standard>Australian Central Standard Time</standard>
 					<daylight>Australian Central Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>ACT</generic>
-				</short>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
@@ -1634,9 +2453,6 @@
 					<standard>Australian Central Western Standard Time</standard>
 					<daylight>Australian Central Western Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>ACWT</generic>
-				</short>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
@@ -1644,9 +2460,6 @@
 					<standard>Australian Eastern Standard Time</standard>
 					<daylight>Australian Eastern Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>AET</generic>
-				</short>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
@@ -1654,44 +2467,28 @@
 					<standard>Australian Western Standard Time</standard>
 					<daylight>Australian Western Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>AWT</generic>
-				</short>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<standard>Azerbaijan Time</standard>
+					<generic>Azerbaijan Time</generic>
+					<standard>Azerbaijan Standard Time</standard>
 					<daylight>Azerbaijan Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<standard>Azores Time</standard>
+					<generic>Azores Time</generic>
+					<standard>Azores Standard Time</standard>
 					<daylight>Azores Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Baku Time</standard>
-					<daylight>Baku Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<standard>Bangladesh Time</standard>
+					<generic>Bangladesh Time</generic>
+					<standard>Bangladesh Standard Time</standard>
 					<daylight>Bangladesh Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Bering Time</generic>
-					<standard>Bering Standard Time</standard>
-					<daylight>Bering Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>BT (Bering)</generic>
-				</short>
-			</metazone>
 			<metazone type="Bhutan">
 				<long>
 					<standard>Bhutan Time</standard>
@@ -1702,15 +2499,10 @@
 					<standard>Bolivia Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Borneo Time</standard>
-					<daylight>Borneo Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<standard>Brasilia Time</standard>
+					<generic>Brasilia Time</generic>
+					<standard>Brasilia Standard Time</standard>
 					<daylight>Brasilia Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1721,33 +2513,32 @@
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<standard>Cape Verde Time</standard>
+					<generic>Cape Verde Time</generic>
+					<standard>Cape Verde Standard Time</standard>
 					<daylight>Cape Verde Summer Time</daylight>
 				</long>
 			</metazone>
+			<metazone type="Casey">
+				<long>
+					<standard>Casey Time</standard>
+				</long>
+			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<generic>Chamorro Time</generic>
 					<standard>Chamorro Standard Time</standard>
 				</long>
-				<short>
-					<generic>ChT</generic>
-				</short>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Changbai Time</standard>
-				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
+					<generic>Chatham Time</generic>
 					<standard>Chatham Standard Time</standard>
 					<daylight>Chatham Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<standard>Chile Time</standard>
+					<generic>Chile Time</generic>
+					<standard>Chile Standard Time</standard>
 					<daylight>Chile Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1757,15 +2548,11 @@
 					<standard>China Standard Time</standard>
 					<daylight>China Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>CT (China)</generic>
-					<standard>CST (China)</standard>
-					<daylight>CDT (China)</daylight>
-				</short>
 			</metazone>
 			<metazone type="Choibalsan">
 				<long>
-					<standard>Choibalsan Time</standard>
+					<generic>Choibalsan Time</generic>
+					<standard>Choibalsan Standard Time</standard>
 					<daylight>Choibalsan Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1781,13 +2568,15 @@
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<standard>Colombia Time</standard>
+					<generic>Colombia Time</generic>
+					<standard>Colombia Standard Time</standard>
 					<daylight>Colombia Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<standard>Cook Islands Time</standard>
+					<generic>Cook Islands Time</generic>
+					<standard>Cook Islands Standard Time</standard>
 					<daylight>Cook Islands Half Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1797,15 +2586,6 @@
 					<standard>Cuba Standard Time</standard>
 					<daylight>Cuba Daylight Time</daylight>
 				</long>
-				<short>
-					<standard>CST (Cuba)</standard>
-					<daylight>CDT (Cuba)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Dacca Time</standard>
-				</long>
 			</metazone>
 			<metazone type="Davis">
 				<long>
@@ -1814,18 +2594,7 @@
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>Dumont-d'Urville Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Dushanbe Time</standard>
-					<daylight>Dushanbe Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Dutch Guiana Time</standard>
+					<standard>Dumont-d’Urville Time</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
@@ -1835,7 +2604,8 @@
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<standard>Easter Island Time</standard>
+					<generic>Easter Island Time</generic>
+					<standard>Easter Island Standard Time</standard>
 					<daylight>Easter Island Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1846,31 +2616,36 @@
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<standard>Central European Time</standard>
+					<generic>Central European Time</generic>
+					<standard>Central European Standard Time</standard>
 					<daylight>Central European Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<standard>Eastern European Time</standard>
+					<generic>Eastern European Time</generic>
+					<standard>Eastern European Standard Time</standard>
 					<daylight>Eastern European Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<standard>Western European Time</standard>
+					<generic>Western European Time</generic>
+					<standard>Western European Standard Time</standard>
 					<daylight>Western European Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<standard>Falkland Islands Time</standard>
+					<generic>Falkland Islands Time</generic>
+					<standard>Falkland Islands Standard Time</standard>
 					<daylight>Falkland Islands Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
-					<standard>Fiji Time</standard>
+					<generic>Fiji Time</generic>
+					<standard>Fiji Standard Time</standard>
 					<daylight>Fiji Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1884,12 +2659,6 @@
 					<standard>French Southern and Antarctic Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Frunze Time</standard>
-					<daylight>Frunze Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Galapagos">
 				<long>
 					<standard>Galapagos Time</standard>
@@ -1902,7 +2671,8 @@
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<standard>Georgia Time</standard>
+					<generic>Georgia Time</generic>
+					<standard>Georgia Standard Time</standard>
 					<daylight>Georgia Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1915,23 +2685,21 @@
 				<long>
 					<standard>Greenwich Mean Time</standard>
 				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Central Greenland Time</standard>
-					<daylight>Central Greenland Summer Time</daylight>
-				</long>
+				<short>
+					<standard>GMT</standard>
+				</short>
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<standard>East Greenland Time</standard>
+					<generic>East Greenland Time</generic>
+					<standard>East Greenland Standard Time</standard>
 					<daylight>East Greenland Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<standard>West Greenland Time</standard>
+					<generic>West Greenland Time</generic>
+					<standard>West Greenland Standard Time</standard>
 					<daylight>West Greenland Summer Time</daylight>
 				</long>
 			</metazone>
@@ -1939,18 +2707,11 @@
 				<long>
 					<standard>Guam Standard Time</standard>
 				</long>
-				<short>
-					<standard>GST (Guam)</standard>
-				</short>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<generic>Gulf Time</generic>
 					<standard>Gulf Standard Time</standard>
 				</long>
-				<short>
-					<generic>GT</generic>
-				</short>
 			</metazone>
 			<metazone type="Guyana">
 				<long>
@@ -1959,19 +2720,27 @@
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
+					<generic>Hawaii-Aleutian Time</generic>
 					<standard>Hawaii-Aleutian Standard Time</standard>
+					<daylight>Hawaii-Aleutian Daylight Time</daylight>
 				</long>
-				<commonlyUsed>true</commonlyUsed>
+				<short>
+					<generic>HAT</generic>
+					<standard>HAST</standard>
+					<daylight>HADT</daylight>
+				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<standard>Hong Kong Time</standard>
+					<generic>Hong Kong Time</generic>
+					<standard>Hong Kong Standard Time</standard>
 					<daylight>Hong Kong Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<standard>Hovd Time</standard>
+					<generic>Hovd Time</generic>
+					<standard>Hovd Standard Time</standard>
 					<daylight>Hovd Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2007,13 +2776,15 @@
 			</metazone>
 			<metazone type="Iran">
 				<long>
+					<generic>Iran Time</generic>
 					<standard>Iran Standard Time</standard>
 					<daylight>Iran Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
-					<standard>Irkutsk Time</standard>
+					<generic>Irkutsk Time</generic>
+					<standard>Irkutsk Standard Time</standard>
 					<daylight>Irkutsk Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2023,9 +2794,6 @@
 					<standard>Israel Standard Time</standard>
 					<daylight>Israel Daylight Time</daylight>
 				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
 			</metazone>
 			<metazone type="Japan">
 				<long>
@@ -2033,42 +2801,22 @@
 					<standard>Japan Standard Time</standard>
 					<daylight>Japan Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>JT</generic>
-				</short>
 			</metazone>
 			<metazone type="Kamchatka">
 				<long>
-					<standard>Petropavlovsk-Kamchatski Time</standard>
+					<generic>Petropavlovsk-Kamchatski Time</generic>
+					<standard>Petropavlovsk-Kamchatski Standard Time</standard>
 					<daylight>Petropavlovsk-Kamchatski Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Karachi Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Kashgar Time</standard>
-				</long>
-			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
-					<generic>East Kazakhstan Time</generic>
-					<standard>East Kazakhstan Standard Time</standard>
+					<standard>East Kazakhstan Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Western">
 				<long>
-					<generic>West Kazakhstan Time</generic>
-					<standard>West Kazakhstan Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Kizilorda Time</standard>
-					<daylight>Kizilorda Summer Time</daylight>
+					<standard>West Kazakhstan Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Korea">
@@ -2077,9 +2825,6 @@
 					<standard>Korean Standard Time</standard>
 					<daylight>Korean Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>KT</generic>
-				</short>
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
@@ -2088,21 +2833,11 @@
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
-					<standard>Krasnoyarsk Time</standard>
+					<generic>Krasnoyarsk Time</generic>
+					<standard>Krasnoyarsk Standard Time</standard>
 					<daylight>Krasnoyarsk Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Kuybyshev Time</standard>
-					<daylight>Kuybyshev Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Kwajalein Time</standard>
-				</long>
-			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
 					<standard>Kyrgystan Time</standard>
@@ -2118,38 +2853,32 @@
 					<standard>Line Islands Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Long-Shu Time</standard>
-				</long>
-			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
 					<generic>Lord Howe Time</generic>
 					<standard>Lord Howe Standard Time</standard>
 					<daylight>Lord Howe Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>LHT</generic>
-				</short>
 			</metazone>
 			<metazone type="Macau">
 				<long>
-					<standard>Macau Time</standard>
+					<generic>Macau Time</generic>
+					<standard>Macau Standard Time</standard>
 					<daylight>Macau Summer Time</daylight>
 				</long>
 			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard>Macquarie Island Time</standard>
+				</long>
+			</metazone>
 			<metazone type="Magadan">
 				<long>
-					<standard>Magadan Time</standard>
+					<generic>Magadan Time</generic>
+					<standard>Magadan Standard Time</standard>
 					<daylight>Magadan Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Malaya Time</standard>
-				</long>
-			</metazone>
 			<metazone type="Malaysia">
 				<long>
 					<standard>Malaysia Time</standard>
@@ -2172,7 +2901,8 @@
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<standard>Mauritius Time</standard>
+					<generic>Mauritius Time</generic>
+					<standard>Mauritius Standard Time</standard>
 					<daylight>Mauritius Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2181,9 +2911,24 @@
 					<standard>Mawson Time</standard>
 				</long>
 			</metazone>
+			<metazone type="Mexico_Northwest">
+				<long>
+					<generic>Northwest Mexico Time</generic>
+					<standard>Northwest Mexico Standard Time</standard>
+					<daylight>Northwest Mexico Daylight Time</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>Mexican Pacific Time</generic>
+					<standard>Mexican Pacific Standard Time</standard>
+					<daylight>Mexican Pacific Daylight Time</daylight>
+				</long>
+			</metazone>
 			<metazone type="Mongolia">
 				<long>
-					<standard>Ulan Bator Time</standard>
+					<generic>Ulan Bator Time</generic>
+					<standard>Ulan Bator Standard Time</standard>
 					<daylight>Ulan Bator Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2211,7 +2956,8 @@
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<standard>New Caledonia Time</standard>
+					<generic>New Caledonia Time</generic>
+					<standard>New Caledonia Standard Time</standard>
 					<daylight>New Caledonia Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2221,9 +2967,6 @@
 					<standard>New Zealand Standard Time</standard>
 					<daylight>New Zealand Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>NZT</generic>
-				</short>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
@@ -2231,9 +2974,6 @@
 					<standard>Newfoundland Standard Time</standard>
 					<daylight>Newfoundland Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>NT</generic>
-				</short>
 			</metazone>
 			<metazone type="Niue">
 				<long>
@@ -2242,12 +2982,13 @@
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
-					<standard>Norfolk Islands Time</standard>
+					<standard>Norfolk Island Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<standard>Fernando de Noronha Time</standard>
+					<generic>Fernando de Noronha Time</generic>
+					<standard>Fernando de Noronha Standard Time</standard>
 					<daylight>Fernando de Noronha Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2258,19 +2999,22 @@
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
-					<standard>Novosibirsk Time</standard>
+					<generic>Novosibirsk Time</generic>
+					<standard>Novosibirsk Standard Time</standard>
 					<daylight>Novosibirsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
-					<standard>Omsk Time</standard>
+					<generic>Omsk Time</generic>
+					<standard>Omsk Standard Time</standard>
 					<daylight>Omsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
-					<standard>Pakistan Time</standard>
+					<generic>Pakistan Time</generic>
+					<standard>Pakistan Standard Time</standard>
 					<daylight>Pakistan Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2286,19 +3030,22 @@
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
-					<standard>Paraguay Time</standard>
+					<generic>Paraguay Time</generic>
+					<standard>Paraguay Standard Time</standard>
 					<daylight>Paraguay Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
-					<standard>Peru Time</standard>
+					<generic>Peru Time</generic>
+					<standard>Peru Standard Time</standard>
 					<daylight>Peru Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<standard>Philippine Time</standard>
+					<generic>Philippine Time</generic>
+					<standard>Philippine Standard Time</standard>
 					<daylight>Philippine Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2309,13 +3056,10 @@
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>Pierre and Miquelon Time</generic>
-					<standard>Pierre and Miquelon Standard Time</standard>
-					<daylight>Pierre and Miquelon Daylight Time</daylight>
+					<generic>Saint Pierre and Miquelon Time</generic>
+					<standard>Saint Pierre and Miquelon Standard Time</standard>
+					<daylight>Saint Pierre and Miquelon Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>PMT</generic>
-				</short>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
@@ -2329,7 +3073,8 @@
 			</metazone>
 			<metazone type="Qyzylorda">
 				<long>
-					<standard>Qyzylorda Time</standard>
+					<generic>Qyzylorda Time</generic>
+					<standard>Qyzylorda Standard Time</standard>
 					<daylight>Qyzylorda Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2345,25 +3090,23 @@
 			</metazone>
 			<metazone type="Sakhalin">
 				<long>
-					<standard>Sakhalin Time</standard>
+					<generic>Sakhalin Time</generic>
+					<standard>Sakhalin Standard Time</standard>
 					<daylight>Sakhalin Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samara">
 				<long>
-					<standard>Samara Time</standard>
+					<generic>Samara Time</generic>
+					<standard>Samara Standard Time</standard>
 					<daylight>Samara Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Samarkand Time</standard>
-					<daylight>Samarkand Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Samoa">
 				<long>
+					<generic>Samoa Time</generic>
 					<standard>Samoa Standard Time</standard>
+					<daylight>Samoa Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -2371,12 +3114,6 @@
 					<standard>Seychelles Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Shevchenko Time</standard>
-					<daylight>Shevchenko Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Singapore">
 				<long>
 					<standard>Singapore Standard Time</standard>
@@ -2391,21 +3128,12 @@
 				<long>
 					<standard>South Georgia Time</standard>
 				</long>
-				<short>
-					<standard>GST (S. Georgia)</standard>
-				</short>
 			</metazone>
 			<metazone type="Suriname">
 				<long>
 					<standard>Suriname Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Sverdlovsk Time</standard>
-					<daylight>Sverdlovsk Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Syowa">
 				<long>
 					<standard>Syowa Time</standard>
@@ -2422,29 +3150,12 @@
 					<standard>Taipei Standard Time</standard>
 					<daylight>Taipei Daylight Time</daylight>
 				</long>
-				<short>
-					<generic>CT (Taipei)</generic>
-					<standard>CST (Taipei)</standard>
-					<daylight>CDT (Taipei)</daylight>
-				</short>
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
 					<standard>Tajikistan Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Tashkent Time</standard>
-					<daylight>Tashkent Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Tbilisi Time</standard>
-					<daylight>Tbilisi Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Tokelau">
 				<long>
 					<standard>Tokelau Time</standard>
@@ -2452,24 +3163,20 @@
 			</metazone>
 			<metazone type="Tonga">
 				<long>
-					<standard>Tonga Time</standard>
+					<generic>Tonga Time</generic>
+					<standard>Tonga Standard Time</standard>
 					<daylight>Tonga Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
 				<long>
-					<standard>Truk Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Turkey Time</standard>
-					<daylight>Turkey Summer Time</daylight>
+					<standard>Chuuk Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
-					<standard>Turkmenistan Time</standard>
+					<generic>Turkmenistan Time</generic>
+					<standard>Turkmenistan Standard Time</standard>
 					<daylight>Turkmenistan Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2478,32 +3185,24 @@
 					<standard>Tuvalu Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Ural'sk Time</standard>
-					<daylight>Ural'sk Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Uruguay">
 				<long>
-					<standard>Uruguay Time</standard>
+					<generic>Uruguay Time</generic>
+					<standard>Uruguay Standard Time</standard>
 					<daylight>Uruguay Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Urumqi Time</standard>
-				</long>
-			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<standard>Uzbekistan Time</standard>
+					<generic>Uzbekistan Time</generic>
+					<standard>Uzbekistan Standard Time</standard>
 					<daylight>Uzbekistan Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<standard>Vanuatu Time</standard>
+					<generic>Vanuatu Time</generic>
+					<standard>Vanuatu Standard Time</standard>
 					<daylight>Vanuatu Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2514,13 +3213,15 @@
 			</metazone>
 			<metazone type="Vladivostok">
 				<long>
-					<standard>Vladivostok Time</standard>
+					<generic>Vladivostok Time</generic>
+					<standard>Vladivostok Standard Time</standard>
 					<daylight>Vladivostok Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
-					<standard>Volgograd Time</standard>
+					<generic>Volgograd Time</generic>
+					<standard>Volgograd Standard Time</standard>
 					<daylight>Volgograd Summer Time</daylight>
 				</long>
 			</metazone>
@@ -2541,73 +3242,117 @@
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<standard>Yakutsk Time</standard>
+					<generic>Yakutsk Time</generic>
+					<standard>Yakutsk Standard Time</standard>
 					<daylight>Yakutsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<standard>Yekaterinburg Time</standard>
+					<generic>Yekaterinburg Time</generic>
+					<standard>Yekaterinburg Standard Time</standard>
 					<daylight>Yekaterinburg Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Yerevan Time</standard>
-					<daylight>Yerevan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Yukon Time</generic>
-					<standard>Yukon Standard Time</standard>
-					<daylight>Yukon Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>YT</generic>
-				</short>
-			</metazone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
-		<symbols>
+		<symbols numberSystem="latn">
 			<decimal>.</decimal>
 			<group>,</group>
 			<list>;</list>
 			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
 			<plusSign>+</plusSign>
 			<minusSign>-</minusSign>
 			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
 		</symbols>
-		<decimalFormats>
+		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
 				<decimalFormat>
 					<pattern>#,##0.###</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 thousand</pattern>
+					<pattern type="1000" count="other">0 thousand</pattern>
+					<pattern type="10000" count="one">00 thousand</pattern>
+					<pattern type="10000" count="other">00 thousand</pattern>
+					<pattern type="100000" count="one">000 thousand</pattern>
+					<pattern type="100000" count="other">000 thousand</pattern>
+					<pattern type="1000000" count="one">0 million</pattern>
+					<pattern type="1000000" count="other">0 million</pattern>
+					<pattern type="10000000" count="one">00 million</pattern>
+					<pattern type="10000000" count="other">00 million</pattern>
+					<pattern type="100000000" count="one">000 million</pattern>
+					<pattern type="100000000" count="other">000 million</pattern>
+					<pattern type="1000000000" count="one">0 billion</pattern>
+					<pattern type="1000000000" count="other">0 billion</pattern>
+					<pattern type="10000000000" count="one">00 billion</pattern>
+					<pattern type="10000000000" count="other">00 billion</pattern>
+					<pattern type="100000000000" count="one">000 billion</pattern>
+					<pattern type="100000000000" count="other">000 billion</pattern>
+					<pattern type="1000000000000" count="one">0 trillion</pattern>
+					<pattern type="1000000000000" count="other">0 trillion</pattern>
+					<pattern type="10000000000000" count="one">00 trillion</pattern>
+					<pattern type="10000000000000" count="other">00 trillion</pattern>
+					<pattern type="100000000000000" count="one">000 trillion</pattern>
+					<pattern type="100000000000000" count="other">000 trillion</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one">0K</pattern>
+					<pattern type="1000" count="other">0K</pattern>
+					<pattern type="10000" count="one">00K</pattern>
+					<pattern type="10000" count="other">00K</pattern>
+					<pattern type="100000" count="one">000K</pattern>
+					<pattern type="100000" count="other">000K</pattern>
+					<pattern type="1000000" count="one">0M</pattern>
+					<pattern type="1000000" count="other">0M</pattern>
+					<pattern type="10000000" count="one">00M</pattern>
+					<pattern type="10000000" count="other">00M</pattern>
+					<pattern type="100000000" count="one">000M</pattern>
+					<pattern type="100000000" count="other">000M</pattern>
+					<pattern type="1000000000" count="one">0B</pattern>
+					<pattern type="1000000000" count="other">0B</pattern>
+					<pattern type="10000000000" count="one">00B</pattern>
+					<pattern type="10000000000" count="other">00B</pattern>
+					<pattern type="100000000000" count="one">000B</pattern>
+					<pattern type="100000000000" count="other">000B</pattern>
+					<pattern type="1000000000000" count="one">0T</pattern>
+					<pattern type="1000000000000" count="other">0T</pattern>
+					<pattern type="10000000000000" count="one">00T</pattern>
+					<pattern type="10000000000000" count="other">00T</pattern>
+					<pattern type="100000000000000" count="one">000T</pattern>
+					<pattern type="100000000000000" count="other">000T</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
 		</decimalFormats>
-		<scientificFormats>
+		<scientificFormats numberSystem="latn">
 			<scientificFormatLength>
 				<scientificFormat>
 					<pattern>#E0</pattern>
 				</scientificFormat>
 			</scientificFormatLength>
 		</scientificFormats>
-		<percentFormats>
+		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
 					<pattern>#,##0%</pattern>
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
-		<currencyFormats>
+		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
-				<currencyFormat>
+				<currencyFormat type="standard">
+					<pattern>¤#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -2626,15 +3371,20 @@
 				<displayName count="other">UAE dirhams</displayName>
 			</currency>
 			<currency type="AFA">
-				<displayName>Afghan Afghani (1927-2002)</displayName>
-				<displayName count="one">Afghan Afghani (AFA)</displayName>
-				<displayName count="other">Afghan Afghanis (AFA)</displayName>
+				<displayName>Afghan Afghani (1927–2002)</displayName>
+				<displayName count="one">Afghan afghani (1927–2002)</displayName>
+				<displayName count="other">Afghan afghanis (1927–2002)</displayName>
 			</currency>
 			<currency type="AFN">
 				<displayName>Afghan Afghani</displayName>
 				<displayName count="one">Afghan Afghani</displayName>
 				<displayName count="other">Afghan Afghanis</displayName>
 			</currency>
+			<currency type="ALK">
+				<displayName>Albanian Lek (1946–1965)</displayName>
+				<displayName count="one">Albanian lek (1946–1965)</displayName>
+				<displayName count="other">Albanian lekë (1946–1965)</displayName>
+			</currency>
 			<currency type="ALL">
 				<displayName>Albanian Lek</displayName>
 				<displayName count="one">Albanian lek</displayName>
@@ -2656,19 +3406,19 @@
 				<displayName count="other">Angolan kwanzas</displayName>
 			</currency>
 			<currency type="AOK">
-				<displayName>Angolan Kwanza (1977-1990)</displayName>
-				<displayName count="one">Angolan kwanza (AOK)</displayName>
-				<displayName count="other">Angolan kwanzas (AOK)</displayName>
+				<displayName>Angolan Kwanza (1977–1991)</displayName>
+				<displayName count="one">Angolan kwanza (1977–1991)</displayName>
+				<displayName count="other">Angolan kwanzas (1977–1991)</displayName>
 			</currency>
 			<currency type="AON">
-				<displayName>Angolan New Kwanza (1990-2000)</displayName>
-				<displayName count="one">Angolan new kwanza (AON)</displayName>
-				<displayName count="other">Angolan new kwanzas (AON)</displayName>
+				<displayName>Angolan New Kwanza (1990–2000)</displayName>
+				<displayName count="one">Angolan new kwanza (1990–2000)</displayName>
+				<displayName count="other">Angolan new kwanzas (1990–2000)</displayName>
 			</currency>
 			<currency type="AOR">
-				<displayName>Angolan Kwanza Reajustado (1995-1999)</displayName>
-				<displayName count="one">Angolan kwanza reajustado (AOR)</displayName>
-				<displayName count="other">Angolan kwanzas reajustado (AOR)</displayName>
+				<displayName>Angolan Readjusted Kwanza (1995–1999)</displayName>
+				<displayName count="one">Angolan readjusted kwanza (1995–1999)</displayName>
+				<displayName count="other">Angolan readjusted kwanzas (1995–1999)</displayName>
 			</currency>
 			<currency type="ARA">
 				<displayName>Argentine Austral</displayName>
@@ -2676,19 +3426,19 @@
 				<displayName count="other">Argentine australs</displayName>
 			</currency>
 			<currency type="ARL">
-				<displayName>Argentine Peso Ley</displayName>
-				<displayName count="one">Argentine peso ley</displayName>
-				<displayName count="other">Argentine pesos ley</displayName>
+				<displayName>Argentine Peso Ley (1970–1983)</displayName>
+				<displayName count="one">Argentine peso ley (1970–1983)</displayName>
+				<displayName count="other">Argentine pesos ley (1970–1983)</displayName>
 			</currency>
 			<currency type="ARM">
-				<displayName>Argentine Peso Moneda Nacional</displayName>
-				<displayName count="one">Argentine peso moneda nacional</displayName>
-				<displayName count="other">Argentine pesos moneda nacional</displayName>
+				<displayName>Argentine Peso (1881–1970)</displayName>
+				<displayName count="one">Argentine peso (1881–1970)</displayName>
+				<displayName count="other">Argentine pesos (1881–1970)</displayName>
 			</currency>
 			<currency type="ARP">
-				<displayName>Argentine Peso (1983-1985)</displayName>
-				<displayName count="one">Argentine peso (ARP)</displayName>
-				<displayName count="other">Argentine pesos (ARP)</displayName>
+				<displayName>Argentine Peso (1983–1985)</displayName>
+				<displayName count="one">Argentine peso (1983–1985)</displayName>
+				<displayName count="other">Argentine pesos (1983–1985)</displayName>
 			</currency>
 			<currency type="ARS">
 				<displayName>Argentine Peso</displayName>
@@ -2711,9 +3461,9 @@
 				<displayName count="other">Aruban florin</displayName>
 			</currency>
 			<currency type="AZM">
-				<displayName>Azerbaijani Manat (1993-2006)</displayName>
-				<displayName count="one">Azerbaijani manat (AZM)</displayName>
-				<displayName count="other">Azerbaijani manats (AZM)</displayName>
+				<displayName>Azerbaijani Manat (1993–2006)</displayName>
+				<displayName count="one">Azerbaijani manat (1993–2006)</displayName>
+				<displayName count="other">Azerbaijani manats (1993–2006)</displayName>
 			</currency>
 			<currency type="AZN">
 				<displayName>Azerbaijani Manat</displayName>
@@ -2721,9 +3471,9 @@
 				<displayName count="other">Azerbaijani manats</displayName>
 			</currency>
 			<currency type="BAD">
-				<displayName>Bosnia-Herzegovina Dinar</displayName>
-				<displayName count="one">Bosnia-Herzegovina dinar</displayName>
-				<displayName count="other">Bosnia-Herzegovina dinars</displayName>
+				<displayName>Bosnia-Herzegovina Dinar (1992–1994)</displayName>
+				<displayName count="one">Bosnia-Herzegovina dinar (1992–1994)</displayName>
+				<displayName count="other">Bosnia-Herzegovina dinars (1992–1994)</displayName>
 			</currency>
 			<currency type="BAM">
 				<displayName>Bosnia-Herzegovina Convertible Mark</displayName>
@@ -2731,9 +3481,9 @@
 				<displayName count="other">Bosnia-Herzegovina convertible marks</displayName>
 			</currency>
 			<currency type="BAN">
-				<displayName>Bosnia-Herzegovina New Dinar</displayName>
-				<displayName count="one">Bosnia-Herzegovina new dinar</displayName>
-				<displayName count="other">Bosnia-Herzegovina new dinars</displayName>
+				<displayName>Bosnia-Herzegovina New Dinar (1994–1997)</displayName>
+				<displayName count="one">Bosnia-Herzegovina new dinar (1994–1997)</displayName>
+				<displayName count="other">Bosnia-Herzegovina new dinars (1994–1997)</displayName>
 			</currency>
 			<currency type="BBD">
 				<displayName>Barbadian Dollar</displayName>
@@ -2776,9 +3526,9 @@
 				<displayName count="other">Bulgarian leva</displayName>
 			</currency>
 			<currency type="BGO">
-				<displayName>Old Bulgarian Lev</displayName>
-				<displayName count="one">Old Bulgarian lev</displayName>
-				<displayName count="other">Old Bulgarian leva</displayName>
+				<displayName>Bulgarian Lev (1879–1952)</displayName>
+				<displayName count="one">Bulgarian lev (1879–1952)</displayName>
+				<displayName count="other">Bulgarian leva (1879–1952)</displayName>
 			</currency>
 			<currency type="BHD">
 				<displayName>Bahraini Dinar</displayName>
@@ -2806,9 +3556,9 @@
 				<displayName count="other">Bolivian bolivianos</displayName>
 			</currency>
 			<currency type="BOL">
-				<displayName>Old Bolivian Boliviano</displayName>
-				<displayName count="one">Old Bolivian boliviano</displayName>
-				<displayName count="other">Old Bolivian bolivianos</displayName>
+				<displayName>Bolivian Boliviano (1863–1963)</displayName>
+				<displayName count="one">Bolivian boliviano (1863–1963)</displayName>
+				<displayName count="other">Bolivian bolivianos (1863–1963)</displayName>
 			</currency>
 			<currency type="BOP">
 				<displayName>Bolivian Peso</displayName>
@@ -2821,19 +3571,19 @@
 				<displayName count="other">Bolivian mvdols</displayName>
 			</currency>
 			<currency type="BRB">
-				<displayName>Brazilian Cruzeiro Novo (1967-1986)</displayName>
-				<displayName count="one">Brazilian cruzeiro novo (BRB)</displayName>
-				<displayName count="other">Brazilian cruzeiros novo (BRB)</displayName>
+				<displayName>Brazilian New Cruzeiro (1967–1986)</displayName>
+				<displayName count="one">Brazilian new cruzeiro (1967–1986)</displayName>
+				<displayName count="other">Brazilian new cruzeiros (1967–1986)</displayName>
 			</currency>
 			<currency type="BRC">
-				<displayName>Brazilian Cruzado</displayName>
-				<displayName count="one">Brazilian cruzado</displayName>
-				<displayName count="other">Brazilian cruzados</displayName>
+				<displayName>Brazilian Cruzado (1986–1989)</displayName>
+				<displayName count="one">Brazilian cruzado (1986–1989)</displayName>
+				<displayName count="other">Brazilian cruzados (1986–1989)</displayName>
 			</currency>
 			<currency type="BRE">
-				<displayName>Brazilian Cruzeiro (1990-1993)</displayName>
-				<displayName count="one">Brazilian cruzeiro (BRE)</displayName>
-				<displayName count="other">Brazilian cruzeiros (BRE)</displayName>
+				<displayName>Brazilian Cruzeiro (1990–1993)</displayName>
+				<displayName count="one">Brazilian cruzeiro (1990–1993)</displayName>
+				<displayName count="other">Brazilian cruzeiros (1990–1993)</displayName>
 			</currency>
 			<currency type="BRL">
 				<displayName>Brazilian Real</displayName>
@@ -2841,19 +3591,19 @@
 				<displayName count="other">Brazilian reals</displayName>
 			</currency>
 			<currency type="BRN">
-				<displayName>Brazilian Cruzado Novo</displayName>
-				<displayName count="one">Brazilian cruzado novo</displayName>
-				<displayName count="other">Brazilian cruzado novos</displayName>
+				<displayName>Brazilian New Cruzado (1989–1990)</displayName>
+				<displayName count="one">Brazilian new cruzado (1989–1990)</displayName>
+				<displayName count="other">Brazilian new cruzados (1989–1990)</displayName>
 			</currency>
 			<currency type="BRR">
-				<displayName>Brazilian Cruzeiro</displayName>
-				<displayName count="one">Brazilian cruzeiro</displayName>
-				<displayName count="other">Brazilian cruzeiros</displayName>
+				<displayName>Brazilian Cruzeiro (1993–1994)</displayName>
+				<displayName count="one">Brazilian cruzeiro (1993–1994)</displayName>
+				<displayName count="other">Brazilian cruzeiros (1993–1994)</displayName>
 			</currency>
 			<currency type="BRZ">
-				<displayName>Old Brazilian Cruzeiro</displayName>
-				<displayName count="one">Old Brazilian cruzeiro</displayName>
-				<displayName count="other">Old Brazilian cruzeiros</displayName>
+				<displayName>Brazilian Cruzeiro (1942–1967)</displayName>
+				<displayName count="one">Brazilian cruzeiro (1942–1967)</displayName>
+				<displayName count="other">Brazilian cruzeiros (1942–1967)</displayName>
 			</currency>
 			<currency type="BSD">
 				<displayName>Bahamian Dollar</displayName>
@@ -2876,9 +3626,9 @@
 				<displayName count="other">Botswanan pulas</displayName>
 			</currency>
 			<currency type="BYB">
-				<displayName>Belarusian New Ruble (1994-1999)</displayName>
-				<displayName count="one">Belarusian new ruble (BYB)</displayName>
-				<displayName count="other">Belarusian new rubles (BYB)</displayName>
+				<displayName>Belarusian New Ruble (1994–1999)</displayName>
+				<displayName count="one">Belarusian new ruble (1994–1999)</displayName>
+				<displayName count="other">Belarusian new rubles (1994–1999)</displayName>
 			</currency>
 			<currency type="BYR">
 				<displayName>Belarusian Ruble</displayName>
@@ -2921,17 +3671,22 @@
 				<displayName count="other">Chilean escudos</displayName>
 			</currency>
 			<currency type="CLF">
-				<displayName>Chilean Unidades de Fomento</displayName>
-				<displayName count="one">Chilean unidades de fomento</displayName>
-				<displayName count="other">Chilean unidades de fomentos</displayName>
+				<displayName>Chilean Unit of Account (UF)</displayName>
+				<displayName count="one">Chilean unit of account (UF)</displayName>
+				<displayName count="other">Chilean units of account (UF)</displayName>
 			</currency>
 			<currency type="CLP">
 				<displayName>Chilean Peso</displayName>
 				<displayName count="one">Chilean peso</displayName>
 				<displayName count="other">Chilean pesos</displayName>
 			</currency>
+			<currency type="CNX">
+				<displayName>Chinese People’s Bank Dollar</displayName>
+				<displayName count="one">Chinese People’s Bank dollar</displayName>
+				<displayName count="other">Chinese People’s Bank dollars</displayName>
+			</currency>
 			<currency type="CNY">
-				<displayName>Chinese Yuan Renminbi</displayName>
+				<displayName>Chinese Yuan</displayName>
 				<displayName count="one">Chinese yuan</displayName>
 				<displayName count="other">Chinese yuan</displayName>
 			</currency>
@@ -2941,9 +3696,9 @@
 				<displayName count="other">Colombian pesos</displayName>
 			</currency>
 			<currency type="COU">
-				<displayName>Unidad de Valor Real</displayName>
-				<displayName count="one">unidad de valor real</displayName>
-				<displayName count="other">unidad de valor reals</displayName>
+				<displayName>Colombian Real Value Unit</displayName>
+				<displayName count="one">Colombian real value unit</displayName>
+				<displayName count="other">Colombian real value units</displayName>
 			</currency>
 			<currency type="CRC">
 				<displayName>Costa Rican Colón</displayName>
@@ -2951,9 +3706,9 @@
 				<displayName count="other">Costa Rican colóns</displayName>
 			</currency>
 			<currency type="CSD">
-				<displayName>Old Serbian Dinar</displayName>
-				<displayName count="one">Old Serbian dinar</displayName>
-				<displayName count="other">Old Serbian dinars</displayName>
+				<displayName>Serbian Dinar (2002–2006)</displayName>
+				<displayName count="one">Serbian dinar (2002–2006)</displayName>
+				<displayName count="other">Serbian dinars (2002–2006)</displayName>
 			</currency>
 			<currency type="CSK">
 				<displayName>Czechoslovak Hard Koruna</displayName>
@@ -3021,9 +3776,9 @@
 				<displayName count="other">Ecuadorian sucres</displayName>
 			</currency>
 			<currency type="ECV">
-				<displayName>Ecuadorian Unidad de Valor Constante (UVC)</displayName>
-				<displayName count="one">Ecuadorian unidad de valor Constante (UVC)</displayName>
-				<displayName count="other">Ecuadorian unidads de valor Constante (UVC)</displayName>
+				<displayName>Ecuadorian Unit of Constant Value</displayName>
+				<displayName count="one">Ecuadorian unit of constant value</displayName>
+				<displayName count="other">Ecuadorian units of constant value</displayName>
 			</currency>
 			<currency type="EEK">
 				<displayName>Estonian Kroon</displayName>
@@ -3088,7 +3843,7 @@
 			<currency type="GBP">
 				<displayName>British Pound Sterling</displayName>
 				<displayName count="one">British pound sterling</displayName>
-				<displayName count="other">British pound sterlings</displayName>
+				<displayName count="other">British pounds sterling</displayName>
 			</currency>
 			<currency type="GEK">
 				<displayName>Georgian Kupon Larit</displayName>
@@ -3101,9 +3856,9 @@
 				<displayName count="other">Georgian laris</displayName>
 			</currency>
 			<currency type="GHC">
-				<displayName>Ghanaian Cedi (1979-2007)</displayName>
-				<displayName count="one">Ghanaian cedi (GHC)</displayName>
-				<displayName count="other">Ghanaian cedis (GHC)</displayName>
+				<displayName>Ghanaian Cedi (1979–2007)</displayName>
+				<displayName count="one">Ghanaian cedi (1979–2007)</displayName>
+				<displayName count="other">Ghanaian cedis (1979–2007)</displayName>
 			</currency>
 			<currency type="GHS">
 				<displayName>Ghanaian Cedi</displayName>
@@ -3206,9 +3961,9 @@
 				<displayName count="other">Israeli pounds</displayName>
 			</currency>
 			<currency type="ILR">
-				<displayName>Old Israeli Sheqel</displayName>
-				<displayName count="one">Old Israeli sheqel</displayName>
-				<displayName count="other">Old Israeli sheqels</displayName>
+				<displayName>Israeli Sheqel (1980–1985)</displayName>
+				<displayName count="one">Israeli sheqel (1980–1985)</displayName>
+				<displayName count="other">Israeli sheqels (1980–1985)</displayName>
 			</currency>
 			<currency type="ILS">
 				<displayName>Israeli New Sheqel</displayName>
@@ -3231,9 +3986,9 @@
 				<displayName count="other">Iranian rials</displayName>
 			</currency>
 			<currency type="ISJ">
-				<displayName>Old Icelandic Króna</displayName>
-				<displayName count="one">Old Icelandic króna</displayName>
-				<displayName count="other">Old Icelandic krónur</displayName>
+				<displayName>Icelandic Króna (1918–1981)</displayName>
+				<displayName count="one">Icelandic króna (1918–1981)</displayName>
+				<displayName count="other">Icelandic krónur (1918–1981)</displayName>
 			</currency>
 			<currency type="ISK">
 				<displayName>Icelandic Króna</displayName>
@@ -3287,14 +4042,14 @@
 				<displayName count="other">North Korean won</displayName>
 			</currency>
 			<currency type="KRH">
-				<displayName>South Korean Hwan</displayName>
-				<displayName count="one">South Korean hwan</displayName>
-				<displayName count="other">South Korean hwan</displayName>
+				<displayName>South Korean Hwan (1953–1962)</displayName>
+				<displayName count="one">South Korean hwan (1953–1962)</displayName>
+				<displayName count="other">South Korean hwan (1953–1962)</displayName>
 			</currency>
 			<currency type="KRO">
-				<displayName>Old South Korean Won</displayName>
-				<displayName count="one">Old South Korean won</displayName>
-				<displayName count="other">Old South Korean won</displayName>
+				<displayName>South Korean Won (1945–1953)</displayName>
+				<displayName count="one">South Korean won (1945–1953)</displayName>
+				<displayName count="other">South Korean won (1945–1953)</displayName>
 			</currency>
 			<currency type="KRW">
 				<displayName>South Korean Won</displayName>
@@ -3312,9 +4067,9 @@
 				<displayName count="other">Cayman Islands dollars</displayName>
 			</currency>
 			<currency type="KZT">
-				<displayName>Kazakhstan Tenge</displayName>
-				<displayName count="one">Kazakhstan tenge</displayName>
-				<displayName count="other">Kazakhstan tenges</displayName>
+				<displayName>Kazakhstani Tenge</displayName>
+				<displayName count="one">Kazakhstani tenge</displayName>
+				<displayName count="other">Kazakhstani tenges</displayName>
 			</currency>
 			<currency type="LAK">
 				<displayName>Laotian Kip</displayName>
@@ -3327,9 +4082,9 @@
 				<displayName count="other">Lebanese pounds</displayName>
 			</currency>
 			<currency type="LKR">
-				<displayName>Sri Lanka Rupee</displayName>
-				<displayName count="one">Sri Lanka rupee</displayName>
-				<displayName count="other">Sri Lanka rupees</displayName>
+				<displayName>Sri Lankan Rupee</displayName>
+				<displayName count="one">Sri Lankan rupee</displayName>
+				<displayName count="other">Sri Lankan rupees</displayName>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberian Dollar</displayName>
@@ -3422,9 +4177,9 @@
 				<displayName count="other">Macedonian denari</displayName>
 			</currency>
 			<currency type="MKN">
-				<displayName>Old Macedonian Denar</displayName>
-				<displayName count="one">Old Macedonian denar</displayName>
-				<displayName count="other">Old Macedonian denari</displayName>
+				<displayName>Macedonian Denar (1992–1993)</displayName>
+				<displayName count="one">Macedonian denar (1992–1993)</displayName>
+				<displayName count="other">Macedonian denari (1992–1993)</displayName>
 			</currency>
 			<currency type="MLF">
 				<displayName>Malian Franc</displayName>
@@ -3432,9 +4187,9 @@
 				<displayName count="other">Malian francs</displayName>
 			</currency>
 			<currency type="MMK">
-				<displayName>Myanma Kyat</displayName>
-				<displayName count="one">Myanma kyat</displayName>
-				<displayName count="other">Myanma kyats</displayName>
+				<displayName>Myanmar Kyat</displayName>
+				<displayName count="one">Myanmar kyat</displayName>
+				<displayName count="other">Myanmar kyats</displayName>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongolian Tugrik</displayName>
@@ -3487,14 +4242,14 @@
 				<displayName count="other">Mexican pesos</displayName>
 			</currency>
 			<currency type="MXP">
-				<displayName>Mexican Silver Peso (1861-1992)</displayName>
-				<displayName count="one">Mexican silver peso (MXP)</displayName>
-				<displayName count="other">Mexican silver pesos (MXP)</displayName>
+				<displayName>Mexican Silver Peso (1861–1992)</displayName>
+				<displayName count="one">Mexican silver peso (1861–1992)</displayName>
+				<displayName count="other">Mexican silver pesos (1861–1992)</displayName>
 			</currency>
 			<currency type="MXV">
-				<displayName>Mexican Unidad de Inversion (UDI)</displayName>
-				<displayName count="one">Mexican unidad de inversion (UDI)</displayName>
-				<displayName count="other">Mexican unidads de inversion (UDI)</displayName>
+				<displayName>Mexican Investment Unit</displayName>
+				<displayName count="one">Mexican investment unit</displayName>
+				<displayName count="other">Mexican investment units</displayName>
 			</currency>
 			<currency type="MYR">
 				<displayName>Malaysian Ringgit</displayName>
@@ -3507,9 +4262,9 @@
 				<displayName count="other">Mozambican escudos</displayName>
 			</currency>
 			<currency type="MZM">
-				<displayName>Old Mozambican Metical</displayName>
-				<displayName count="one">Old Mozambican metical</displayName>
-				<displayName count="other">Old Mozambican meticals</displayName>
+				<displayName>Mozambican Metical (1980–2006)</displayName>
+				<displayName count="one">Mozambican metical (1980–2006)</displayName>
+				<displayName count="other">Mozambican meticals (1980–2006)</displayName>
 			</currency>
 			<currency type="MZN">
 				<displayName>Mozambican Metical</displayName>
@@ -3527,14 +4282,14 @@
 				<displayName count="other">Nigerian nairas</displayName>
 			</currency>
 			<currency type="NIC">
-				<displayName>Nicaraguan Cordoba</displayName>
-				<displayName count="one">Nicaraguan cordoba</displayName>
-				<displayName count="other">Nicaraguan cordobas</displayName>
+				<displayName>Nicaraguan Córdoba (1988–1991)</displayName>
+				<displayName count="one">Nicaraguan córdoba (1988–1991)</displayName>
+				<displayName count="other">Nicaraguan córdobas (1988–1991)</displayName>
 			</currency>
 			<currency type="NIO">
-				<displayName>Nicaraguan Cordoba Oro</displayName>
-				<displayName count="one">Nicaraguan cordoba oro</displayName>
-				<displayName count="other">Nicaraguan cordobas oro</displayName>
+				<displayName>Nicaraguan Córdoba</displayName>
+				<displayName count="one">Nicaraguan córdoba</displayName>
+				<displayName count="other">Nicaraguan córdobas</displayName>
 			</currency>
 			<currency type="NLG">
 				<displayName>Dutch Guilder</displayName>
@@ -3577,9 +4332,9 @@
 				<displayName count="other">Peruvian nuevos soles</displayName>
 			</currency>
 			<currency type="PES">
-				<displayName>Peruvian Sol</displayName>
-				<displayName count="one">Peruvian sol</displayName>
-				<displayName count="other">Peruvian soles</displayName>
+				<displayName>Peruvian Sol (1863–1965)</displayName>
+				<displayName count="one">Peruvian sol (1863–1965)</displayName>
+				<displayName count="other">Peruvian soles (1863–1965)</displayName>
 			</currency>
 			<currency type="PGK">
 				<displayName>Papua New Guinean Kina</displayName>
@@ -3602,7 +4357,7 @@
 				<displayName count="other">Polish zlotys</displayName>
 			</currency>
 			<currency type="PLZ">
-				<displayName>Polish Zloty (1950-1995)</displayName>
+				<displayName>Polish Zloty (1950–1995)</displayName>
 				<displayName count="one">Polish zloty (PLZ)</displayName>
 				<displayName count="other">Polish zlotys (PLZ)</displayName>
 			</currency>
@@ -3627,9 +4382,9 @@
 				<displayName count="other">Rhodesian dollars</displayName>
 			</currency>
 			<currency type="ROL">
-				<displayName>Old Romanian Leu</displayName>
-				<displayName count="one">Old Romanian leu</displayName>
-				<displayName count="other">Old Romanian Lei</displayName>
+				<displayName>Romanian Leu (1952–2006)</displayName>
+				<displayName count="one">Romanian leu (1952–2006)</displayName>
+				<displayName count="other">Romanian Lei (1952–2006)</displayName>
 			</currency>
 			<currency type="RON">
 				<displayName>Romanian Leu</displayName>
@@ -3647,9 +4402,9 @@
 				<displayName count="other">Russian rubles</displayName>
 			</currency>
 			<currency type="RUR">
-				<displayName>Russian Ruble (1991-1998)</displayName>
-				<displayName count="one">Russian ruble (RUR)</displayName>
-				<displayName count="other">Russian rubles (RUR)</displayName>
+				<displayName>Russian Ruble (1991–1998)</displayName>
+				<displayName count="one">Russian ruble (1991–1998)</displayName>
+				<displayName count="other">Russian rubles (1991–1998)</displayName>
 			</currency>
 			<currency type="RWF">
 				<displayName>Rwandan Franc</displayName>
@@ -3672,9 +4427,9 @@
 				<displayName count="other">Seychellois rupees</displayName>
 			</currency>
 			<currency type="SDD">
-				<displayName>Old Sudanese Dinar</displayName>
-				<displayName count="one">Old Sudanese dinar</displayName>
-				<displayName count="other">Old Sudanese dinars</displayName>
+				<displayName>Sudanese Dinar (1992–2007)</displayName>
+				<displayName count="one">Sudanese dinar (1992–2007)</displayName>
+				<displayName count="other">Sudanese dinars (1992–2007)</displayName>
 			</currency>
 			<currency type="SDG">
 				<displayName>Sudanese Pound</displayName>
@@ -3682,9 +4437,9 @@
 				<displayName count="other">Sudanese pounds</displayName>
 			</currency>
 			<currency type="SDP">
-				<displayName>Old Sudanese Pound</displayName>
-				<displayName count="one">Old Sudanese pound</displayName>
-				<displayName count="other">Old Sudanese pounds</displayName>
+				<displayName>Sudanese Pound (1957–1998)</displayName>
+				<displayName count="one">Sudanese pound (1957–1998)</displayName>
+				<displayName count="other">Sudanese pounds (1957–1998)</displayName>
 			</currency>
 			<currency type="SEK">
 				<displayName>Swedish Krona</displayName>
@@ -3727,9 +4482,14 @@
 				<displayName count="other">Surinamese dollars</displayName>
 			</currency>
 			<currency type="SRG">
-				<displayName>Suriname Guilder</displayName>
-				<displayName count="one">Suriname guilder</displayName>
-				<displayName count="other">Suriname guilders</displayName>
+				<displayName>Surinamese Guilder</displayName>
+				<displayName count="one">Surinamese guilder</displayName>
+				<displayName count="other">Surinamese guilders</displayName>
+			</currency>
+			<currency type="SSP">
+				<displayName>South Sudanese Pound</displayName>
+				<displayName count="one">South Sudanese pound</displayName>
+				<displayName count="other">South Sudanese pounds</displayName>
 			</currency>
 			<currency type="STD">
 				<displayName>São Tomé and Príncipe Dobra</displayName>
@@ -3772,15 +4532,15 @@
 				<displayName count="other">Tajikistani somonis</displayName>
 			</currency>
 			<currency type="TMM">
+				<displayName>Turkmenistani Manat (1993–2009)</displayName>
+				<displayName count="one">Turkmenistani manat (1993–2009)</displayName>
+				<displayName count="other">Turkmenistani manat (1993–2009)</displayName>
+			</currency>
+			<currency type="TMT">
 				<displayName>Turkmenistani Manat</displayName>
 				<displayName count="one">Turkmenistani manat</displayName>
 				<displayName count="other">Turkmenistani manat</displayName>
 			</currency>
-			<currency type="TMT">
-				<displayName>Turkmenistani New Manat</displayName>
-				<displayName count="one">Turkmenistani new manat</displayName>
-				<displayName count="other">Turkmenistani new manat</displayName>
-			</currency>
 			<currency type="TND">
 				<displayName>Tunisian Dinar</displayName>
 				<displayName count="one">Tunisian dinar</displayName>
@@ -3797,9 +4557,9 @@
 				<displayName count="other">Timorese escudos</displayName>
 			</currency>
 			<currency type="TRL">
-				<displayName>Old Turkish Lira</displayName>
-				<displayName count="one">old Turkish lira</displayName>
-				<displayName count="other">Old Turkish Lira</displayName>
+				<displayName>Turkish Lira (1922–2005)</displayName>
+				<displayName count="one">Turkish lira (1922–2005)</displayName>
+				<displayName count="other">Turkish Lira (1922–2005)</displayName>
 			</currency>
 			<currency type="TRY">
 				<displayName>Turkish Lira</displayName>
@@ -3832,9 +4592,9 @@
 				<displayName count="other">Ukrainian karbovantsiv</displayName>
 			</currency>
 			<currency type="UGS">
-				<displayName>Ugandan Shilling (1966-1987)</displayName>
-				<displayName count="one">Ugandan shilling (UGS)</displayName>
-				<displayName count="other">Ugandan shillings (UGS)</displayName>
+				<displayName>Ugandan Shilling (1966–1987)</displayName>
+				<displayName count="one">Ugandan shilling (1966–1987)</displayName>
+				<displayName count="other">Ugandan shillings (1966–1987)</displayName>
 			</currency>
 			<currency type="UGX">
 				<displayName>Ugandan Shilling</displayName>
@@ -3858,14 +4618,14 @@
 				<displayName count="other">US dollars (same day)</displayName>
 			</currency>
 			<currency type="UYI">
-				<displayName>Uruguayan Peso en Unidades Indexadas</displayName>
-				<displayName count="one">Uruguayan peso en unidades indexadas</displayName>
-				<displayName count="other">Uruguayan pesos en unidades indexadas</displayName>
+				<displayName>Uruguayan Peso (Indexed Units)</displayName>
+				<displayName count="one">Uruguayan peso (indexed units)</displayName>
+				<displayName count="other">Uruguayan pesos (indexed units)</displayName>
 			</currency>
 			<currency type="UYP">
-				<displayName>Uruguayan Peso (1975-1993)</displayName>
-				<displayName count="one">Uruguayan peso (UYP)</displayName>
-				<displayName count="other">Uruguayan pesos (UYP)</displayName>
+				<displayName>Uruguayan Peso (1975–1993)</displayName>
+				<displayName count="one">Uruguayan peso (1975–1993)</displayName>
+				<displayName count="other">Uruguayan pesos (1975–1993)</displayName>
 			</currency>
 			<currency type="UYU">
 				<displayName>Uruguayan Peso</displayName>
@@ -3878,24 +4638,24 @@
 				<displayName count="other">Uzbekistan som</displayName>
 			</currency>
 			<currency type="VEB">
+				<displayName>Venezuelan Bolívar (1871–2008)</displayName>
+				<displayName count="one">Venezuelan bolívar (1871–2008)</displayName>
+				<displayName count="other">Venezuelan bolívars (1871–2008)</displayName>
+			</currency>
+			<currency type="VEF">
 				<displayName>Venezuelan Bolívar</displayName>
 				<displayName count="one">Venezuelan bolívar</displayName>
 				<displayName count="other">Venezuelan bolívars</displayName>
 			</currency>
-			<currency type="VEF">
-				<displayName>Venezuelan Bolívar Fuerte</displayName>
-				<displayName count="one">Venezuelan bolívar fuerte</displayName>
-				<displayName count="other">Venezuelan bolívars fuertes</displayName>
-			</currency>
 			<currency type="VND">
 				<displayName>Vietnamese Dong</displayName>
 				<displayName count="one">Vietnamese dong</displayName>
 				<displayName count="other">Vietnamese dong</displayName>
 			</currency>
 			<currency type="VNN">
-				<displayName>Old Vietnamese Dong</displayName>
-				<displayName count="one">Old Vietnamese dong</displayName>
-				<displayName count="other">Old Vietnamese dong</displayName>
+				<displayName>Vietnamese Dong (1978–1985)</displayName>
+				<displayName count="one">Vietnamese dong (1978–1985)</displayName>
+				<displayName count="other">Vietnamese dong (1978–1985)</displayName>
 			</currency>
 			<currency type="VUV">
 				<displayName>Vanuatu Vatu</displayName>
@@ -3914,11 +4674,13 @@
 			</currency>
 			<currency type="XAG">
 				<displayName>Silver</displayName>
-				<displayName count="one">Silver</displayName>
+				<displayName count="one">troy ounce of silver</displayName>
+				<displayName count="other">troy ounces of silver</displayName>
 			</currency>
 			<currency type="XAU">
 				<displayName>Gold</displayName>
-				<displayName count="one">Gold</displayName>
+				<displayName count="one">troy ounce of gold</displayName>
+				<displayName count="other">troy ounces of gold</displayName>
 			</currency>
 			<currency type="XBA">
 				<displayName>European Composite Unit</displayName>
@@ -3972,7 +4734,8 @@
 			</currency>
 			<currency type="XPD">
 				<displayName>Palladium</displayName>
-				<displayName count="one">Palladium</displayName>
+				<displayName count="one">troy ounce of palladium</displayName>
+				<displayName count="other">troy ounces of palladium</displayName>
 			</currency>
 			<currency type="XPF">
 				<displayName>CFP Franc</displayName>
@@ -3981,19 +4744,33 @@
 			</currency>
 			<currency type="XPT">
 				<displayName>Platinum</displayName>
-				<displayName count="one">Platinum</displayName>
+				<displayName count="one">troy ounce of platinum</displayName>
+				<displayName count="other">troy ounces of platinum</displayName>
 			</currency>
 			<currency type="XRE">
 				<displayName>RINET Funds</displayName>
-				<displayName count="one">RINET Funds</displayName>
+				<displayName count="one">RINET Funds unit</displayName>
+				<displayName count="other">RINET Funds units</displayName>
+			</currency>
+			<currency type="XSU">
+				<displayName>Sucre</displayName>
+				<displayName count="one">Sucre</displayName>
+				<displayName count="other">Sucres</displayName>
 			</currency>
 			<currency type="XTS">
 				<displayName>Testing Currency Code</displayName>
-				<displayName count="one">Testing Currency Code</displayName>
+				<displayName count="one">Testing Currency unit</displayName>
+				<displayName count="other">Testing Currency units</displayName>
+			</currency>
+			<currency type="XUA">
+				<displayName>ADB Unit of Account</displayName>
+				<displayName count="one">ADB unit of account</displayName>
+				<displayName count="other">ADB units of account</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName>Unknown or Invalid Currency</displayName>
-				<displayName count="one">unknown/invalid currency</displayName>
+				<displayName>Unknown Currency</displayName>
+				<displayName count="one">(unknown unit of currency)</displayName>
+				<displayName count="other">(unknown currency)</displayName>
 			</currency>
 			<currency type="YDD">
 				<displayName>Yemeni Dinar</displayName>
@@ -4006,24 +4783,24 @@
 				<displayName count="other">Yemeni rials</displayName>
 			</currency>
 			<currency type="YUD">
-				<displayName>Yugoslavian Hard Dinar</displayName>
-				<displayName count="one">Yugoslavian hard dinar</displayName>
-				<displayName count="other">Yugoslavian hard dinars</displayName>
+				<displayName>Yugoslavian Hard Dinar (1966–1990)</displayName>
+				<displayName count="one">Yugoslavian hard dinar (1966–1990)</displayName>
+				<displayName count="other">Yugoslavian hard dinars (1966–1990)</displayName>
 			</currency>
 			<currency type="YUM">
-				<displayName>Yugoslavian Noviy Dinar</displayName>
-				<displayName count="one">Yugoslavian noviy dinar</displayName>
-				<displayName count="other">Yugoslavian Noviy dinars</displayName>
+				<displayName>Yugoslavian New Dinar (1994–2002)</displayName>
+				<displayName count="one">Yugoslavian new dinar (1994–2002)</displayName>
+				<displayName count="other">Yugoslavian new dinars (1994–2002)</displayName>
 			</currency>
 			<currency type="YUN">
-				<displayName>Yugoslavian Convertible Dinar</displayName>
-				<displayName count="one">Yugoslavian convertible dinar</displayName>
-				<displayName count="other">Yugoslavian convertible dinars</displayName>
+				<displayName>Yugoslavian Convertible Dinar (1990–1992)</displayName>
+				<displayName count="one">Yugoslavian convertible dinar (1990–1992)</displayName>
+				<displayName count="other">Yugoslavian convertible dinars (1990–1992)</displayName>
 			</currency>
 			<currency type="YUR">
-				<displayName>Yugoslavian Reformed Dinar</displayName>
-				<displayName count="one">Yugoslavian reformed dinar</displayName>
-				<displayName count="other">Yugoslavian reformed dinars</displayName>
+				<displayName>Yugoslavian Reformed Dinar (1992–1993)</displayName>
+				<displayName count="one">Yugoslavian reformed dinar (1992–1993)</displayName>
+				<displayName count="other">Yugoslavian reformed dinars (1992–1993)</displayName>
 			</currency>
 			<currency type="ZAL">
 				<displayName>South African Rand (financial)</displayName>
@@ -4036,24 +4813,29 @@
 				<displayName count="other">South African rand</displayName>
 			</currency>
 			<currency type="ZMK">
+				<displayName>Zambian Kwacha (1968–2012)</displayName>
+				<displayName count="one">Zambian kwacha (1968–2012)</displayName>
+				<displayName count="other">Zambian kwachas (1968–2012)</displayName>
+			</currency>
+			<currency type="ZMW">
 				<displayName>Zambian Kwacha</displayName>
 				<displayName count="one">Zambian kwacha</displayName>
 				<displayName count="other">Zambian kwachas</displayName>
 			</currency>
 			<currency type="ZRN">
-				<displayName>Zairean New Zaire</displayName>
-				<displayName count="one">Zairean new zaire</displayName>
-				<displayName count="other">Zairean new zaires</displayName>
+				<displayName>Zairean New Zaire (1993–1998)</displayName>
+				<displayName count="one">Zairean new zaire (1993–1998)</displayName>
+				<displayName count="other">Zairean new zaires (1993–1998)</displayName>
 			</currency>
 			<currency type="ZRZ">
-				<displayName>Zairean Zaire</displayName>
-				<displayName count="one">Zairean zaire</displayName>
-				<displayName count="other">Zairean zaires</displayName>
+				<displayName>Zairean Zaire (1971–1993)</displayName>
+				<displayName count="one">Zairean zaire (1971–1993)</displayName>
+				<displayName count="other">Zairean zaires (1971–1993)</displayName>
 			</currency>
 			<currency type="ZWD">
-				<displayName>Zimbabwean Dollar</displayName>
-				<displayName count="one">Zimbabwean dollar</displayName>
-				<displayName count="other">Zimbabwean dollars</displayName>
+				<displayName>Zimbabwean Dollar (1980–2008)</displayName>
+				<displayName count="one">Zimbabwean dollar (1980–2008)</displayName>
+				<displayName count="other">Zimbabwean dollars (1980–2008)</displayName>
 			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabwean Dollar (2009)</displayName>
@@ -4066,37 +4848,594 @@
 				<displayName count="other">Zimbabwean dollars (2008)</displayName>
 			</currency>
 		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
 	</numbers>
 	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} day</unitPattern>
-			<unitPattern count="other">{0} days</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} hour</unitPattern>
-			<unitPattern count="other">{0} hours</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minute</unitPattern>
-			<unitPattern count="other">{0} minutes</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} month</unitPattern>
-			<unitPattern count="other">{0} months</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} second</unitPattern>
-			<unitPattern count="other">{0} seconds</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} week</unitPattern>
-			<unitPattern count="other">{0} weeks</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} year</unitPattern>
-			<unitPattern count="other">{0} years</unitPattern>
-		</unit>
+		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<unitPattern count="one">{0} g-force</unitPattern>
+				<unitPattern count="other">{0} g-force</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<unitPattern count="one">{0} arcminute</unitPattern>
+				<unitPattern count="other">{0} arcminutes</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<unitPattern count="one">{0} arcsecond</unitPattern>
+				<unitPattern count="other">{0} arcseconds</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0} degree</unitPattern>
+				<unitPattern count="other">{0} degrees</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="one">{0} hectare</unitPattern>
+				<unitPattern count="other">{0} hectares</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} square foot</unitPattern>
+				<unitPattern count="other">{0} square feet</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} square kilometer</unitPattern>
+				<unitPattern count="other">{0} square kilometers</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0} square meter</unitPattern>
+				<unitPattern count="other">{0} square meters</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0} square mile</unitPattern>
+				<unitPattern count="other">{0} square miles</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<unitPattern count="one">{0} day</unitPattern>
+				<unitPattern count="other">{0} days</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="one">{0} hour</unitPattern>
+				<unitPattern count="other">{0} hours</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<unitPattern count="one">{0} millisecond</unitPattern>
+				<unitPattern count="other">{0} milliseconds</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<unitPattern count="one">{0} minute</unitPattern>
+				<unitPattern count="other">{0} minutes</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one">{0} month</unitPattern>
+				<unitPattern count="other">{0} months</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<unitPattern count="one">{0} second</unitPattern>
+				<unitPattern count="other">{0} seconds</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one">{0} week</unitPattern>
+				<unitPattern count="other">{0} weeks</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one">{0} year</unitPattern>
+				<unitPattern count="other">{0} years</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<unitPattern count="one">{0} centimeter</unitPattern>
+				<unitPattern count="other">{0} centimeters</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} foot</unitPattern>
+				<unitPattern count="other">{0} feet</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} inch</unitPattern>
+				<unitPattern count="other">{0} inches</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="other">{0} kilometers</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} light year</unitPattern>
+				<unitPattern count="other">{0} light years</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="other">{0} meters</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mile</unitPattern>
+				<unitPattern count="other">{0} miles</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<unitPattern count="one">{0} millimeter</unitPattern>
+				<unitPattern count="other">{0} millimeters</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0} picometer</unitPattern>
+				<unitPattern count="other">{0} picometers</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0} yard</unitPattern>
+				<unitPattern count="other">{0} yards</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} grams</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilograms</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} ounce</unitPattern>
+				<unitPattern count="other">{0} ounces</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} pound</unitPattern>
+				<unitPattern count="other">{0} pounds</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} horsepower</unitPattern>
+				<unitPattern count="other">{0} horsepower</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatts</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="one">{0} watt</unitPattern>
+				<unitPattern count="other">{0} watts</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="one">{0} hectopascal</unitPattern>
+				<unitPattern count="other">{0} hectopascals</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="one">{0} inch of mercury</unitPattern>
+				<unitPattern count="other">{0} inches of mercury</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibars</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<unitPattern count="one">{0} kilometer per hour</unitPattern>
+				<unitPattern count="other">{0} kilometers per hour</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0} meter per second</unitPattern>
+				<unitPattern count="other">{0} meters per second</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0} mile per hour</unitPattern>
+				<unitPattern count="other">{0} miles per hour</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<unitPattern count="one">{0} degree Celsius</unitPattern>
+				<unitPattern count="other">{0} degrees Celsius</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<unitPattern count="one">{0} degree Fahrenheit</unitPattern>
+				<unitPattern count="other">{0} degrees Fahrenheit</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0} cubic kilometer</unitPattern>
+				<unitPattern count="other">{0} cubic kilometers</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="one">{0} cubic mile</unitPattern>
+				<unitPattern count="other">{0} cubic miles</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="one">{0} liter</unitPattern>
+				<unitPattern count="other">{0} liters</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<unitPattern count="one">{0} G</unitPattern>
+				<unitPattern count="other">{0} G</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<unitPattern count="one">{0} arcmin</unitPattern>
+				<unitPattern count="other">{0} arcmin</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<unitPattern count="one">{0} arcsec</unitPattern>
+				<unitPattern count="other">{0} arcsecs</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0} deg</unitPattern>
+				<unitPattern count="other">{0} deg</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} sq ft</unitPattern>
+				<unitPattern count="other">{0} sq ft</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0} sq mi</unitPattern>
+				<unitPattern count="other">{0} sq mi</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<unitPattern count="one">{0} day</unitPattern>
+				<unitPattern count="other">{0} days</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="one">{0} hr</unitPattern>
+				<unitPattern count="other">{0} hrs</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} mins</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one">{0} mth</unitPattern>
+				<unitPattern count="other">{0} mths</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<unitPattern count="one">{0} sec</unitPattern>
+				<unitPattern count="other">{0} secs</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one">{0} wk</unitPattern>
+				<unitPattern count="other">{0} wks</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one">{0} yr</unitPattern>
+				<unitPattern count="other">{0} yrs</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<unitPattern count="one">{0} kph</unitPattern>
+				<unitPattern count="other">{0} kph</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0} mph</unitPattern>
+				<unitPattern count="other">{0} mph</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="acceleration-g-force">
+				<unitPattern count="one">{0}G</unitPattern>
+				<unitPattern count="other">{0}Gs</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="one">{0}ha</unitPattern>
+				<unitPattern count="other">{0}ha</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<unitPattern count="one">{0}d</unitPattern>
+				<unitPattern count="other">{0}d</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="one">{0}h</unitPattern>
+				<unitPattern count="other">{0}h</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<unitPattern count="one">{0}s</unitPattern>
+				<unitPattern count="other">{0}s</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one">{0}w</unitPattern>
+				<unitPattern count="other">{0}w</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one">{0}y</unitPattern>
+				<unitPattern count="other">{0}y</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}ly</unitPattern>
+				<unitPattern count="other">{0}ly</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<unitPattern count="one">{0}mm</unitPattern>
+				<unitPattern count="other">{0}mm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0}pm</unitPattern>
+				<unitPattern count="other">{0}pm</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0}yd</unitPattern>
+				<unitPattern count="other">{0}yd</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0}#</unitPattern>
+				<unitPattern count="other">{0}#</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="one">{0}kW</unitPattern>
+				<unitPattern count="other">{0}kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="one">{0}W</unitPattern>
+				<unitPattern count="other">{0}W</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="one">{0}hPa</unitPattern>
+				<unitPattern count="other">{0}hPa</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="one">{0}&quot; Hg</unitPattern>
+				<unitPattern count="other">{0}&quot; Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one">{0}mb</unitPattern>
+				<unitPattern count="other">{0}mb</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<unitPattern count="one">{0}kph</unitPattern>
+				<unitPattern count="other">{0}kph</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0}m/s</unitPattern>
+				<unitPattern count="other">{0}m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0}mph</unitPattern>
+				<unitPattern count="other">{0}mph</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0}km³</unitPattern>
+				<unitPattern count="other">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="one">{0}mi³</unitPattern>
+				<unitPattern count="other">{0}mi³</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
+			</unit>
+		</unitLength>
 	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, and {1}</listPatternPart>
+			<listPatternPart type="2">{0} and {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
 	<posix>
 		<messages>
 			<yesstr>yes:y</yesstr>