--- a/web/lib/Zend/Locale/Data/fi.xml	Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Locale/Data/fi.xml	Thu May 07 15:16:02 2015 +0200
@@ -1,89 +1,94 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2013 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
 <ldml>
 	<identity>
-		<version number="$Revision: 1.137 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
+		<version number="$Revision: 9852 $"/>
+		<generation date="$Date: 2014-02-28 23:57:43 -0600 (Fri, 28 Feb 2014) $"/>
 		<language type="fi"/>
 	</identity>
 	<localeDisplayNames>
 		<localeDisplayPattern>
 			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
 			<language type="aa">afar</language>
 			<language type="ab">abhaasi</language>
-			<language type="ace">aceh</language>
+			<language type="ace">atšeh</language>
 			<language type="ach">atšoli</language>
 			<language type="ada">adangme</language>
 			<language type="ady">adyge</language>
 			<language type="ae">avesta</language>
 			<language type="af">afrikaans</language>
-			<language type="afa">afro-aasialainen kieli</language>
 			<language type="afh">afrihili</language>
+			<language type="agq">aghem</language>
 			<language type="ain">ainu</language>
 			<language type="ak">akan</language>
 			<language type="akk">akkadi</language>
 			<language type="ale">aleutti</language>
-			<language type="alg">algonkin-kieli</language>
 			<language type="alt">altai</language>
 			<language type="am">amhara</language>
 			<language type="an">aragonia</language>
 			<language type="ang">muinaisenglanti</language>
 			<language type="anp">angika</language>
-			<language type="apa">apaššikieli</language>
 			<language type="ar">arabia</language>
-			<language type="arc">aramea</language>
-			<language type="arn">araukaani</language>
+			<language type="ar_001">yleisarabia</language>
+			<language type="arc">valtakunnanaramea</language>
+			<language type="arn">mapudungun</language>
 			<language type="arp">arapaho</language>
-			<language type="art">keinotekoinen kieli</language>
 			<language type="arw">arawak</language>
 			<language type="as">assami</language>
+			<language type="asa">asu</language>
 			<language type="ast">asturia</language>
-			<language type="ath">athabasca-kieli</language>
-			<language type="aus">australialainen kieli</language>
 			<language type="av">avaari</language>
 			<language type="awa">awadhi</language>
 			<language type="ay">aimara</language>
 			<language type="az">azeri</language>
+			<language type="az" alt="short">azeri</language>
 			<language type="ba">baškiiri</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamileke-kieli</language>
 			<language type="bal">belutši</language>
 			<language type="ban">bali</language>
-			<language type="bas">basa</language>
-			<language type="bat">balttilainen kieli</language>
+			<language type="bas">basaa</language>
+			<language type="bax">bamum</language>
+			<language type="bbj">ghomala</language>
 			<language type="be">valkovenäjä</language>
 			<language type="bej">bedža</language>
 			<language type="bem">bemba</language>
-			<language type="ber">berberikieli</language>
+			<language type="bez">bena</language>
+			<language type="bfd">fut</language>
 			<language type="bg">bulgaria</language>
-			<language type="bh">bihari</language>
 			<language type="bho">bhodžpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
 			<language type="bin">bini</language>
-			<language type="bla">mustajalka</language>
+			<language type="bkm">kom</language>
+			<language type="bla">siksika</language>
 			<language type="bm">bambara</language>
 			<language type="bn">bengali</language>
-			<language type="bnt">bantukieli</language>
 			<language type="bo">tiibet</language>
 			<language type="br">bretoni</language>
 			<language type="bra">bradž</language>
+			<language type="brx">bodo</language>
 			<language type="bs">bosnia</language>
-			<language type="btk">batak</language>
+			<language type="bss">koose</language>
 			<language type="bua">burjaatti</language>
 			<language type="bug">bugi</language>
+			<language type="bum">bulu</language>
 			<language type="byn">bilin</language>
+			<language type="byv">medumba</language>
 			<language type="ca">katalaani</language>
 			<language type="cad">caddo</language>
-			<language type="cai">keskiamerikkalainen intiaanikieli</language>
 			<language type="car">karibi</language>
-			<language type="cau">kaukasialainen kieli</language>
+			<language type="cay">cayuga</language>
 			<language type="cch">atsam</language>
 			<language type="ce">tšetšeeni</language>
 			<language type="ceb">cebuano</language>
-			<language type="cel">kelttiläinen kieli</language>
+			<language type="cgg">kiga</language>
 			<language type="ch">tšamorro</language>
 			<language type="chb">tšibtša</language>
 			<language type="chg">tšagatai</language>
@@ -94,25 +99,21 @@
 			<language type="chp">chipewyan</language>
 			<language type="chr">cherokee</language>
 			<language type="chy">cheyenne</language>
-			<language type="cmc">tšam-kieli</language>
+			<language type="ckb">sorani</language>
 			<language type="co">korsika</language>
 			<language type="cop">kopti</language>
-			<language type="cpe">englantiin perustuva kreoli- tai pidgin-kieli</language>
-			<language type="cpf">ranskaan perustuva kreoli- tai pidgin-kieli</language>
-			<language type="cpp">portugaliin perustuva kreoli- tai pidgin-kieli</language>
 			<language type="cr">cree</language>
 			<language type="crh">krimintataari</language>
-			<language type="crp">kreoli- tai pidgin-kieli</language>
+			<language type="crh" alt="secondary">kriminturkki</language>
 			<language type="cs">tšekki</language>
 			<language type="csb">kašubi</language>
 			<language type="cu">kirkkoslaavi</language>
-			<language type="cus">kuušilainen kieli</language>
 			<language type="cv">tšuvassi</language>
 			<language type="cy">kymri</language>
 			<language type="da">tanska</language>
 			<language type="dak">dakota</language>
 			<language type="dar">dargi</language>
-			<language type="day">dajakki</language>
+			<language type="dav">taita</language>
 			<language type="de">saksa</language>
 			<language type="de_AT">itävallansaksa</language>
 			<language type="de_CH">sveitsinyläsaksa</language>
@@ -120,14 +121,17 @@
 			<language type="den">slevi</language>
 			<language type="dgr">dogrib</language>
 			<language type="din">dinka</language>
+			<language type="dje">djerma</language>
 			<language type="doi">dogri</language>
-			<language type="dra">dravidakieli</language>
 			<language type="dsb">alasorbi</language>
 			<language type="dua">duala</language>
 			<language type="dum">keskihollanti</language>
 			<language type="dv">divehi</language>
+			<language type="dyo">jola-fonyi</language>
 			<language type="dyu">djula</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">muinaisegypti</language>
@@ -138,22 +142,25 @@
 			<language type="en_AU">australianenglanti</language>
 			<language type="en_CA">kanadanenglanti</language>
 			<language type="en_GB">britannianenglanti</language>
+			<language type="en_GB" alt="short">englanti (Britannia)</language>
 			<language type="en_US">amerikanenglanti</language>
+			<language type="en_US" alt="short">englanti (USA)</language>
 			<language type="enm">keskienglanti</language>
 			<language type="eo">esperanto</language>
 			<language type="es">espanja</language>
 			<language type="es_419">amerikanespanja</language>
 			<language type="es_ES">espanjanespanja</language>
+			<language type="es_MX">meksikonespanja</language>
 			<language type="et">viro</language>
 			<language type="eu">baski</language>
 			<language type="ewo">ewondo</language>
 			<language type="fa">farsi</language>
+			<language type="fa" alt="secondary">persia</language>
 			<language type="fan">fang</language>
 			<language type="fat">fanti</language>
 			<language type="ff">fulani</language>
 			<language type="fi">suomi</language>
 			<language type="fil">filipino</language>
-			<language type="fiu">suomalais-ugrilainen kieli</language>
 			<language type="fj">fidži</language>
 			<language type="fo">fääri</language>
 			<language type="fon">fon</language>
@@ -171,7 +178,6 @@
 			<language type="gay">gajo</language>
 			<language type="gba">gbaja</language>
 			<language type="gd">gaeli</language>
-			<language type="gem">germaaninen kieli</language>
 			<language type="gez">ge’ez</language>
 			<language type="gil">kiribati</language>
 			<language type="gl">galicia</language>
@@ -185,7 +191,8 @@
 			<language type="grc">muinaiskreikka</language>
 			<language type="gsw">sveitsinsaksa</language>
 			<language type="gu">gudžarati</language>
-			<language type="gv">manx</language>
+			<language type="guz">gusii</language>
+			<language type="gv">manksi</language>
 			<language type="gwi">gwitšin</language>
 			<language type="ha">hausa</language>
 			<language type="hai">haida</language>
@@ -193,7 +200,6 @@
 			<language type="he">heprea</language>
 			<language type="hi">hindi</language>
 			<language type="hil">hiligaino</language>
-			<language type="him">himatšali</language>
 			<language type="hit">heetti</language>
 			<language type="hmn">hmong</language>
 			<language type="ho">hiri-motu</language>
@@ -206,46 +212,49 @@
 			<language type="hz">herero</language>
 			<language type="ia">interlingua</language>
 			<language type="iba">iban</language>
+			<language type="ibb">ibibio</language>
 			<language type="id">indonesia</language>
 			<language type="ie">interlingue</language>
 			<language type="ig">igbo</language>
 			<language type="ii">sichuanin-yi</language>
-			<language type="ijo">idžo</language>
-			<language type="ik">inupiatun</language>
+			<language type="ik">inupiaq</language>
 			<language type="ilo">iloko</language>
-			<language type="inc">indoarjalainen kieli</language>
-			<language type="ine">indoeurooppalainen kieli</language>
 			<language type="inh">inguuši</language>
 			<language type="io">ido</language>
-			<language type="ira">iranilainen kieli</language>
-			<language type="iro">irokeesikieli</language>
 			<language type="is">islanti</language>
 			<language type="it">italia</language>
 			<language type="iu">inuktitut</language>
 			<language type="ja">japani</language>
 			<language type="jbo">lojban</language>
+			<language type="jgo">ngomba</language>
+			<language type="jmc">machame</language>
 			<language type="jpr">juutalaispersia</language>
 			<language type="jrb">juutalaisarabia</language>
 			<language type="jv">jaava</language>
 			<language type="ka">georgia</language>
 			<language type="kaa">karakalpakki</language>
 			<language type="kab">kabyyli</language>
-			<language type="kac">kachin</language>
+			<language type="kac">katšin</language>
 			<language type="kaj">jju</language>
 			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
 			<language type="kaw">kavi</language>
 			<language type="kbd">kabardi</language>
+			<language type="kbl">kanembu</language>
 			<language type="kcg">tyap</language>
+			<language type="kde">makonde</language>
+			<language type="kea">kapverdenkreoli</language>
 			<language type="kfo">norsunluurannikonkoro</language>
 			<language type="kg">kongo</language>
 			<language type="kha">khasi</language>
-			<language type="khi">khoisan-kieli</language>
 			<language type="kho">khotani</language>
+			<language type="khq">koyra chiini</language>
 			<language type="ki">kikuju</language>
 			<language type="kj">kuanjama</language>
 			<language type="kk">kazakki</language>
+			<language type="kkj">kako</language>
 			<language type="kl">kalaallisut</language>
+			<language type="kl" alt="secondary">grönlanti</language>
+			<language type="kln">kalenjin</language>
 			<language type="km">khmer</language>
 			<language type="kmb">kimbundu</language>
 			<language type="kn">kannada</language>
@@ -256,9 +265,11 @@
 			<language type="kr">kanuri</language>
 			<language type="krc">karatšai-balkaari</language>
 			<language type="krl">karjala</language>
-			<language type="kro">kru-kieli</language>
 			<language type="kru">kurukh</language>
 			<language type="ks">kašmiri</language>
+			<language type="ksb">shambala</language>
+			<language type="ksf">bafia</language>
+			<language type="ksh">kölsch</language>
 			<language type="ku">kurdi</language>
 			<language type="kum">kumykki</language>
 			<language type="kut">kutenai</language>
@@ -267,6 +278,8 @@
 			<language type="ky">kirgiisi</language>
 			<language type="la">latina</language>
 			<language type="lad">ladino</language>
+			<language type="lad" alt="secondary">juutalaisespanja</language>
+			<language type="lag">lango</language>
 			<language type="lah">lahnda</language>
 			<language type="lam">lamba</language>
 			<language type="lb">luxemburg</language>
@@ -284,49 +297,50 @@
 			<language type="lun">lunda</language>
 			<language type="luo">luo</language>
 			<language type="lus">lusai</language>
+			<language type="luy">luhya</language>
 			<language type="lv">latvia</language>
 			<language type="mad">madura</language>
+			<language type="maf">mafa</language>
 			<language type="mag">magahi</language>
 			<language type="mai">maithili</language>
 			<language type="mak">makassar</language>
 			<language type="man">mandingo</language>
-			<language type="map">austronesialainen kieli</language>
 			<language type="mas">maasai</language>
+			<language type="mde">maba</language>
 			<language type="mdf">mokša</language>
 			<language type="mdr">mandar</language>
 			<language type="men">mende</language>
+			<language type="mer">meru</language>
+			<language type="mfe">morisyen</language>
 			<language type="mg">malagassi</language>
 			<language type="mga">keski-iiri</language>
+			<language type="mgh">makua-meetto</language>
+			<language type="mgo" draft="contributed">meta'</language>
 			<language type="mh">marshall</language>
 			<language type="mi">maori</language>
 			<language type="mic">micmac</language>
 			<language type="min">minangkabau</language>
-			<language type="mis">luokittelematon kieli</language>
 			<language type="mk">makedonia</language>
-			<language type="mkh">mon-khmer-kieli</language>
 			<language type="ml">malajalam</language>
 			<language type="mn">mongoli</language>
 			<language type="mnc">mantšu</language>
 			<language type="mni">manipuri</language>
-			<language type="mno">manobo-kieli</language>
-			<language type="mo">moldavia</language>
 			<language type="moh">mohawk</language>
 			<language type="mos">mossi</language>
 			<language type="mr">marathi</language>
 			<language type="ms">malaiji</language>
 			<language type="mt">malta</language>
+			<language type="mua">mundang</language>
 			<language type="mul">monia kieliä</language>
-			<language type="mun">mundakieli</language>
 			<language type="mus">creek</language>
 			<language type="mwl">mirandeesi</language>
 			<language type="mwr">marwari</language>
 			<language type="my">burma</language>
-			<language type="myn">maya-kieli</language>
+			<language type="mye">myene</language>
 			<language type="myv">ersä</language>
 			<language type="na">nauru</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">pohjoisamerikkalainen intiaanikieli</language>
 			<language type="nap">napoli</language>
+			<language type="naq">nama</language>
 			<language type="nb">norjan bokmål</language>
 			<language type="nd">pohjois-ndebele</language>
 			<language type="nds">alasaksa</language>
@@ -334,18 +348,19 @@
 			<language type="new">newari</language>
 			<language type="ng">ndonga</language>
 			<language type="nia">nias</language>
-			<language type="nic">nigeriläis-kongolainen kieli</language>
 			<language type="niu">niue</language>
 			<language type="nl">hollanti</language>
 			<language type="nl_BE">flaami</language>
+			<language type="nmg">kwasio</language>
 			<language type="nn">norjan nynorsk</language>
+			<language type="nnh">ngiemboon</language>
 			<language type="no">norja</language>
 			<language type="nog">nogai</language>
 			<language type="non">muinaisnorja</language>
 			<language type="nqo">n’ko</language>
 			<language type="nr">etelä-ndebele</language>
 			<language type="nso">pohjoissotho</language>
-			<language type="nub">nubialainen kieli</language>
+			<language type="nus">nuer</language>
 			<language type="nv">navajo</language>
 			<language type="nwc">klassinen newari</language>
 			<language type="ny">njandža</language>
@@ -360,21 +375,17 @@
 			<language type="os">osseetti</language>
 			<language type="osa">osage</language>
 			<language type="ota">osmani</language>
-			<language type="oto">otomi-kieli</language>
 			<language type="pa">pandžabi</language>
-			<language type="paa">papualaiskieli</language>
 			<language type="pag">pangasinan</language>
 			<language type="pal">pahlavi</language>
 			<language type="pam">pampanga</language>
 			<language type="pap">papiamentu</language>
 			<language type="pau">palau</language>
 			<language type="peo">muinaispersia</language>
-			<language type="phi">filippiiniläinen kieli</language>
 			<language type="phn">foinikia</language>
 			<language type="pi">paali</language>
 			<language type="pl">puola</language>
 			<language type="pon">pohnpei</language>
-			<language type="pra">prakrit-kieli</language>
 			<language type="pro">muinaisprovensaali</language>
 			<language type="ps">paštu</language>
 			<language type="pt">portugali</language>
@@ -387,42 +398,44 @@
 			<language type="rm">retoromaani</language>
 			<language type="rn">rundi</language>
 			<language type="ro">romania</language>
-			<language type="roa">romaaninen kieli</language>
+			<language type="ro_MD">moldova</language>
+			<language type="rof">rombo</language>
 			<language type="rom">romani</language>
 			<language type="root">juuri</language>
 			<language type="ru">venäjä</language>
 			<language type="rup">aromania</language>
 			<language type="rw">ruanda</language>
+			<language type="rwk">rwa</language>
 			<language type="sa">sanskrit</language>
 			<language type="sad">sandawe</language>
 			<language type="sah">jakuutti</language>
-			<language type="sai">eteläamerikkalainen intiaanikieli</language>
-			<language type="sal">sališilainen kieli</language>
 			<language type="sam">samarianaramea</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">sardi</language>
 			<language type="scn">sisilia</language>
 			<language type="sco">skotti</language>
 			<language type="sd">sindhi</language>
 			<language type="se">pohjoissaame</language>
+			<language type="see">seneca</language>
+			<language type="seh">sena</language>
 			<language type="sel">selkuppi</language>
-			<language type="sem">seemiläinen kieli</language>
+			<language type="ses">koyraboro senni</language>
 			<language type="sg">sango</language>
 			<language type="sga">muinaisiiri</language>
-			<language type="sgn">viittomakieli</language>
 			<language type="sh">serbokroaatti</language>
+			<language type="shi">tašelhit</language>
 			<language type="shn">shan</language>
-			<language type="si">sinhali</language>
+			<language type="shu">tšadinarabia</language>
+			<language type="si">sinhala</language>
 			<language type="sid">sidamo</language>
-			<language type="sio">sioux-kieli</language>
-			<language type="sit">sinotiibetiläinen kieli</language>
 			<language type="sk">slovakki</language>
 			<language type="sl">sloveeni</language>
-			<language type="sla">slaavilainen kieli</language>
 			<language type="sm">samoa</language>
 			<language type="sma">eteläsaame</language>
-			<language type="smi">saamelaiskieli</language>
 			<language type="smj">luulajansaame</language>
 			<language type="smn">inarinsaame</language>
 			<language type="sms">koltansaame</language>
@@ -430,13 +443,12 @@
 			<language type="snk">soninke</language>
 			<language type="so">somali</language>
 			<language type="sog">sogdi</language>
-			<language type="son">songhai</language>
 			<language type="sq">albania</language>
 			<language type="sr">serbia</language>
 			<language type="srn">sranan</language>
 			<language type="srr">serer</language>
 			<language type="ss">swazi</language>
-			<language type="ssa">niililäis-saharalainen kieli</language>
+			<language type="ssy">saho</language>
 			<language type="st">eteläsotho</language>
 			<language type="su">sunda</language>
 			<language type="suk">sukuma</language>
@@ -444,12 +456,14 @@
 			<language type="sux">sumeri</language>
 			<language type="sv">ruotsi</language>
 			<language type="sw">swahili</language>
+			<language type="swb">komori</language>
+			<language type="swc">kingwana</language>
 			<language type="syc">muinaissyyria</language>
 			<language type="syr">syyria</language>
-			<language type="ta">tamil</language>
-			<language type="tai">thaikieli</language>
+			<language type="ta">tamili</language>
 			<language type="te">telugu</language>
 			<language type="tem">temne</language>
+			<language type="teo">teso</language>
 			<language type="ter">tereno</language>
 			<language type="tet">tetum</language>
 			<language type="tg">tadžikki</language>
@@ -464,26 +478,27 @@
 			<language type="tli">tlingit</language>
 			<language type="tmh">tamašek</language>
 			<language type="tn">tswana</language>
-			<language type="to">tongantonga</language>
+			<language type="to">tonga</language>
 			<language type="tog">malawintonga</language>
 			<language type="tpi">tok-pisin</language>
 			<language type="tr">turkki</language>
+			<language type="trv">taroko</language>
 			<language type="ts">tsonga</language>
 			<language type="tsi">tsimši</language>
 			<language type="tt">tataari</language>
 			<language type="tum">tumbuka</language>
-			<language type="tup">tupi-kieli</language>
-			<language type="tut">altailainen kieli</language>
 			<language type="tvl">tuvalu</language>
 			<language type="tw">twi</language>
+			<language type="twq">tasawaq</language>
 			<language type="ty">tahiti</language>
 			<language type="tyv">tuva</language>
+			<language type="tzm">keskiatlaksentamazight</language>
 			<language type="udm">udmurtti</language>
 			<language type="ug">uiguuri</language>
 			<language type="uga">ugarit</language>
 			<language type="uk">ukraina</language>
-			<language type="umb">umbundu</language>
-			<language type="und">määrittämätön</language>
+			<language type="umb">mbundu</language>
+			<language type="und">määrittämätön kieli</language>
 			<language type="ur">urdu</language>
 			<language type="uz">uzbekki</language>
 			<language type="vai">vai</language>
@@ -491,39 +506,46 @@
 			<language type="vi">vietnam</language>
 			<language type="vo">volapük</language>
 			<language type="vot">vatja</language>
+			<language type="vun">vunjo</language>
 			<language type="wa">valloni</language>
-			<language type="wak">wakash-kieli</language>
-			<language type="wal">walamo</language>
+			<language type="wae">walser</language>
+			<language type="wal">wolaitta</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
-			<language type="wen">sorbin kieli</language>
 			<language type="wo">wolof</language>
 			<language type="xal">kalmukki</language>
 			<language type="xh">xhosa</language>
+			<language type="xog">soga</language>
 			<language type="yao">jao</language>
 			<language type="yap">japi</language>
+			<language type="yav">yangben</language>
+			<language type="ybb">yemba</language>
 			<language type="yi">jiddiš</language>
 			<language type="yo">joruba</language>
-			<language type="ypk">jupikkikieli</language>
+			<language type="yue">kantoninkiina</language>
 			<language type="za">zhuang</language>
-			<language type="zap">sapoteekki</language>
+			<language type="zap">zapoteekki</language>
 			<language type="zbl">blisskieli</language>
 			<language type="zen">zenaga</language>
+			<language type="zgh">vakioitu tamazight</language>
 			<language type="zh">kiina</language>
 			<language type="zh_Hans">yksinkertaistettu kiina</language>
 			<language type="zh_Hant">perinteinen kiina</language>
-			<language type="znd">zande</language>
 			<language type="zu">zulu</language>
 			<language type="zun">zuni</language>
 			<language type="zxx">ei kielellistä sisältöä</language>
 			<language type="zza">zaza</language>
 		</languages>
 		<scripts>
+			<script type="Afak">afaka</script>
 			<script type="Arab">arabialainen</script>
+			<script type="Arab" alt="variant">persialaisarabialainen</script>
 			<script type="Armi">valtakunnanaramealainen</script>
 			<script type="Armn">armenialainen</script>
 			<script type="Avst">avestalainen</script>
 			<script type="Bali">balilainen</script>
+			<script type="Bamu">bamum</script>
+			<script type="Bass">bassa</script>
 			<script type="Batk">batakilainen</script>
 			<script type="Beng">bengalilainen</script>
 			<script type="Blis">bliss-symbolit</script>
@@ -533,7 +555,7 @@
 			<script type="Bugi">bugilainen</script>
 			<script type="Buhd">buhidilainen</script>
 			<script type="Cakm">chakmalainen</script>
-			<script type="Cans">Kanadan alkuperäiskansojen yhtenäistetty tavukirjoitus</script>
+			<script type="Cans">kanadalaisten alkuperäiskansojen yhtenäistetty tavukirjoitus</script>
 			<script type="Cari">kaarialainen</script>
 			<script type="Cham">tšamilainen</script>
 			<script type="Cher">cherokeelainen</script>
@@ -544,14 +566,19 @@
 			<script type="Cyrs">kyrillinen muinaiskirkkoslaavimuunnelma</script>
 			<script type="Deva">devanagari</script>
 			<script type="Dsrt">deseret</script>
+			<script type="Dupl">Duployén pikakirjoitus</script>
 			<script type="Egyd">egyptiläinen demoottinen</script>
 			<script type="Egyh">egyptiläinen hieraattinen</script>
 			<script type="Egyp">egyptiläiset hieroglyfit</script>
 			<script type="Ethi">etiopialainen</script>
+			<script type="Ethi" alt="secondary">ge’ez</script>
 			<script type="Geok">muinaisgeorgialainen</script>
+			<script type="Geok" alt="secondary">khutsuri</script>
 			<script type="Geor">georgialainen</script>
+			<script type="Geor" alt="secondary">mkhedruli</script>
 			<script type="Glag">glagoliittinen</script>
 			<script type="Goth">goottilainen</script>
+			<script type="Gran">grantha</script>
 			<script type="Grek">kreikkalainen</script>
 			<script type="Gujr">gudžaratilainen</script>
 			<script type="Guru">gurmukhi</script>
@@ -559,9 +586,12 @@
 			<script type="Hani">kiinalainen han</script>
 			<script type="Hano">hanunoolainen</script>
 			<script type="Hans">kiinalainen yksinkertaistettu han</script>
+			<script type="Hans" alt="stand-alone">yksinkertaistettu han</script>
 			<script type="Hant">kiinalainen perinteinen han</script>
+			<script type="Hant" alt="stand-alone">perinteinen han</script>
 			<script type="Hebr">heprealainen</script>
 			<script type="Hira">hiragana</script>
+			<script type="Hluw">anatolialaiset hieroglyfit</script>
 			<script type="Hmng">pahawh hmong</script>
 			<script type="Hrkt">hiragana tai katakana</script>
 			<script type="Hung">muinaisunkarilainen</script>
@@ -569,12 +599,15 @@
 			<script type="Ital">muinaisitalialainen</script>
 			<script type="Java">jaavalainen</script>
 			<script type="Jpan">japanilainen</script>
+			<script type="Jurc">džurtšen</script>
 			<script type="Kali">kayah li</script>
 			<script type="Kana">katakana</script>
 			<script type="Khar">kharosthi</script>
 			<script type="Khmr">khmeriläinen</script>
+			<script type="Khoj">khojki</script>
 			<script type="Knda">kannadalainen</script>
 			<script type="Kore">korealainen</script>
+			<script type="Kpel">kpelle</script>
 			<script type="Kthi">kaithi</script>
 			<script type="Lana">lanna</script>
 			<script type="Laoo">laolainen</script>
@@ -585,23 +618,34 @@
 			<script type="Limb">limbulainen</script>
 			<script type="Lina">lineaari-A</script>
 			<script type="Linb">lineaari-B</script>
+			<script type="Lisu">Fraserin aakkoset</script>
+			<script type="Loma">loma</script>
 			<script type="Lyci">lyykialainen</script>
 			<script type="Lydi">lyydialainen</script>
 			<script type="Mand">mandealainen</script>
 			<script type="Mani">manikealainen</script>
 			<script type="Maya">maya-hieroglyfit</script>
+			<script type="Mend">mende</script>
+			<script type="Merc">meroiittinen kursiivikirjoitus</script>
 			<script type="Mero">meroiittinen</script>
 			<script type="Mlym">malajalamilainen</script>
 			<script type="Mong">mongolilainen</script>
 			<script type="Moon">moon-kohokirjoitus</script>
+			<script type="Mroo">mro</script>
 			<script type="Mtei">meitei</script>
+			<script type="Mtei" alt="secondary">meitei mayek</script>
 			<script type="Mymr">burmalainen</script>
+			<script type="Narb">muinaispohjoisarabialainen</script>
+			<script type="Nbat">nabatealainen</script>
+			<script type="Nkgb">naxi geba</script>
 			<script type="Nkoo">n'ko</script>
+			<script type="Nshu">nüshu</script>
 			<script type="Ogam">ogam</script>
 			<script type="Olck">ol chiki</script>
 			<script type="Orkh">orkhon</script>
 			<script type="Orya">orijalainen</script>
 			<script type="Osma">osmanjalainen</script>
+			<script type="Palm">palmyralainen</script>
 			<script type="Perm">muinaispermiläinen</script>
 			<script type="Phag">phags-pa</script>
 			<script type="Phli">piirtokirjoituspahlavilainen</script>
@@ -610,16 +654,19 @@
 			<script type="Phnx">foinikialainen</script>
 			<script type="Plrd">Pollardin foneettinen</script>
 			<script type="Prti">piirtokirjoitusparthialainen</script>
-			<script type="Qaai">peritty</script>
 			<script type="Rjng">rejang</script>
 			<script type="Roro">rongorongo</script>
 			<script type="Runr">riimukirjoitus</script>
 			<script type="Samr">samarianaramealainen</script>
 			<script type="Sara">sarati</script>
+			<script type="Sarb">muinaiseteläarabialainen</script>
 			<script type="Saur">saurashtra</script>
 			<script type="Sgnw">SignWriting</script>
 			<script type="Shaw">shaw’lainen</script>
+			<script type="Shrd">sarada</script>
+			<script type="Sind">khudabadi</script>
 			<script type="Sinh">sinhalilainen</script>
+			<script type="Sora">sorang sompeng</script>
 			<script type="Sund">sundalainen</script>
 			<script type="Sylo">syloti nagri</script>
 			<script type="Syrc">syyrialainen</script>
@@ -627,9 +674,11 @@
 			<script type="Syrj">syyrialainen läntinen muunnelma</script>
 			<script type="Syrn">syyrialainen itäinen muunnelma</script>
 			<script type="Tagb">tagbanwalainen</script>
+			<script type="Takr">takri</script>
 			<script type="Tale">tailelainen</script>
 			<script type="Talu">uusi tailuelainen</script>
 			<script type="Taml">tamililainen</script>
+			<script type="Tang">tangut</script>
 			<script type="Tavt">tai viet</script>
 			<script type="Telu">telugulainen</script>
 			<script type="Teng">tengwar</script>
@@ -638,17 +687,22 @@
 			<script type="Thaa">thaana</script>
 			<script type="Thai">thailainen</script>
 			<script type="Tibt">tiibetiläinen</script>
+			<script type="Tirh">tirhuta</script>
 			<script type="Ugar">ugaritilainen</script>
 			<script type="Vaii">vailainen</script>
 			<script type="Visp">näkyvä puhe</script>
+			<script type="Visp" alt="secondary">Visible Speech</script>
+			<script type="Wara">varang kshiti</script>
+			<script type="Wole">woleai</script>
 			<script type="Xpeo">muinaispersialainen</script>
 			<script type="Xsux">sumerilais-akkadilainen nuolenpääkirjoitus</script>
 			<script type="Yiii">yiläinen</script>
+			<script type="Zinh">peritty</script>
 			<script type="Zmth">matemaattinen</script>
 			<script type="Zsym">symbolit</script>
 			<script type="Zxxx">kirjoittamaton</script>
 			<script type="Zyyy">määrittämätön</script>
-			<script type="Zzzz">tuntematon tai virheellinen kirjoitusjärjestelmä</script>
+			<script type="Zzzz">tuntematon kirjoitusjärjestelmä</script>
 		</scripts>
 		<territories>
 			<territory type="001">maailma</territory>
@@ -669,11 +723,10 @@
 			<territory type="034">Etelä-Aasia</territory>
 			<territory type="035">Kaakkois-Aasia</territory>
 			<territory type="039">Etelä-Eurooppa</territory>
-			<territory type="053">Australia ja Uusi-Seelanti</territory>
+			<territory type="053">Australaasia</territory>
 			<territory type="054">Melanesia</territory>
 			<territory type="057">Mikronesia</territory>
 			<territory type="061">Polynesia</territory>
-			<territory type="062">Etelä- ja Keski-Aasia</territory>
 			<territory type="142">Aasia</territory>
 			<territory type="143">Keski-Aasia</territory>
 			<territory type="145">Länsi-Aasia</territory>
@@ -681,9 +734,8 @@
 			<territory type="151">Itä-Eurooppa</territory>
 			<territory type="154">Pohjois-Eurooppa</territory>
 			<territory type="155">Länsi-Eurooppa</territory>
-			<territory type="172">Itsenäisten valtioiden yhteisö</territory>
-			<territory type="419">Latinalainen Amerikka ja Karibia</territory>
-			<territory type="830">Kanaalisaaret</territory>
+			<territory type="419">Latinalainen Amerikka</territory>
+			<territory type="AC">Ascension-saari</territory>
 			<territory type="AD">Andorra</territory>
 			<territory type="AE">Arabiemiirikunnat</territory>
 			<territory type="AF">Afganistan</territory>
@@ -714,6 +766,7 @@
 			<territory type="BM">Bermuda</territory>
 			<territory type="BN">Brunei</territory>
 			<territory type="BO">Bolivia</territory>
+			<territory type="BQ">Karibian Alankomaat</territory>
 			<territory type="BR">Brasilia</territory>
 			<territory type="BS">Bahama</territory>
 			<territory type="BT">Bhutan</territory>
@@ -722,30 +775,36 @@
 			<territory type="BY">Valko-Venäjä</territory>
 			<territory type="BZ">Belize</territory>
 			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kookossaaret</territory>
-			<territory type="CD">Kongo-Kinshasa</territory>
+			<territory type="CC">Kookossaaret (Keelingsaaret)</territory>
+			<territory type="CD">Kongon demokraattinen tasavalta</territory>
+			<territory type="CD" alt="variant">Kongo-Kinshasa</territory>
 			<territory type="CF">Keski-Afrikan tasavalta</territory>
-			<territory type="CG">Kongo-Brazzaville</territory>
+			<territory type="CG">Kongon tasavalta</territory>
+			<territory type="CG" alt="variant">Kongo-Brazzaville</territory>
 			<territory type="CH">Sveitsi</territory>
 			<territory type="CI">Norsunluurannikko</territory>
+			<territory type="CI" alt="variant">Côte d'Ivoire</territory>
 			<territory type="CK">Cookinsaaret</territory>
 			<territory type="CL">Chile</territory>
 			<territory type="CM">Kamerun</territory>
 			<territory type="CN">Kiina</territory>
 			<territory type="CO">Kolumbia</territory>
+			<territory type="CP">Clippertoninsaari</territory>
 			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia ja Montenegro</territory>
 			<territory type="CU">Kuuba</territory>
 			<territory type="CV">Kap Verde</territory>
+			<territory type="CW">Curaçao</territory>
 			<territory type="CX">Joulusaari</territory>
 			<territory type="CY">Kypros</territory>
 			<territory type="CZ">Tšekki</territory>
 			<territory type="DE">Saksa</territory>
+			<territory type="DG">Diego Garcia</territory>
 			<territory type="DJ">Djibouti</territory>
 			<territory type="DK">Tanska</territory>
 			<territory type="DM">Dominica</territory>
 			<territory type="DO">Dominikaaninen tasavalta</territory>
 			<territory type="DZ">Algeria</territory>
+			<territory type="EA">Ceuta ja Melilla</territory>
 			<territory type="EC">Ecuador</territory>
 			<territory type="EE">Viro</territory>
 			<territory type="EG">Egypti</territory>
@@ -753,14 +812,17 @@
 			<territory type="ER">Eritrea</territory>
 			<territory type="ES">Espanja</territory>
 			<territory type="ET">Etiopia</territory>
+			<territory type="EU">Euroopan unioni</territory>
 			<territory type="FI">Suomi</territory>
 			<territory type="FJ">Fidži</territory>
 			<territory type="FK">Falklandinsaaret</territory>
+			<territory type="FK" alt="variant">Falklandinsaaret (Malvinassaaret)</territory>
 			<territory type="FM">Mikronesian liittovaltio</territory>
 			<territory type="FO">Färsaaret</territory>
 			<territory type="FR">Ranska</territory>
 			<territory type="GA">Gabon</territory>
-			<territory type="GB">Britannia</territory>
+			<territory type="GB">Yhdistynyt kuningaskunta</territory>
+			<territory type="GB" alt="short">Britannia</territory>
 			<territory type="GD">Grenada</territory>
 			<territory type="GE">Georgia</territory>
 			<territory type="GF">Ranskan Guayana</territory>
@@ -778,12 +840,14 @@
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Guinea-Bissau</territory>
 			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong – Kiinan erityishallintoalue</territory>
-			<territory type="HM">Heard- ja McDonaldinsaaret</territory>
+			<territory type="HK">Hongkong – Kiinan e.h.a.</territory>
+			<territory type="HK" alt="short">Hongkong</territory>
+			<territory type="HM">Heard ja McDonaldinsaaret</territory>
 			<territory type="HN">Honduras</territory>
 			<territory type="HR">Kroatia</territory>
 			<territory type="HT">Haiti</territory>
 			<territory type="HU">Unkari</territory>
+			<territory type="IC">Kanariansaaret</territory>
 			<territory type="ID">Indonesia</territory>
 			<territory type="IE">Irlanti</territory>
 			<territory type="IL">Israel</territory>
@@ -828,10 +892,12 @@
 			<territory type="MG">Madagaskar</territory>
 			<territory type="MH">Marshallinsaaret</territory>
 			<territory type="MK">Makedonia</territory>
+			<territory type="MK" alt="variant">EJT Makedonia</territory>
 			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
+			<territory type="MM">Myanmar (Burma)</territory>
 			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macao – Kiinan erityishallintoalue</territory>
+			<territory type="MO">Macao – Kiinan e.h.a.</territory>
+			<territory type="MO" alt="short">Macao</territory>
 			<territory type="MP">Pohjois-Mariaanit</territory>
 			<territory type="MQ">Martinique</territory>
 			<territory type="MR">Mauritania</territory>
@@ -866,13 +932,13 @@
 			<territory type="PM">Saint-Pierre ja Miquelon</territory>
 			<territory type="PN">Pitcairn</territory>
 			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestiina</territory>
+			<territory type="PS">Palestiinalaisalueet</territory>
+			<territory type="PS" alt="short">Palestiina</territory>
 			<territory type="PT">Portugali</territory>
 			<territory type="PW">Palau</territory>
 			<territory type="PY">Paraguay</territory>
 			<territory type="QA">Qatar</territory>
 			<territory type="QO">ulkomeri</territory>
-			<territory type="QU">Euroopan unioni</territory>
 			<territory type="RE">Réunion</territory>
 			<territory type="RO">Romania</territory>
 			<territory type="RS">Serbia</territory>
@@ -893,10 +959,13 @@
 			<territory type="SN">Senegal</territory>
 			<territory type="SO">Somalia</territory>
 			<territory type="SR">Surinam</territory>
+			<territory type="SS">Etelä-Sudan</territory>
 			<territory type="ST">São Tomé ja Príncipe</territory>
 			<territory type="SV">El Salvador</territory>
+			<territory type="SX">Sint Maarten</territory>
 			<territory type="SY">Syyria</territory>
 			<territory type="SZ">Swazimaa</territory>
+			<territory type="TA">Tristan da Cunha</territory>
 			<territory type="TC">Turks- ja Caicossaaret</territory>
 			<territory type="TD">Tšad</territory>
 			<territory type="TF">Ranskan ulkopuoliset eteläiset alueet</territory>
@@ -905,6 +974,7 @@
 			<territory type="TJ">Tadžikistan</territory>
 			<territory type="TK">Tokelau</territory>
 			<territory type="TL">Itä-Timor</territory>
+			<territory type="TL" alt="variant">Timor-Leste</territory>
 			<territory type="TM">Turkmenistan</territory>
 			<territory type="TN">Tunisia</territory>
 			<territory type="TO">Tonga</territory>
@@ -915,8 +985,9 @@
 			<territory type="TZ">Tansania</territory>
 			<territory type="UA">Ukraina</territory>
 			<territory type="UG">Uganda</territory>
-			<territory type="UM">Yhdysvaltain pienet erillissaaret</territory>
+			<territory type="UM">Yhdysvaltain erillissaaret</territory>
 			<territory type="US">Yhdysvallat</territory>
+			<territory type="US" alt="short">USA</territory>
 			<territory type="UY">Uruguay</territory>
 			<territory type="UZ">Uzbekistan</territory>
 			<territory type="VA">Vatikaani</territory>
@@ -928,12 +999,13 @@
 			<territory type="VU">Vanuatu</territory>
 			<territory type="WF">Wallis ja Futuna</territory>
 			<territory type="WS">Samoa</territory>
+			<territory type="XK">Kosovo</territory>
 			<territory type="YE">Jemen</territory>
 			<territory type="YT">Mayotte</territory>
 			<territory type="ZA">Etelä-Afrikka</territory>
 			<territory type="ZM">Sambia</territory>
 			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">tuntematon tai virheellinen alue</territory>
+			<territory type="ZZ">tuntematon alue</territory>
 		</territories>
 		<variants>
 			<variant type="1901">saksan perinteinen oikeinkirjoitus</variant>
@@ -942,59 +1014,204 @@
 			<variant type="1606NICT">myöhäiskeskiranska</variant>
 			<variant type="1694ACAD">varhaisnykyranska</variant>
 			<variant type="1959ACAD">valkovenäjän virallinen oikeinkirjoitus</variant>
+			<variant type="ALALC97">amerikkalainen kirjastolatinaistus 1997</variant>
+			<variant type="ALUKU">alukun kreolimurre</variant>
 			<variant type="AREVELA">itäarmenialainen</variant>
 			<variant type="AREVMDA">länsiarmenialainen</variant>
 			<variant type="BAKU1926">yhtenäistetty turkkilainen latinalainen aakkosto</variant>
+			<variant type="BAUDDHA">sanskriitin buddhalainen sekamuoto</variant>
+			<variant type="BISCAYAN">baskin biskajalaismurre</variant>
 			<variant type="BISKE">sloveenin resian San Giorgion/Bilan alamurre</variant>
 			<variant type="BOONT">englannin boontling-murre</variant>
+			<variant type="EMODENG">varhaisnykyenglanti</variant>
 			<variant type="FONIPA">kansainvälinen foneettinen aakkosto IPA</variant>
 			<variant type="FONUPA">uralilainen foneettinen aakkosto UPA</variant>
+			<variant type="FONUPA" alt="secondary">suomalais-ugrilainen tarkekirjoitus</variant>
+			<variant type="FONXSAMP">foneettinen X-SAMPA-merkistö</variant>
+			<variant type="HEPBURN">japanin Hepburn-latinaistus</variant>
+			<variant type="HOGNORSK">norjan högnorsk</variant>
+			<variant type="ITIHASA">sanskriitin eeppinen muoto</variant>
+			<variant type="JAUER">retoromaanin jauer-murre</variant>
+			<variant type="JYUTPING">kantoninkiinan jyutping-latinaistus</variant>
 			<variant type="KKCOR">kornin yleiskirjoitus</variant>
+			<variant type="LAUKIKA">klassinen sanskriitti</variant>
 			<variant type="LIPAW">sloveenin resian Lipovazin/Lipovecin alamurre</variant>
+			<variant type="LUNA1918">venäjän ortografia 1918</variant>
 			<variant type="MONOTON">monotoninen kreikka</variant>
+			<variant type="NDYUKA">ndyukan kreolimurre</variant>
 			<variant type="NEDIS">sloveenin natisonen murre</variant>
 			<variant type="NJIVA">sloveenin resian Gnivan/Njivan alamurre</variant>
+			<variant type="NULIK">nykyvolapük</variant>
 			<variant type="OSOJS">sloveenin resian Oseaccon/Osojanen alamurre</variant>
+			<variant type="PAMAKA">pamakan kreolimurre</variant>
+			<variant type="PETR1708">venäjän Pietarin siviiliaakkosto 1708</variant>
 			<variant type="PINYIN">kiinan pinyin-latinaistus</variant>
 			<variant type="POLYTON">polytoninen kreikka</variant>
 			<variant type="POSIX">tietokonemäärittely POSIX</variant>
+			<variant type="PUTER">retoromaanin puter-muoto</variant>
 			<variant type="REVISED">uudistettu oikeinkirjoitus</variant>
+			<variant type="RIGIK">klassinen volapük</variant>
 			<variant type="ROZAJ">sloveenin resian murre</variant>
+			<variant type="RUMGR">retoromaanin rumantsch grischun -muoto</variant>
 			<variant type="SAAHO">afarin saho-murre</variant>
 			<variant type="SCOTLAND">skotlanninenglanti</variant>
 			<variant type="SCOUSE">englannin scouse-murre</variant>
 			<variant type="SOLBA">sloveenin resian Stolvizzan/Solbican alamurre</variant>
+			<variant type="SURMIRAN">retoromaanin surmiran-muoto</variant>
+			<variant type="SURSILV">retoromaanin sursilvan-muoto</variant>
+			<variant type="SUTSILV">retoromaanin sutsilvan-muoto</variant>
 			<variant type="TARASK">valkovenäjän taraškevitsa-oikeinkirjoitus</variant>
 			<variant type="UCCOR">kornin yhtenäiskirjoitus</variant>
 			<variant type="UCRCOR">kornin uusittu yhtenäiskirjoitus</variant>
+			<variant type="ULSTER">skotin ulster-murre</variant>
+			<variant type="VAIDIKA">sanskriitin veda-murre</variant>
 			<variant type="VALENCIA">katalaanin valencian murre</variant>
+			<variant type="VALLADER">reoromaanin vallader-muoto</variant>
 			<variant type="WADEGILE">kiinan Wade-Giles-latinaistus</variant>
 		</variants>
 		<keys>
 			<key type="calendar">kalenteri</key>
-			<key type="collation">lajittelu</key>
+			<key type="colAlternate" draft="contributed">Ohita symbolit -lajittelu</key>
+			<key type="colBackwards" draft="contributed">Käänteinen painomerkki -lajittelu</key>
+			<key type="colCaseFirst" draft="contributed">Järjestys isojen/pienten kirjainten mukaan</key>
+			<key type="colCaseLevel" draft="contributed">Isot ja pienet kirjaimet erotteleva lajittelu</key>
+			<key type="colHiraganaQuaternary" draft="contributed">Kana-lajittelu</key>
+			<key type="collation">lajittelujärjestys</key>
+			<key type="colNormalization" draft="contributed">Normalisoitu lajittelu</key>
+			<key type="colNumeric" draft="contributed">Numeerinen lajittelu</key>
+			<key type="colStrength" draft="contributed">Lajittelun vahvuus</key>
 			<key type="currency">valuutta</key>
+			<key type="numbers">numerot</key>
+			<key type="timezone">aikavyöhyke</key>
+			<key type="va">maavalinnan muunnelma</key>
+			<key type="variableTop">lajittele symboleina</key>
+			<key type="x">yksityiskäyttö</key>
 		</keys>
 		<types>
+			<type type="arab" key="numbers">arabialaiset numerot</type>
+			<type type="arabext" key="numbers">laajennetut arabialaiset numerot</type>
+			<type type="armn" key="numbers">armenialaiset numerot</type>
+			<type type="armnlow" key="numbers">armenialaiset piennumerot</type>
+			<type type="bali" key="numbers">balilaiset numerot</type>
+			<type type="beng" key="numbers">bengalilaiset numerot</type>
 			<type type="big5han" key="collation">perinteinen kiinalainen järjestys Big5</type>
+			<type type="brah" key="numbers">brahmilaiset numerot</type>
 			<type type="buddhist" key="calendar">buddhalainen kalenteri</type>
+			<type type="cakm" key="numbers">chakmalaiset numerot</type>
+			<type type="cham" key="numbers">cham-numerot</type>
 			<type type="chinese" key="calendar">kiinalainen kalenteri</type>
-			<type type="direct" key="collation">suora järjestys</type>
+			<type type="coptic" key="calendar">koptilainen kalenteri</type>
+			<type type="dangi" key="calendar">dangilainen kalenteri</type>
+			<type type="deva" key="numbers">devanagarinumerot</type>
+			<type type="dictionary" key="collation">sanakirjajärjestys</type>
+			<type type="ducet" key="collation">Unicoden oletusjärjestys</type>
+			<type type="eor" key="collation">yleiseurooppalainen lajittelujärjestys</type>
+			<type type="ethi" key="numbers">etiopialaiset numerot</type>
+			<type type="ethiopic" key="calendar">etiopialainen kalenteri</type>
+			<type type="ethiopic-amete-alem" key="calendar">etiopialainen amete alem -kalenteri</type>
+			<type type="finance" key="numbers">talousnumerot</type>
+			<type type="fullwide" key="numbers">ideografin levyiset numerot</type>
 			<type type="gb2312han" key="collation">yksinkertaistettu kiinalainen järjestys GB2312</type>
+			<type type="geor" key="numbers">georgialaiset numerot</type>
 			<type type="gregorian" key="calendar">gregoriaaninen kalenteri</type>
+			<type type="grek" key="numbers">kreikkalaiset numerot</type>
+			<type type="greklow" key="numbers">kreikkalaiset piennumerot</type>
+			<type type="gujr" key="numbers">gudžaratilaiset numerot</type>
+			<type type="guru" key="numbers">gurmukhilaiset numerot</type>
+			<type type="hanidec" key="numbers">kiinalaiset desimaalinumerot</type>
+			<type type="hans" key="numbers">yksinkertaistetut kiinalaiset numerot</type>
+			<type type="hansfin" key="numbers">yksinkertaistetut kiinalaiset talousnumerot</type>
+			<type type="hant" key="numbers">perinteiset kiinalaiset numerot</type>
+			<type type="hantfin" key="numbers">perinteiset kiinalaiset talousnumerot</type>
+			<type type="hebr" key="numbers">heprealaiset numerot</type>
 			<type type="hebrew" key="calendar">juutalainen kalenteri</type>
+			<type type="identical" key="colStrength" draft="contributed">Lajittele kaikki</type>
 			<type type="indian" key="calendar">intialainen kalenteri</type>
 			<type type="islamic" key="calendar">islamilainen kalenteri</type>
 			<type type="islamic-civil" key="calendar">islamilainen siviilikalenteri</type>
 			<type type="japanese" key="calendar">japanilainen kalenteri</type>
+			<type type="java" key="numbers">jaavalaiset numerot</type>
+			<type type="jpan" key="numbers">japanilaiset numerot</type>
+			<type type="jpanfin" key="numbers">japanilaiset talousnumerot</type>
+			<type type="kali" key="numbers">kayah li -numerot</type>
+			<type type="khmr" key="numbers">khmeriläiset numerot</type>
+			<type type="knda" key="numbers">kannadalaiset numerot</type>
+			<type type="lana" key="numbers">taithamin hora-numerot</type>
+			<type type="lanatham" key="numbers">taithamin tham-numerot</type>
+			<type type="laoo" key="numbers">laolaiset numerot</type>
+			<type type="latn" key="numbers">länsimaiset numerot</type>
+			<type type="lepc" key="numbers">lepchanumerot</type>
+			<type type="limb" key="numbers">limbunumerot</type>
+			<type type="lower" key="colCaseFirst" draft="contributed">Lajittele pienet kirjaimet ensin</type>
+			<type type="mlym" key="numbers">malajalamilaiset numerot</type>
+			<type type="mong" key="numbers">mongolialaiset numerot</type>
+			<type type="mtei" key="numbers">meetei mayek -numerot</type>
+			<type type="mymr" key="numbers">burmalaiset numerot</type>
+			<type type="mymrshan" key="numbers">myanmarin shan-numerot</type>
+			<type type="native" key="numbers" draft="contributed">Kielen omat numerot</type>
+			<type type="nkoo" key="numbers">n'ko-numerot</type>
+			<type type="no" key="colBackwards" draft="contributed">Lajittele painomerkit normaalisti</type>
+			<type type="no" key="colCaseFirst" draft="contributed">Lajittele isot ja pienet kirjaimet normaalisti</type>
+			<type type="no" key="colCaseLevel" draft="contributed">Lajittele ilman isojen ja pienten kirjainten erottelua</type>
+			<type type="no" key="colHiraganaQuaternary" draft="contributed">Lajittele kana-merkit erikseen</type>
+			<type type="no" key="colNormalization" draft="contributed">Lajittele ilman normalisointia</type>
+			<type type="no" key="colNumeric" draft="contributed">Lajittele numerot erikseen</type>
+			<type type="non-ignorable" key="colAlternate" draft="contributed">Lajittele symbolit</type>
+			<type type="olck" key="numbers">ol chiki -numerot</type>
+			<type type="orya" key="numbers">orijalaiset numerot</type>
+			<type type="persian" key="calendar">persialainen kalenteri</type>
 			<type type="phonebook" key="collation">puhelinluettelojärjestys</type>
+			<type type="phonetic" key="collation">äänteellinen järjestys</type>
 			<type type="pinyin" key="collation">pinyin-järjestys</type>
-			<type type="roc" key="calendar">kiinan tasavallan kalenteri 1912–1949</type>
+			<type type="primary" key="colStrength" draft="contributed">Lajittele vain peruskirjaimet</type>
+			<type type="quaternary" key="colStrength" draft="contributed">Lajittele painomerkit/koko/leveys/kana-merkit</type>
+			<type type="reformed" key="collation">uudistettu järjestys</type>
+			<type type="roc" key="calendar">Kiinan tasavallan kalenteri</type>
+			<type type="roman" key="numbers">roomalaiset numerot</type>
+			<type type="romanlow" key="numbers">roomalaiset piennumerot</type>
+			<type type="saur" key="numbers">saurashtra-numerot</type>
+			<type type="search" key="collation">yleishakujärjestys</type>
+			<type type="searchjl" key="collation">haku hangul-alkukonsonantin mukaan</type>
+			<type type="secondary" key="colStrength" draft="contributed">Lajittele painomerkit</type>
+			<type type="shifted" key="colAlternate" draft="contributed">Lajittele symbolit ohittaen</type>
+			<type type="sora" key="numbers">sora sompeng -numerot</type>
+			<type type="standard" key="collation">normaalijärjestys</type>
 			<type type="stroke" key="collation">piirtojärjestys</type>
+			<type type="sund" key="numbers">sundalaiset numerot</type>
+			<type type="talu" key="numbers">uudet tai lue -numerot</type>
+			<type type="taml" key="numbers">perinteiset tamilinumerot</type>
+			<type type="tamldec" key="numbers">tamilinumerot</type>
+			<type type="telu" key="numbers">telugulaiset numerot</type>
+			<type type="tertiary" key="colStrength" draft="contributed">Lajittele painomerkit/koko/leveys</type>
+			<type type="thai" key="numbers">thainumerot</type>
+			<type type="tibt" key="numbers">tiibetiläiset numerot</type>
 			<type type="traditional" key="collation">perinteinen järjestys</type>
+			<type type="traditional" key="numbers">perinteiset numerot</type>
+			<type type="unihan" key="collation">radikaali- ja piirtojärjestys</type>
+			<type type="upper" key="colCaseFirst" draft="contributed">Lajittele isot kirjaimet ensin</type>
+			<type type="vaii" key="numbers">vai-numerot</type>
+			<type type="yes" key="colBackwards" draft="contributed">Lajittele painomerkit käänteisesti</type>
+			<type type="yes" key="colCaseLevel" draft="contributed">Lajittele isojen ja pienten kirjainten mukaan</type>
+			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Lajittele kana-merkit erikseen</type>
+			<type type="yes" key="colNormalization" draft="contributed">Lajittele Unicode normalisoituna</type>
+			<type type="yes" key="colNumeric" draft="contributed">Lajittele numerot numeerisesti</type>
+			<type type="zhuyin" key="collation">zhuyin-järjestys</type>
 		</types>
+		<transformNames>
+			<transformName type="BGN" draft="contributed">BGN</transformName>
+			<transformName type="Numeric">Numerot</transformName>
+			<transformName type="Tone">Sävy</transformName>
+			<transformName type="UNGEGN" draft="contributed">UNGEGN</transformName>
+			<transformName type="x-Accents">Aksenttimerkit</transformName>
+			<transformName type="x-Fullwidth">Leveä</transformName>
+			<transformName type="x-Halfwidth">Kapea</transformName>
+			<transformName type="x-Jamo">Jamo</transformName>
+			<transformName type="x-Pinyin">Pinyin</transformName>
+			<transformName type="x-Publishing">Julkaisu</transformName>
+		</transformNames>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrinen</measurementSystemName>
+			<measurementSystemName type="UK">brittiläinen</measurementSystemName>
 			<measurementSystemName type="US">amerikkalainen</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
@@ -1003,13 +1220,26 @@
 			<codePattern type="territory">alue: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
-	<layout>
-		<inText type="languages">lowercase-words</inText>
-	</layout>
+	<contextTransforms>
+		<contextTransformUsage type="languages">
+			<contextTransform type="uiListOrMenu">titlecase-firstword</contextTransform>
+		</contextTransformUsage>
+		<contextTransformUsage type="relative">
+			<contextTransform type="stand-alone">titlecase-firstword</contextTransform>
+		</contextTransformUsage>
+	</contextTransforms>
 	<characters>
-		<exemplarCharacters>[a-s š t-z ž å ä ö]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à â ã č ç đ é è ë ǧ ǥ ȟ í ï ǩ ń ñ ŋ ô õ œ ř ŧ ú ü ʒ ǯ æ ø]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-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" draft="unconfirmed">[\- ‐ – , ; \: ! ? . … ’ ” ( ) \[ \] § @ * / \&amp; #]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0}…</ellipsis>
+		<ellipsis type="word-initial">…{0}</ellipsis>
+		<ellipsis type="word-medial" draft="contributed">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
 		<quotationStart>”</quotationStart>
@@ -1018,8 +1248,236 @@
 		<alternateQuotationEnd>’</alternateQuotationEnd>
 	</delimiters>
 	<dates>
-		<dateRangePattern>{0}–{1}</dateRangePattern>
 		<calendars>
+			<calendar type="buddhist">
+				<eras>
+					<eraAbbr>
+						<era type="0">BE</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+			<calendar type="chinese">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>cccc d.M.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d.M.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d.M.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d.M.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="H">H</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">H.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">H.mm.ss</dateFormatItem>
+						<dateFormatItem id="Md">d.M.</dateFormatItem>
+						<dateFormatItem id="MEd">E d.M.</dateFormatItem>
+						<dateFormatItem id="MMMd">d.M.</dateFormatItem>
+						<dateFormatItem id="MMMEd">E d.M.</dateFormatItem>
+						<dateFormatItem id="ms">mm.ss</dateFormatItem>
+						<dateFormatItem id="y">y</dateFormatItem>
+						<dateFormatItem id="yyyy">y</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d.M.y</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E d.M.y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d.M.y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E d.M.y</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>cccc d. MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d. MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d.M.y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d.M.y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="Ed">E d.</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">H.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">H.mm.ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d.M.</dateFormatItem>
+						<dateFormatItem id="MEd">E d.M.</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">ccc d. MMM</dateFormatItem>
+						<dateFormatItem id="ms">mm.ss</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">L.y G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d.M.y G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E d.M.y G</dateFormatItem>
+						<dateFormatItem id="yyyyMM">M.y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">LLL y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d. MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E d. MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">LLLL y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMccccd">cccc d. MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0}–{1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d.–d.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">H–H</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">H.mm–H.mm</greatestDifference>
+							<greatestDifference id="m">H.mm–H.mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h.mm a – h.mm a v</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm a v</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">H.mm–H.mm v</greatestDifference>
+							<greatestDifference id="m">H.mm–H.mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">H–H v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">L.–L.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">d.–d.M.</greatestDifference>
+							<greatestDifference id="M">d.M.–d.M.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E d. – E d.M.</greatestDifference>
+							<greatestDifference id="M">E d.M. – E d.M.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL–LLLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d.–d. MMMM</greatestDifference>
+							<greatestDifference id="M">d. MMMM – d. MMMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E d. – E d. MMMM</greatestDifference>
+							<greatestDifference id="M">E d. MMMM – E d. MMMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMM">
+							<greatestDifference id="M">LLL–LLLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">LLL–LLLL y G</greatestDifference>
+							<greatestDifference id="y">LLLL y – LLLL y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d.–d.M.y G</greatestDifference>
+							<greatestDifference id="M">d.M.–d.M.y G</greatestDifference>
+							<greatestDifference id="y">d.M.y–d.M.y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E d.M.y – E d.M.y G</greatestDifference>
+							<greatestDifference id="M">E d.M.y – E d.M.y G</greatestDifference>
+							<greatestDifference id="y">E d.M.y – E d.M.y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">LLL–LLLL y G</greatestDifference>
+							<greatestDifference id="y">LLLL y – LLLL y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d.–d. MMMM y G</greatestDifference>
+							<greatestDifference id="M">d. MMMM – d. MMMM y G</greatestDifference>
+							<greatestDifference id="y">d. MMMM y – d. MMMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E d. – E d. MMMM y G</greatestDifference>
+							<greatestDifference id="M">E d. MMMM – E d. MMMM y G</greatestDifference>
+							<greatestDifference id="y">E d. MMMM y – E d. MMMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">LLL–LLLL y G</greatestDifference>
+							<greatestDifference id="y">LLLL y – LLLL y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
@@ -1037,6 +1495,20 @@
 							<month type="11">marraskuuta</month>
 							<month type="12">joulukuuta</month>
 						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">T</month>
+							<month type="2">H</month>
+							<month type="3">M</month>
+							<month type="4">H</month>
+							<month type="5">T</month>
+							<month type="6">K</month>
+							<month type="7">H</month>
+							<month type="8">E</month>
+							<month type="9">S</month>
+							<month type="10">L</month>
+							<month type="11">M</month>
+							<month type="12">J</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">tammikuuta</month>
 							<month type="2">helmikuuta</month>
@@ -1108,6 +1580,24 @@
 							<day type="fri">pe</day>
 							<day type="sat">la</day>
 						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">S</day>
+							<day type="mon">M</day>
+							<day type="tue">T</day>
+							<day type="wed">K</day>
+							<day type="thu">T</day>
+							<day type="fri">P</day>
+							<day type="sat">L</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">su</day>
+							<day type="mon">ma</day>
+							<day type="tue">ti</day>
+							<day type="wed">ke</day>
+							<day type="thu">to</day>
+							<day type="fri">pe</day>
+							<day type="sat">la</day>
+						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">sunnuntaina</day>
 							<day type="mon">maanantaina</day>
@@ -1119,6 +1609,15 @@
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">su</day>
+							<day type="mon">ma</day>
+							<day type="tue">ti</day>
+							<day type="wed">ke</day>
+							<day type="thu">to</day>
+							<day type="fri">pe</day>
+							<day type="sat">la</day>
+						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">S</day>
 							<day type="mon">M</day>
@@ -1128,6 +1627,15 @@
 							<day type="fri">P</day>
 							<day type="sat">L</day>
 						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">su</day>
+							<day type="mon">ma</day>
+							<day type="tue">ti</day>
+							<day type="wed">ke</day>
+							<day type="thu">to</day>
+							<day type="fri">pe</day>
+							<day type="sat">la</day>
+						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">sunnuntai</day>
 							<day type="mon">maanantai</day>
@@ -1147,6 +1655,12 @@
 							<quarter type="3">3. nelj.</quarter>
 							<quarter type="4">4. nelj.</quarter>
 						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">1. neljännes</quarter>
 							<quarter type="2">2. neljännes</quarter>
@@ -1155,30 +1669,72 @@
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1. nelj.</quarter>
+							<quarter type="2">2. nelj.</quarter>
+							<quarter type="3">3. nelj.</quarter>
+							<quarter type="4">4. nelj.</quarter>
+						</quarterWidth>
 						<quarterWidth type="narrow">
 							<quarter type="1">1</quarter>
 							<quarter type="2">2</quarter>
 							<quarter type="3">3</quarter>
 							<quarter type="4">4</quarter>
 						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1. neljännes</quarter>
+							<quarter type="2">2. neljännes</quarter>
+							<quarter type="3">3. neljännes</quarter>
+							<quarter type="4">4. neljännes</quarter>
+						</quarterWidth>
 					</quarterContext>
 				</quarters>
-				<am>ap.</am>
-				<pm>ip.</pm>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ap.</dayPeriod>
+							<dayPeriod type="pm">ip.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">ap.</dayPeriod>
+							<dayPeriod type="pm">ip.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">ap.</dayPeriod>
+							<dayPeriod type="pm">ip.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">ap.</dayPeriod>
+							<dayPeriod type="pm">ip.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">ennen Kristuksen syntymää</era>
+						<era type="0" alt="variant">ennen ajanlaskun alkua</era>
 						<era type="1">jälkeen Kristuksen syntymän</era>
+						<era type="1" alt="variant">jälkeen ajanlaskun alun</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">eKr.</era>
+						<era type="0" alt="variant">eaa.</era>
 						<era type="1">jKr.</era>
+						<era type="1" alt="variant">jaa.</era>
 					</eraAbbr>
+					<eraNarrow>
+						<era type="0">eK</era>
+						<era type="0" alt="variant" draft="unconfirmed">eaa</era>
+						<era type="1">jK</era>
+						<era type="1" alt="variant" draft="unconfirmed">jaa</era>
+					</eraNarrow>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE d. MMMM y</pattern>
+							<pattern>cccc d. MMMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -1188,12 +1744,12 @@
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
+							<pattern>d.M.y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
+							<pattern>d.M.y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1220,61 +1776,102 @@
 					</timeFormatLength>
 				</timeFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d.</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="Ed">E d.</dateFormatItem>
+						<dateFormatItem id="Ehm">E h.mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E H.mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E H.mm.ss</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H.mm</dateFormatItem>
 						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">H.mm.ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d.M.</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm.ss</dateFormatItem>
+						<dateFormatItem id="MMMEd">ccc d. MMM</dateFormatItem>
+						<dateFormatItem id="ms">m.ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">L.yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d.M.yyyy</dateFormatItem>
+						<dateFormatItem id="yM">L.y</dateFormatItem>
+						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
+						<dateFormatItem id="yMEd">E d.M.y</dateFormatItem>
+						<dateFormatItem id="yMM">M.y</dateFormatItem>
 						<dateFormatItem id="yMMM">LLL y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d. MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d. MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E d. MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
-						<dateFormatItem id="yMMMMccccd">cccc, d. MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q/yyyy</dateFormatItem>
+						<dateFormatItem id="yMMMMccccd">cccc d. MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">M/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q/yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMEEEd">EEE d.M.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">LLLL y</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
+					<appendItems>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+					</appendItems>
 					<intervalFormats>
 						<intervalFormatFallback>{0}–{1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d.–d.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">H–H</greatestDifference>
-							<greatestDifference id="h">H–H</greatestDifference>
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">H–H</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">H.mm–H.mm</greatestDifference>
-							<greatestDifference id="h">H.mm–H.mm</greatestDifference>
+							<greatestDifference id="a">h.mm a – h.mm a</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm a</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">H.mm–H.mm</greatestDifference>
 							<greatestDifference id="m">H.mm–H.mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">H.mm–H.mm v</greatestDifference>
-							<greatestDifference id="h">H.mm–H.mm v</greatestDifference>
+							<greatestDifference id="a">h.mm a – h.mm a v</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm a v</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">H.mm–H.mm v</greatestDifference>
 							<greatestDifference id="m">H.mm–H.mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">H–H v</greatestDifference>
-							<greatestDifference id="h">H–H v</greatestDifference>
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">H–H v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">L.–L.</greatestDifference>
@@ -1284,7 +1881,7 @@
 							<greatestDifference id="M">d.M.–d.M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d. – E d.M</greatestDifference>
+							<greatestDifference id="d">E d. – E d.M.</greatestDifference>
 							<greatestDifference id="M">E d.M. – E d.M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
@@ -1309,14 +1906,14 @@
 							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.–d.M.yyyy</greatestDifference>
-							<greatestDifference id="M">d.M.–d.M.yyyy</greatestDifference>
-							<greatestDifference id="y">d.M.yyyy–d.M.yyyy</greatestDifference>
+							<greatestDifference id="d">d.–d.M.y</greatestDifference>
+							<greatestDifference id="M">d.M.–d.M.y</greatestDifference>
+							<greatestDifference id="y">d.M.y–d.M.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d.M.yyyy – E d.M.yyyy</greatestDifference>
-							<greatestDifference id="M">E d.M.yyyy – E d.M.yyyy</greatestDifference>
-							<greatestDifference id="y">E d.M.yyyy – E d.M.yyyy</greatestDifference>
+							<greatestDifference id="d">E d.M.y – E d.M.y</greatestDifference>
+							<greatestDifference id="M">E d.M.y – E d.M.y</greatestDifference>
+							<greatestDifference id="y">E d.M.y – E d.M.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">LLL–LLLL y</greatestDifference>
@@ -1338,58 +1935,37 @@
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>aikakausi</displayName>
-					</field>
-					<field type="year">
-						<displayName>vuosi</displayName>
-					</field>
-					<field type="month">
-						<displayName>kuukausi</displayName>
-					</field>
-					<field type="week">
-						<displayName>viikko</displayName>
-					</field>
-					<field type="day">
-						<displayName>päivä</displayName>
-						<relative type="-2">toissapäivänä</relative>
-						<relative type="-1">eilen</relative>
-						<relative type="0">tänään</relative>
-						<relative type="1">huomenna</relative>
-						<relative type="2">ylihuomenna</relative>
-					</field>
-					<field type="weekday">
-						<displayName>viikonpäivä</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>ap/ip</displayName>
-					</field>
-					<field type="hour">
-						<displayName>tunti</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minuutti</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekunti</displayName>
-					</field>
-					<field type="zone">
-						<displayName>aikavyöhyke</displayName>
-					</field>
-				</fields>
 			</calendar>
 			<calendar type="hebrew">
 				<months>
 					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1">tišríkuuta</month>
+							<month type="2">hešvánkuuta</month>
+							<month type="3">kislévkuuta</month>
+							<month type="4">tevétkuuta</month>
+							<month type="5">ševátkuuta</month>
+							<month type="6">adárkuuta I</month>
+							<month type="7">adárkuuta</month>
+							<month type="7" yeartype="leap">adárkuuta II</month>
+							<month type="8">nisánkuuta</month>
+							<month type="9">ijjárkuuta</month>
+							<month type="10">sivánkuuta</month>
+							<month type="11">tammúzkuuta</month>
+							<month type="12">abkuuta</month>
+							<month type="13">elúlkuuta</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
 							<month type="1">tišrí</month>
 							<month type="2">hešván</month>
 							<month type="3">kislév</month>
 							<month type="4">tevét</month>
 							<month type="5">ševát</month>
-							<month type="6">adár</month>
-							<month type="7">adár II</month>
+							<month type="6">adár I</month>
+							<month type="7">adár</month>
+							<month type="7" yeartype="leap">adár II</month>
 							<month type="8">nisán</month>
 							<month type="9">ijjár</month>
 							<month type="10">siván</month>
@@ -1397,14 +1973,31 @@
 							<month type="12">ab</month>
 							<month type="13">elúl</month>
 						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">T</month>
+							<month type="2">H</month>
+							<month type="3">K</month>
+							<month type="4">T</month>
+							<month type="5">S</month>
+							<month type="6">A</month>
+							<month type="7">A</month>
+							<month type="7" yeartype="leap">A</month>
+							<month type="8">N</month>
+							<month type="9">I</month>
+							<month type="10">S</month>
+							<month type="11">T</month>
+							<month type="12">A</month>
+							<month type="13">E</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">tišríkuu</month>
 							<month type="2">hešvánkuu</month>
 							<month type="3">kislévkuu</month>
 							<month type="4">tevétkuu</month>
 							<month type="5">ševátkuu</month>
-							<month type="6">adárkuu</month>
-							<month type="7">adárkuu II</month>
+							<month type="6">adárkuu I</month>
+							<month type="7">adárkuu</month>
+							<month type="7" yeartype="leap">adárkuu II</month>
 							<month type="8">nisánkuu</month>
 							<month type="9">ijjárkuu</month>
 							<month type="10">sivánkuu</month>
@@ -1435,12 +2028,190 @@
 					</monthContext>
 				</months>
 			</calendar>
+			<calendar type="japanese">
+				<!-- need some non-empty element here to make inheritance work,
+					 this copy of generic dateFormats above is smaller than root japanese eras
+				-->
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>cccc d. MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d. MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d.M.y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d.M.y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+			</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>aikakausi</displayName>
+			</field>
+			<field type="year">
+				<displayName>vuosi</displayName>
+				<relative type="-1">viime vuonna</relative>
+				<relative type="0">tänä vuonna</relative>
+				<relative type="1">ensi vuonna</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} vuoden päästä</relativeTimePattern>
+					<relativeTimePattern count="other">{0} vuoden päästä</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} vuosi sitten</relativeTimePattern>
+					<relativeTimePattern count="other">{0} vuotta sitten</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>kuukausi</displayName>
+				<relative type="-1">viime kuussa</relative>
+				<relative type="0">tässä kuussa</relative>
+				<relative type="1">ensi kuussa</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} kuukauden päästä</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kuukauden päästä</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} kuukausi sitten</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kuukautta sitten</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>viikko</displayName>
+				<relative type="-1">viime viikolla</relative>
+				<relative type="0">tällä viikolla</relative>
+				<relative type="1">ensi viikolla</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} viikon päästä</relativeTimePattern>
+					<relativeTimePattern count="other">{0} viikon päästä</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} viikko sitten</relativeTimePattern>
+					<relativeTimePattern count="other">{0} viikkoa sitten</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>päivä</displayName>
+				<relative type="-2">toissapäivänä</relative>
+				<relative type="-1">eilen</relative>
+				<relative type="0">tänään</relative>
+				<relative type="1">huomenna</relative>
+				<relative type="2">ylihuomenna</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} päivän päästä</relativeTimePattern>
+					<relativeTimePattern count="other">{0} päivän päästä</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} päivä sitten</relativeTimePattern>
+					<relativeTimePattern count="other">{0} päivää sitten</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>viikonpäivä</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">viime sunnuntaina</relative>
+				<relative type="0">tänä sunnuntaina</relative>
+				<relative type="1">ensi sunnuntaina</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">viime maanantaina</relative>
+				<relative type="0">tänä maanantaina</relative>
+				<relative type="1">ensi maanantaina</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">viime tiistaina</relative>
+				<relative type="0">tänä tiistaina</relative>
+				<relative type="1">ensi tiistaina</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">viime keskiviikkona</relative>
+				<relative type="0">tänä keskiviikkona</relative>
+				<relative type="1">ensi keskiviikkona</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">viime torstaina</relative>
+				<relative type="0">tänä torstaina</relative>
+				<relative type="1">ensi torstaina</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">viime perjantaina</relative>
+				<relative type="0">tänä perjantaina</relative>
+				<relative type="1">ensi perjantaina</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">viime lauantaina</relative>
+				<relative type="0">tänä lauantaina</relative>
+				<relative type="1">ensi lauantaina</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>vuorokaudenaika</displayName>
+			</field>
+			<field type="hour">
+				<displayName>tunti</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} tunnin päästä</relativeTimePattern>
+					<relativeTimePattern count="other">{0} tunnin päästä</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} tunti sitten</relativeTimePattern>
+					<relativeTimePattern count="other">{0} tuntia sitten</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>minuutti</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} minuutin päästä</relativeTimePattern>
+					<relativeTimePattern count="other">{0} minuutin päästä</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} minuutti sitten</relativeTimePattern>
+					<relativeTimePattern count="other">{0} minuuttia sitten</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>sekunti</displayName>
+				<relative type="0">nyt</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sekunnin päästä</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sekunnin päästä</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sekunti sitten</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sekuntia sitten</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>aikavyöhyke</displayName>
+			</field>
+		</fields>
 		<timeZoneNames>
 			<hourFormat>+H.mm;-H.mm</hourFormat>
 			<gmtFormat>UTC{0}</gmtFormat>
 			<gmtZeroFormat>UTC</gmtZeroFormat>
-			<regionFormat>{0}</regionFormat>
+			<regionFormat>aikavyöhyke: {0}</regionFormat>
+			<regionFormat type="daylight">{0} (kesäaika)</regionFormat>
+			<regionFormat type="standard">{0} (normaaliaika)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
 				<exemplarCity>tuntematon</exemplarCity>
@@ -1451,23 +2222,57 @@
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Etelänapa</exemplarCity>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Dumont d’Urville</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>Tucumán</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>Córdoba</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Macquariensaari</exemplarCity>
+			</zone>
 			<zone type="Europe/Mariehamn">
 				<exemplarCity>Maarianhamina</exemplarCity>
+				<exemplarCity alt="secondary">Mariehamn</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Bryssel</exemplarCity>
 			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>Saint-Barthélemy</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>Eirunepé</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>Cuiabá</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>Santarém</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>Araguaína</exemplarCity>
+			</zone>
 			<zone type="America/Sao_Paulo">
 				<exemplarCity>São Paulo</exemplarCity>
 			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>Maceió</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Atikokan</exemplarCity>
+			</zone>
 			<zone type="America/St_Johns">
-				<exemplarCity>St. Johns</exemplarCity>
+				<exemplarCity>St. John's</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>Kookossaaret</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>Zürich</exemplarCity>
@@ -1475,18 +2280,36 @@
 			<zone type="Pacific/Easter">
 				<exemplarCity>Pääsiäissaari</exemplarCity>
 			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>Santiago de Chile</exemplarCity>
+			</zone>
+			<zone type="Asia/Kashgar">
+				<exemplarCity>Kašgar</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>Ürümqi</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Bogotá</exemplarCity>
+			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Havanna</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity>Kap Verde</exemplarCity>
 			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Curaçao</exemplarCity>
+			</zone>
 			<zone type="Indian/Christmas">
-				<exemplarCity>Joulu</exemplarCity>
+				<exemplarCity>Joulusaari</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
 				<exemplarCity>Nikosia</exemplarCity>
 			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Praha</exemplarCity>
+			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berliini</exemplarCity>
 			</zone>
@@ -1502,11 +2325,26 @@
 			<zone type="Africa/Cairo">
 				<exemplarCity>Kairo</exemplarCity>
 			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>El Aaiún</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>Asmara</exemplarCity>
+			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Kanariansaaret</exemplarCity>
 			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>Addis Abeba</exemplarCity>
+			</zone>
 			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidzi</exemplarCity>
+				<exemplarCity>Fidži</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>Chuuk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>Pohnpei</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
 				<exemplarCity>Färsaaret</exemplarCity>
@@ -1515,15 +2353,21 @@
 				<exemplarCity>Pariisi</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
+				<long>
+					<daylight>Britannian kesäaika</daylight>
+				</long>
 				<exemplarCity>Lontoo</exemplarCity>
 			</zone>
 			<zone type="America/Thule">
+				<exemplarCity alt="secondary">Qaanaaq</exemplarCity>
 			</zone>
 			<zone type="America/Godthab">
 				<exemplarCity>Nuuk</exemplarCity>
+				<exemplarCity alt="secondary">Godthåb</exemplarCity>
 			</zone>
 			<zone type="America/Scoresbysund">
 				<exemplarCity>Ittoqqortoormiit</exemplarCity>
+				<exemplarCity alt="secondary">Scoresbysund</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
 				<exemplarCity>Ateena</exemplarCity>
@@ -1534,12 +2378,26 @@
 			<zone type="Asia/Hong_Kong">
 				<exemplarCity>Hongkong</exemplarCity>
 			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>Irlannin kesäaika</daylight>
+				</long>
+			</zone>
 			<zone type="Europe/Isle_of_Man">
 				<exemplarCity>Mansaari</exemplarCity>
 			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Kalkutta</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>Bagdad</exemplarCity>
+			</zone>
 			<zone type="Asia/Tehran">
 				<exemplarCity>Teheran</exemplarCity>
 			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>Reykjavík</exemplarCity>
+			</zone>
 			<zone type="Europe/Rome">
 				<exemplarCity>Rooma</exemplarCity>
 			</zone>
@@ -1549,15 +2407,33 @@
 			<zone type="Asia/Tokyo">
 				<exemplarCity>Tokio</exemplarCity>
 			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>Biškek</exemplarCity>
+			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komorit</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Saint Kitts</exemplarCity>
 			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>Pjongjang</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Soul</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>Aqtaw</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>Uralsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Aqtobe">
 				<exemplarCity>Aqtöbe</exemplarCity>
 			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Qızılorda</exemplarCity>
+			</zone>
 			<zone type="America/St_Lucia">
 				<exemplarCity>Saint Lucia</exemplarCity>
 			</zone>
@@ -1570,20 +2446,53 @@
 			<zone type="Europe/Riga">
 				<exemplarCity>Riika</exemplarCity>
 			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>Chişinău</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>Yangon</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Ulan Bator</exemplarCity>
+			</zone>
+			<zone type="Asia/Choibalsan">
+				<exemplarCity>Tšoibalsa</exemplarCity>
+			</zone>
 			<zone type="Asia/Macau">
 				<exemplarCity>Macao</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
 				<exemplarCity>Malediivit</exemplarCity>
 			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>Mazatlán</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>Bahía de Banderas</exemplarCity>
+			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Ciudad de México</exemplarCity>
 			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>Mérida</exemplarCity>
+			</zone>
 			<zone type="America/Cancun">
 				<exemplarCity>Cancún</exemplarCity>
 			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>Niuesaari</exemplarCity>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Nouméa</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Kathmandu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>Chathamsaaret</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Marquesassaaret</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>Gambiersaaret</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
 				<exemplarCity>Varsova</exemplarCity>
@@ -1594,6 +2503,12 @@
 			<zone type="Europe/Lisbon">
 				<exemplarCity>Lissabon</exemplarCity>
 			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Asunción</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Réunion</exemplarCity>
+			</zone>
 			<zone type="Europe/Bucharest">
 				<exemplarCity>Bukarest</exemplarCity>
 			</zone>
@@ -1612,24 +2527,54 @@
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>Handyga</exemplarCity>
+			</zone>
 			<zone type="Asia/Sakhalin">
 				<exemplarCity>Sahalin</exemplarCity>
 			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtšatka</exemplarCity>
 			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>Riad</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>Mahé</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>Khartum</exemplarCity>
+			</zone>
 			<zone type="Europe/Stockholm">
 				<exemplarCity>Tukholma</exemplarCity>
 			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>San Salvador</exemplarCity>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>Saint Helena</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>São Tomé</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>Lower Prince's Quarter</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damaskos</exemplarCity>
 			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>N'Djamena</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Kerguelensaaret</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>Lomé</exemplarCity>
+			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dušanbe</exemplarCity>
 			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>Ašgabat</exemplarCity>
+			</zone>
 			<zone type="Europe/Uzhgorod">
 				<exemplarCity>Užgorod</exemplarCity>
 			</zone>
@@ -1639,8 +2584,38 @@
 			<zone type="Europe/Zaporozhye">
 				<exemplarCity>Zaporižžja</exemplarCity>
 			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Beulah, Pohjois-Dakota</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>New Salem, Pohjois-Dakota</exemplarCity>
+			</zone>
 			<zone type="America/North_Dakota/Center">
-				<exemplarCity>keskinen Pohjois-Dakota</exemplarCity>
+				<exemplarCity>Center, Pohjois-Dakota</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>Vincennes, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>Petersburg, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>Tell City, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>Knox, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>Winamac, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>Marengo, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>Vevay, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>Monticello, Kentucky</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
 				<exemplarCity>Taškent</exemplarCity>
@@ -1654,6 +2629,21 @@
 			<zone type="America/St_Thomas">
 				<exemplarCity>Saint Thomas</exemplarCity>
 			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Hồ Chí Minhin kaupunki</exemplarCity>
+			</zone>
+			<metazone type="Acre">
+				<long>
+					<generic>Acren aika</generic>
+					<standard>Acren normaaliaika</standard>
+					<daylight>Acren kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>Afganistanin aika</standard>
+				</long>
+			</metazone>
 			<metazone type="Africa_Central">
 				<long>
 					<standard>Keski-Afrikan aika</standard>
@@ -1666,25 +2656,34 @@
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<generic>Etelä-Afrikan aika</generic>
-					<standard>Etelä-Afrikan normaaliaika</standard>
+					<standard>Etelä-Afrikan aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<standard>Länsi-Afrikan aika</standard>
+					<generic>Länsi-Afrikan aika</generic>
+					<standard>Länsi-Afrikan normaaliaika</standard>
 					<daylight>Länsi-Afrikan kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
+					<generic>Alaskan aika</generic>
 					<standard>Alaskan normaaliaika</standard>
 					<daylight>Alaskan kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Almaty">
+				<long>
+					<generic>Almatyn aika</generic>
+					<standard>Almatyn normaaliaika</standard>
+					<daylight>Almatyn kesäaika</daylight>
+				</long>
+			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<standard>Amazonin aika</standard>
+					<generic>Amazonin aika</generic>
+					<standard>Amazonin normaaliaika</standard>
 					<daylight>Amazonin kesäaika</daylight>
 				</long>
 			</metazone>
@@ -1694,11 +2693,6 @@
 					<standard>Yhdysvaltain keskinen normaaliaika</standard>
 					<daylight>Yhdysvaltain keskinen kesäaika</daylight>
 				</long>
-				<short>
-					<generic>CT</generic>
-					<standard>CST</standard>
-					<daylight>CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -1706,11 +2700,6 @@
 					<standard>Yhdysvaltain itäinen normaaliaika</standard>
 					<daylight>Yhdysvaltain itäinen kesäaika</daylight>
 				</long>
-				<short>
-					<generic>ET</generic>
-					<standard>EST</standard>
-					<daylight>EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -1718,11 +2707,6 @@
 					<standard>Kalliovuorten normaaliaika</standard>
 					<daylight>Kalliovuorten kesäaika</daylight>
 				</long>
-				<short>
-					<generic>MT</generic>
-					<standard>MST</standard>
-					<daylight>MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -1730,11 +2714,27 @@
 					<standard>Yhdysvaltain Tyynenmeren normaaliaika</standard>
 					<daylight>Yhdysvaltain Tyynenmeren kesäaika</daylight>
 				</long>
-				<short>
-					<generic>PT</generic>
-					<standard>PST</standard>
-					<daylight>PDT</daylight>
-				</short>
+			</metazone>
+			<metazone type="Anadyr">
+				<long>
+					<generic>Anadyrin aika</generic>
+					<standard>Anadyrin normaaliaika</standard>
+					<daylight>Anadyrin kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtau">
+				<long>
+					<generic>Aqtaw'n aika</generic>
+					<standard>Aqtaw'n normaaliaika</standard>
+					<daylight>Aqtaw'n kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtobe">
+				<long>
+					<generic>Aqtöben aika</generic>
+					<standard>Aqtöben normaaliaika</standard>
+					<daylight>Aqtöben kesäaika</daylight>
+				</long>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
@@ -1742,19 +2742,26 @@
 					<standard>Saudi-Arabian normaaliaika</standard>
 					<daylight>Saudi-Arabian kesäaika</daylight>
 				</long>
-				<short>
-					<generic>AT (SA)</generic>
-				</short>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>Argentiinan aika</generic>
+					<standard>Argentiinan normaaliaika</standard>
+					<daylight>Argentiinan kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>Länsi-Argentiinan aika</generic>
+					<standard>Länsi-Argentiinan normaaliaika</standard>
+					<daylight>Länsi-Argentiinan kesäaika</daylight>
+				</long>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<standard>Armenian aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>Ašgabatin aika</standard>
-					<daylight>Ašgabatin kesäaika</daylight>
+					<generic>Armenian aika</generic>
+					<standard>Armenian normaaliaika</standard>
+					<daylight>Armenian kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
@@ -1763,20 +2770,13 @@
 					<standard>Kanadan Atlantin normaaliaika</standard>
 					<daylight>Kanadan Atlantin kesäaika</daylight>
 				</long>
-				<short>
-					<generic>AT</generic>
-					<standard>AST</standard>
-					<daylight>ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
 					<generic>Keski-Australian aika</generic>
+					<standard>Keski-Australian normaaliaika</standard>
 					<daylight>Keski-Australian kesäaika</daylight>
 				</long>
-				<short>
-					<generic>ACT</generic>
-				</short>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
@@ -1784,9 +2784,6 @@
 					<standard>Läntisen Keski-Australian normaaliaika</standard>
 					<daylight>Läntisen Keski-Australian kesäaika</daylight>
 				</long>
-				<short>
-					<generic>ACWT</generic>
-				</short>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
@@ -1797,33 +2794,30 @@
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
+					<generic>Länsi-Australian aika</generic>
 					<standard>Länsi-Australian normaaliaika</standard>
 					<daylight>Länsi-Australian kesäaika</daylight>
 				</long>
-				<short>
-					<generic>AWT</generic>
-				</short>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<standard>Azerbaidžanin aika</standard>
+					<generic>Azerbaidžanin aika</generic>
+					<standard>Azerbaidžanin normaaliaika</standard>
 					<daylight>Azerbaidžanin kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<standard>Azorien aika</standard>
+					<generic>Azorien aika</generic>
+					<standard>Azorien normaaliaika</standard>
 					<daylight>Azorien kesäaika</daylight>
 				</long>
 			</metazone>
-			<metazone type="Baku">
-				<long>
-					<daylight>Bakun kesäaika</daylight>
-				</long>
-			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<standard>Bangladeshin aika</standard>
+					<generic>Bangladeshin aika</generic>
+					<standard>Bangladeshin normaaliaika</standard>
+					<daylight>Bangladeshin kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bhutan">
@@ -1831,10 +2825,16 @@
 					<standard>Bhutanin aika</standard>
 				</long>
 			</metazone>
-			<metazone type="Borneo">
+			<metazone type="Bolivia">
 				<long>
-					<standard>Borneon aika</standard>
-					<daylight>Borneon kesäaika</daylight>
+					<standard>Bolivian aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>Brasilian aika</generic>
+					<standard>Brasilian normaaliaika</standard>
+					<daylight>Brasilian kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
@@ -1844,24 +2844,46 @@
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<standard>Kap Verden aika</standard>
+					<generic>Kap Verden aika</generic>
+					<standard>Kap Verden normaaliaika</standard>
 					<daylight>Kap Verden kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Casey">
+				<long>
+					<standard>Caseyn aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>Tšamorron aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>Chathamin aika</generic>
+					<standard>Chathamin normaaliaika</standard>
+					<daylight>Chathamin kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>Chilen aika</generic>
+					<standard>Chilen normaaliaika</standard>
+					<daylight>Chilen kesäaika</daylight>
+				</long>
+			</metazone>
 			<metazone type="China">
 				<long>
 					<generic>Kiinan aika</generic>
 					<standard>Kiinan normaaliaika</standard>
 					<daylight>Kiinan kesäaika</daylight>
 				</long>
-				<short>
-					<generic>CT</generic>
-					<standard>CST (Kiina)</standard>
-					<daylight>CDT (Kiina)</daylight>
-				</short>
 			</metazone>
 			<metazone type="Choibalsan">
 				<long>
+					<generic>Tšoibalsan aika</generic>
+					<standard>Tšoibalsan normaaliaika</standard>
 					<daylight>Tšoibalsan kesäaika</daylight>
 				</long>
 			</metazone>
@@ -1875,93 +2897,189 @@
 					<standard>Kookossaarten aika</standard>
 				</long>
 			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>Kolumbian aika</generic>
+					<standard>Kolumbian normaaliaika</standard>
+					<daylight>Kolumbian kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>Cookinsaarten aika</generic>
+					<standard>Cookinsaarten normaaliaika</standard>
+					<daylight>Cookinsaarten kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>Kuuban aika</generic>
+					<standard>Kuuban normaaliaika</standard>
+					<daylight>Kuuban kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>Davisin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>Dumont-d'Urvillen aika</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>Itä-Timorin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>Pääsiäissaaren aika</generic>
+					<standard>Pääsiäissaaren normaaliaika</standard>
+					<daylight>Pääsiäissaaren kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>Ecuadorin aika</standard>
+				</long>
+			</metazone>
 			<metazone type="Europe_Central">
 				<long>
+					<generic>Keski-Euroopan aika</generic>
 					<standard>Keski-Euroopan normaaliaika</standard>
 					<daylight>Keski-Euroopan kesäaika</daylight>
 				</long>
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
+					<generic>Itä-Euroopan aika</generic>
 					<standard>Itä-Euroopan normaaliaika</standard>
 					<daylight>Itä-Euroopan kesäaika</daylight>
 				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<standard>Länsi-Euroopan aika</standard>
+					<generic>Länsi-Euroopan aika</generic>
+					<standard>Länsi-Euroopan normaaliaika</standard>
 					<daylight>Länsi-Euroopan kesäaika</daylight>
 				</long>
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
+					<generic>Falklandinsaarten aika</generic>
+					<standard>Falklandinsaarten normaaliaika</standard>
 					<daylight>Falklandinsaarten kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>Fidžin aika</generic>
+					<standard>Fidžin normaaliaika</standard>
+					<daylight>Fidžin kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>Ranskan Guayanan aika</standard>
+				</long>
+			</metazone>
 			<metazone type="French_Southern">
 				<long>
 					<standard>Ranskan eteläisten ja antarktisten alueiden aika</standard>
 				</long>
 			</metazone>
-			<metazone type="Frunze">
+			<metazone type="Galapagos">
 				<long>
-					<standard>Biškekin aika</standard>
-					<daylight>Biškekin kesäaika</daylight>
+					<standard>Galápagossaarten aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>Gambierin aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<standard>Georgian aika</standard>
+					<generic>Georgian aika</generic>
+					<standard>Georgian normaaliaika</standard>
 					<daylight>Georgian kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>Gilbertsaarten aika</standard>
+				</long>
+			</metazone>
 			<metazone type="GMT">
 				<long>
 					<standard>Greenwichin normaaliaika</standard>
 				</long>
-				<short>
-					<standard>GMT</standard>
-				</short>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>Itä-Grönlannin aika</generic>
+					<standard>Itä-Grönlannin normaaliaika</standard>
+					<daylight>Itä-Grönlannin kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>Länsi-Grönlannin aika</generic>
+					<standard>Länsi-Grönlannin normaaliaika</standard>
+					<daylight>Länsi-Grönlannin kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Guam">
+				<long>
+					<standard>Guamin aika</standard>
+				</long>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
 					<standard>Arabiemiirikuntien normaaliaika</standard>
 				</long>
-				<short>
-					<generic>GT</generic>
-				</short>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>Guyanan aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>Havaijin-Aleuttien aika</generic>
+					<standard>Havaijin-Aleuttien normaaliaika</standard>
+					<daylight>Havaijin-Aleuttien kesäaika</daylight>
+				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<standard>Hongkongin aika</standard>
+					<generic>Hongkongin aika</generic>
+					<standard>Hongkongin normaaliaika</standard>
 					<daylight>Hongkongin kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
+					<generic>Hovdin aika</generic>
+					<standard>Hovdin normaaliaika</standard>
 					<daylight>Hovdin kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard>Intian normaaliaika</standard>
+					<standard>Intian aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>Intian valtameren aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Indochina">
 				<long>
-					<standard>In</standard>
+					<standard>Indokiinan aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Central">
@@ -1979,45 +3097,73 @@
 					<standard>Länsi-Indonesian aika</standard>
 				</long>
 			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>Iranin aika</generic>
+					<standard>Iranin normaaliaika</standard>
+					<daylight>Iranin kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>Irkutskin aika</generic>
+					<standard>Irkutskin normaaliaika</standard>
+					<daylight>Irkutskin kesäaika</daylight>
+				</long>
+			</metazone>
 			<metazone type="Israel">
 				<long>
+					<generic>Israelin aika</generic>
 					<standard>Israelin normaaliaika</standard>
 					<daylight>Israelin kesäaika</daylight>
 				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
 			</metazone>
 			<metazone type="Japan">
 				<long>
+					<generic>Japanin aika</generic>
 					<standard>Japanin normaaliaika</standard>
 					<daylight>Japanin kesäaika</daylight>
 				</long>
 			</metazone>
-			<metazone type="Karachi">
+			<metazone type="Kamchatka">
 				<long>
-					<standard>Karachin aika</standard>
+					<generic>Kamtšatkan aika</generic>
+					<standard>Kamtšatkan normaaliaika</standard>
+					<daylight>Kamtšatkan kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>Itä-Kazakstanin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>Länsi-Kazakstanin aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Korea">
 				<long>
 					<generic>Korean aika</generic>
 					<standard>Korean normaaliaika</standard>
+					<daylight>Korean kesäaika</daylight>
 				</long>
-				<short>
-					<generic>KT</generic>
-				</short>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>Kosraen aika</standard>
+				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
-					<standard>Krasnojarskin aika</standard>
+					<generic>Krasnojarskin aika</generic>
+					<standard>Krasnojarskin normaaliaika</standard>
 					<daylight>Krasnojarskin kesäaika</daylight>
 				</long>
 			</metazone>
-			<metazone type="Kuybyshev">
+			<metazone type="Kyrgystan">
 				<long>
-					<standard>Kuybyshevin aika</standard>
-					<daylight>Kuybyshevin kesäaika</daylight>
+					<standard>Kirgisian aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Lanka">
@@ -2025,24 +3171,40 @@
 					<standard>Sri Lankan aika</standard>
 				</long>
 			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>Linesaarten aika</standard>
+				</long>
+			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
 					<generic>Lord Howen aika</generic>
 					<standard>Lord Howen normaaliaika</standard>
 					<daylight>Lord Howen kesäaika</daylight>
 				</long>
-				<short>
-					<generic>LHT</generic>
-				</short>
 			</metazone>
 			<metazone type="Macau">
 				<long>
+					<generic>Macaon aika</generic>
+					<standard>Macaon normaaliaika</standard>
 					<daylight>Macaon kesäaika</daylight>
 				</long>
 			</metazone>
-			<metazone type="Malaya">
+			<metazone type="Macquarie">
+				<long>
+					<standard>Macquariensaaren aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
 				<long>
-					<standard>Malaijan aika</standard>
+					<generic>Magadanin aika</generic>
+					<standard>Magadanin normaaliaika</standard>
+					<daylight>Magadanin kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>Malesian aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Maldives">
@@ -2050,13 +3212,32 @@
 					<standard>Malediivien aika</standard>
 				</long>
 			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>Marquesasin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>Marshallinsaarten aika</standard>
+				</long>
+			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<standard>Mauritiuksen aika</standard>
+					<generic>Mauritiuksen aika</generic>
+					<standard>Mauritiuksen normaaliaika</standard>
+					<daylight>Mauritiuksen kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>Mawsonin aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
+					<generic>Ulan Batorin aika</generic>
+					<standard>Ulan Batorin normaaliaika</standard>
 					<daylight>Ulan Batorin kesäaika</daylight>
 				</long>
 			</metazone>
@@ -2069,7 +3250,12 @@
 			</metazone>
 			<metazone type="Myanmar">
 				<long>
-					<standard>Myanmarin aikaMa</standard>
+					<standard>Myanmarin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>Naurun aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Nepal">
@@ -2077,174 +3263,405 @@
 					<standard>Nepalin aika</standard>
 				</long>
 			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>Uuden-Kaledonian aika</generic>
+					<standard>Uuden-Kaledonian normaaliaika</standard>
+					<daylight>Uuden-Kaledonian kesäaika</daylight>
+				</long>
+			</metazone>
 			<metazone type="New_Zealand">
 				<long>
+					<generic>Uuden-Seelannin aika</generic>
 					<standard>Uuden-Seelannin normaaliaika</standard>
+					<daylight>Uuden-Seelannin kesäaika</daylight>
 				</long>
-				<short>
-					<generic>NZT</generic>
-				</short>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
+					<generic>Newfoundlandin aika</generic>
 					<standard>Newfoundlandin normaaliaika</standard>
 					<daylight>Newfoundlandin kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>Niuen aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<standard>Norfolkinsaarten aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>Fernando de Noronhan aika</generic>
+					<standard>Fernando de Noronhan normaaliaika</standard>
+					<daylight>Fernando de Noronhan kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="North_Mariana">
+				<long>
+					<standard>Pohjois-Mariaanien aika</standard>
+				</long>
+			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
-					<standard>Novosibirskin aika</standard>
+					<generic>Novosibirskin aika</generic>
+					<standard>Novosibirskin normaaliaika</standard>
 					<daylight>Novosibirskin kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
-					<standard>Omskin aika</standard>
+					<generic>Omskin aika</generic>
+					<standard>Omskin normaaliaika</standard>
 					<daylight>Omskin kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
-					<standard>Pakistanin aika</standard>
+					<generic>Pakistanin aika</generic>
+					<standard>Pakistanin normaaliaika</standard>
 					<daylight>Pakistanin kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>Palaun aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>Papua-Uuden-Guinean aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>Paraguayn aika</generic>
+					<standard>Paraguayn normaaliaika</standard>
+					<daylight>Paraguayn kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>Perun aika</generic>
+					<standard>Perun normaaliaika</standard>
+					<daylight>Perun kesäaika</daylight>
+				</long>
+			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<standard>Filippiinien aika</standard>
+					<generic>Filippiinien aika</generic>
+					<standard>Filippiinien normaaliaika</standard>
 					<daylight>Filippiinien kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>Phoenixsaarten aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>Saint-Pierren ja Miquelonin aika</generic>
+					<standard>Saint-Pierren ja Miquelonin normaaliaika</standard>
+					<daylight>Saint-Pierren ja Miquelonin kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>Pitcairnin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>Pohnpein aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Qyzylorda">
+				<long>
+					<generic>Qızılordan aika</generic>
+					<standard>Qızılordan normaaliaika</standard>
+					<daylight>Qızılordan kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>Réunionin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>Rotheran aika</standard>
+				</long>
+			</metazone>
 			<metazone type="Sakhalin">
 				<long>
-					<standard>Sahalinin aika</standard>
+					<generic>Sahalinin aika</generic>
+					<standard>Sahalinin normaaliaika</standard>
+					<daylight>Sahalinin kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samara">
 				<long>
-					<standard>Samaran aika</standard>
+					<generic>Samaran aika</generic>
+					<standard>Samaran normaaliaika</standard>
 					<daylight>Samaran kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>Samoan aika</generic>
+					<standard>Samoan normaaliaika</standard>
+					<daylight>Samoan kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>Seychellien aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>Singaporen aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>Salomonsaarten aika</standard>
+				</long>
+			</metazone>
 			<metazone type="South_Georgia">
 				<long>
 					<standard>Etelä-Georgian aika</standard>
 				</long>
 			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>Surinamin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>Syowan aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>Tahitin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>Taipein aika</generic>
+					<standard>Taipein normaaliaika</standard>
+					<daylight>Taipein kesäaika</daylight>
+				</long>
+			</metazone>
 			<metazone type="Tajikistan">
 				<long>
 					<standard>Tadžikistanin aika</standard>
 				</long>
 			</metazone>
-			<metazone type="Tashkent">
+			<metazone type="Tokelau">
 				<long>
-					<standard>Taškentin aika</standard>
-					<daylight>Taškentin kesäaika</daylight>
+					<standard>Tokelaun aika</standard>
 				</long>
 			</metazone>
-			<metazone type="Tbilisi">
+			<metazone type="Tonga">
 				<long>
-					<standard>Tbilisin aika</standard>
+					<generic>Tongan aika</generic>
+					<standard>Tongan normaaliaika</standard>
+					<daylight>Tongan kesäaika</daylight>
 				</long>
 			</metazone>
-			<metazone type="Turkey">
+			<metazone type="Truk">
 				<long>
-					<daylight>Turkin kesäaika</daylight>
+					<standard>Chuukin aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
-					<standard>Turkmenistanin aika</standard>
+					<generic>Turkmenistanin aika</generic>
+					<standard>Turkmenistanin normaaliaika</standard>
 					<daylight>Turkmenistanin kesäaika</daylight>
 				</long>
 			</metazone>
-			<metazone type="Uralsk">
+			<metazone type="Tuvalu">
 				<long>
-					<standard>Oralin aika</standard>
-					<daylight>Oralin kesäaika</daylight>
+					<standard>Tuvalun aika</standard>
 				</long>
 			</metazone>
-			<metazone type="Urumqi">
+			<metazone type="Uruguay">
 				<long>
-					<standard>Ürümqin aika</standard>
+					<generic>Uruguayn aika</generic>
+					<standard>Uruguayn normaaliaika</standard>
+					<daylight>Uruguayn kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<standard>Uzbekistanin aika</standard>
+					<generic>Uzbekistanin aika</generic>
+					<standard>Uzbekistanin normaaliaika</standard>
 					<daylight>Uzbekistanin kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>Vanuatun aika</generic>
+					<standard>Vanuatun normaaliaika</standard>
+					<daylight>Vanuatun kesäaika</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>Venezuelan aika</standard>
+				</long>
+			</metazone>
 			<metazone type="Vladivostok">
 				<long>
-					<standard>Vladivostokin aika</standard>
+					<generic>Vladivostokin aika</generic>
+					<standard>Vladivostokin normaaliaika</standard>
+					<daylight>Vladivostokin kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
-					<standard>Volgogradin aika</standard>
+					<generic>Volgogradin aika</generic>
+					<standard>Volgogradin normaaliaika</standard>
 					<daylight>Volgogradin kesäaika</daylight>
 				</long>
 			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>Vostokin aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>Waken aika</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>Wallisin ja Futunan aika</standard>
+				</long>
+			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<standard>Jakutskin aika</standard>
+					<generic>Jakutskin aika</generic>
+					<standard>Jakutskin normaaliaika</standard>
 					<daylight>Jakutskin kesäaika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<standard>Jekaterinburgin aika</standard>
+					<generic>Jekaterinburgin aika</generic>
+					<standard>Jekaterinburgin normaaliaika</standard>
 					<daylight>Jekaterinburgin kesäaika</daylight>
 				</long>
 			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Jerevanin aika</standard>
-					<daylight>Jerevanin kesäaika</daylight>
-				</long>
-			</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>
+			<minusSign>−</minusSign>
 			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>epäluku</nan>
 		</symbols>
-		<decimalFormats>
+		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
 				<decimalFormat>
 					<pattern>#,##0.###</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 tuhat</pattern>
+					<pattern type="1000" count="other">0 tuhatta</pattern>
+					<pattern type="10000" count="one">00 tuhatta</pattern>
+					<pattern type="10000" count="other">00 tuhatta</pattern>
+					<pattern type="100000" count="one">000 tuhatta</pattern>
+					<pattern type="100000" count="other">000 tuhatta</pattern>
+					<pattern type="1000000" count="one">0 miljoona</pattern>
+					<pattern type="1000000" count="other">0 miljoonaa</pattern>
+					<pattern type="10000000" count="one">00 miljoonaa</pattern>
+					<pattern type="10000000" count="other">00 miljoonaa</pattern>
+					<pattern type="100000000" count="one">000 miljoonaa</pattern>
+					<pattern type="100000000" count="other">000 miljoonaa</pattern>
+					<pattern type="1000000000" count="one">0 miljardi</pattern>
+					<pattern type="1000000000" count="other">0 miljardia</pattern>
+					<pattern type="10000000000" count="one">00 miljardia</pattern>
+					<pattern type="10000000000" count="other">00 miljardia</pattern>
+					<pattern type="100000000000" count="one">000 miljardia</pattern>
+					<pattern type="100000000000" count="other">000 miljardia</pattern>
+					<pattern type="1000000000000" count="one">0 biljoona</pattern>
+					<pattern type="1000000000000" count="other">0 biljoonaa</pattern>
+					<pattern type="10000000000000" count="one">00 biljoonaa</pattern>
+					<pattern type="10000000000000" count="other">00 biljoonaa</pattern>
+					<pattern type="100000000000000" count="one">000 biljoonaa</pattern>
+					<pattern type="100000000000000" count="other">000 biljoonaa</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 t'.'</pattern>
+					<pattern type="1000" count="other">0 t'.'</pattern>
+					<pattern type="10000" count="one">00 t'.'</pattern>
+					<pattern type="10000" count="other">00 t'.'</pattern>
+					<pattern type="100000" count="one">000 t'.'</pattern>
+					<pattern type="100000" count="other">000 t'.'</pattern>
+					<pattern type="1000000" count="one">0 milj'.'</pattern>
+					<pattern type="1000000" count="other">0 milj'.'</pattern>
+					<pattern type="10000000" count="one">00 milj'.'</pattern>
+					<pattern type="10000000" count="other">00 milj'.'</pattern>
+					<pattern type="100000000" count="one">000 milj'.'</pattern>
+					<pattern type="100000000" count="other">000 milj'.'</pattern>
+					<pattern type="1000000000" count="one">0 mrd'.'</pattern>
+					<pattern type="1000000000" count="other">0 mrd'.'</pattern>
+					<pattern type="10000000000" count="one">00 mrd'.'</pattern>
+					<pattern type="10000000000" count="other">00 mrd'.'</pattern>
+					<pattern type="100000000000" count="one">000 mrd'.'</pattern>
+					<pattern type="100000000000" count="other">000 mrd'.'</pattern>
+					<pattern type="1000000000000" count="one">0 bilj'.'</pattern>
+					<pattern type="1000000000000" count="other">0 bilj'.'</pattern>
+					<pattern type="10000000000000" count="one">00 bilj'.'</pattern>
+					<pattern type="10000000000000" count="other">00 bilj'.'</pattern>
+					<pattern type="100000000000000" count="one">000 bilj'.'</pattern>
+					<pattern type="100000000000000" count="other">000 bilj'.'</pattern>
+				</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 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -2264,14 +3681,18 @@
 			</currency>
 			<currency type="AFA">
 				<displayName>Afganistanin afgaani (1927–2002)</displayName>
-				<displayName count="one">Afganistanin afgaani (1927-2002)</displayName>
-				<displayName count="other">Afganistanin afgaania (1927-2002)</displayName>
+				<displayName count="one">Afganistanin afgaani (1927–2002)</displayName>
+				<displayName count="other">Afganistanin afgaania (1927–2002)</displayName>
 			</currency>
 			<currency type="AFN">
 				<displayName>Afganistanin afgaani</displayName>
 				<displayName count="one">Afganistanin afgaani</displayName>
 				<displayName count="other">Afganistanin afgaania</displayName>
-				<symbol>AFN</symbol>
+			</currency>
+			<currency type="ALK">
+				<displayName>Albanian lek (1946–1965)</displayName>
+				<displayName count="one">Albanian lek (1946–1965)</displayName>
+				<displayName count="other">Albanian lekiä (1946–1965)</displayName>
 			</currency>
 			<currency type="ALL">
 				<displayName>Albanian lek</displayName>
@@ -2287,16 +3708,14 @@
 				<displayName>Alankomaiden Antillien guldeni</displayName>
 				<displayName count="one">Alankomaiden Antillien guldeni</displayName>
 				<displayName count="other">Alankomaiden Antillien guldenia</displayName>
-				<symbol>ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>Angolan kwanza</displayName>
 				<displayName count="one">Angolan kwanza</displayName>
 				<displayName count="other">Angolan kwanzaa</displayName>
-				<symbol>AOA</symbol>
 			</currency>
 			<currency type="AOK">
-				<displayName>Angolan kwanza (1977–1990)</displayName>
+				<displayName>Angolan kwanza (1977–1991)</displayName>
 				<displayName count="one">Angolan kwanza (1977–1990)</displayName>
 				<displayName count="other">Angolan kwanzaa (1977–1990)</displayName>
 			</currency>
@@ -2314,13 +3733,16 @@
 				<displayName>Argentiinan austral</displayName>
 				<displayName count="one">Argentiinan austral</displayName>
 				<displayName count="other">Argentiinan australia</displayName>
-				<symbol>ARA</symbol>
 			</currency>
 			<currency type="ARL">
-				<symbol>ARL</symbol>
+				<displayName>Argentiinan ley-peso (1970–1983)</displayName>
+				<displayName count="one">Argentiinan ley-peso (1970–1983)</displayName>
+				<displayName count="other">Argentiinan ley-pesoa (1970–1983)</displayName>
 			</currency>
 			<currency type="ARM">
-				<symbol>ARM</symbol>
+				<displayName>Argentiinan peso (1881–1970)</displayName>
+				<displayName count="one">Argentiinan peso (1881–1970)</displayName>
+				<displayName count="other">Argentiinan pesoa (1881–1970)</displayName>
 			</currency>
 			<currency type="ARP">
 				<displayName>Argentiinan peso (1983–1985)</displayName>
@@ -2331,7 +3753,6 @@
 				<displayName>Argentiinan peso</displayName>
 				<displayName count="one">Argentiinan peso</displayName>
 				<displayName count="other">Argentiinan pesoa</displayName>
-				<symbol>ARS</symbol>
 			</currency>
 			<currency type="ATS">
 				<displayName>Itävallan šillinki</displayName>
@@ -2345,10 +3766,9 @@
 				<symbol>AUD</symbol>
 			</currency>
 			<currency type="AWG">
-				<displayName>Aruban guldeni</displayName>
-				<displayName count="one">Aruban guldeni</displayName>
-				<displayName count="other">Aruban guldenia</displayName>
-				<symbol>AWG</symbol>
+				<displayName>Aruban floriini</displayName>
+				<displayName count="one">Aruban floriini</displayName>
+				<displayName count="other">Aruban floriinia</displayName>
 			</currency>
 			<currency type="AZM">
 				<displayName>Azerbaidžanin manat (1993–2006)</displayName>
@@ -2359,30 +3779,31 @@
 				<displayName>Azerbaidžanin manat</displayName>
 				<displayName count="one">Azerbaidžanin manat</displayName>
 				<displayName count="other">Azerbaidžanin manatia</displayName>
-				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAD">
-				<displayName>Bosnia-Hertsegovinan dinaari</displayName>
-				<displayName count="one">Bosnia-Hertsegovinan dinaari</displayName>
-				<displayName count="other">Bosnia-Hertsegovinan dinaaria</displayName>
+				<displayName>Bosnia-Hertsegovinan dinaari (1992–1994)</displayName>
+				<displayName count="one">Bosnia-Hertsegovinan dinaari (1992–1994)</displayName>
+				<displayName count="other">Bosnia-Hertsegovinan dinaaria (1992–1994)</displayName>
 			</currency>
 			<currency type="BAM">
 				<displayName>Bosnia-Hertsegovinan vaihdettava markka</displayName>
 				<displayName count="one">Bosnia-Hertsegovinan vaihdettava markka</displayName>
 				<displayName count="other">Bosnia-Hertsegovinan vaihdettavaa markkaa</displayName>
-				<symbol>BAM</symbol>
+			</currency>
+			<currency type="BAN">
+				<displayName>Bosnia-Hertsegovinan uusi dinaari (1994–1997)</displayName>
+				<displayName count="one">Bosnia-Hertsegovinan uusi dinaari (1994–1997)</displayName>
+				<displayName count="other">Bosnia-Hertsegovinan uutta dinaaria (1994–1997)</displayName>
 			</currency>
 			<currency type="BBD">
 				<displayName>Barbadosin dollari</displayName>
 				<displayName count="one">Barbadosin dollari</displayName>
 				<displayName count="other">Barbadosin dollaria</displayName>
-				<symbol>BBD</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>Bangladeshin taka</displayName>
 				<displayName count="one">Bangladeshin taka</displayName>
 				<displayName count="other">Bangladeshin takaa</displayName>
-				<symbol>BDT</symbol>
 			</currency>
 			<currency type="BEC">
 				<displayName>Belgian vaihdettava frangi</displayName>
@@ -2393,7 +3814,6 @@
 				<displayName>Belgian frangi</displayName>
 				<displayName count="one">Belgian frangi</displayName>
 				<displayName count="other">Belgian frangia</displayName>
-				<symbol>BEF</symbol>
 			</currency>
 			<currency type="BEL">
 				<displayName>Belgian rahoitusfrangi</displayName>
@@ -2403,48 +3823,57 @@
 			<currency type="BGL">
 				<displayName>Bulgarian kova lev</displayName>
 				<displayName count="one">Bulgarian kova lev</displayName>
-				<displayName count="other">Bulgarian kovaa levaa</displayName>
+				<displayName count="other">Bulgarian kovaa leviä</displayName>
+			</currency>
+			<currency type="BGM">
+				<displayName>Bulgarian sosialistinen lev</displayName>
+				<displayName count="one">Bulgarian sosialistinen lev</displayName>
+				<displayName count="other">Bulgarian sosialistista leviä</displayName>
 			</currency>
 			<currency type="BGN">
-				<displayName>Bulgarian uusi lev</displayName>
-				<displayName count="one">Bulgarian uusi lev</displayName>
-				<displayName count="other">Bulgarian uutta levaa</displayName>
+				<displayName>Bulgarian lev</displayName>
+				<displayName count="one">Bulgarian lev</displayName>
+				<displayName count="other">Bulgarian leviä</displayName>
+			</currency>
+			<currency type="BGO">
+				<displayName>Bulgarian lev (1879–1952)</displayName>
+				<displayName count="one">Bulgarian lev (1879–1952)</displayName>
+				<displayName count="other">Bulgarian leviä (1879–1952)</displayName>
 			</currency>
 			<currency type="BHD">
 				<displayName>Bahrainin dinaari</displayName>
 				<displayName count="one">Bahrainin dinaari</displayName>
 				<displayName count="other">Bahrainin dinaaria</displayName>
-				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>Burundin frangi</displayName>
 				<displayName count="one">Burundin frangi</displayName>
 				<displayName count="other">Burundin frangia</displayName>
-				<symbol>BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>Bermudan dollari</displayName>
 				<displayName count="one">Bermudan dollari</displayName>
 				<displayName count="other">Bermudan dollaria</displayName>
-				<symbol>BMD</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>Brunein dollari</displayName>
 				<displayName count="one">Brunein dollari</displayName>
 				<displayName count="other">Brunein dollaria</displayName>
-				<symbol>BND</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>Bolivian boliviano</displayName>
 				<displayName count="one">Bolivian boliviano</displayName>
 				<displayName count="other">Bolivian bolivianoa</displayName>
-				<symbol>BOB</symbol>
+			</currency>
+			<currency type="BOL">
+				<displayName>Bolivian boliviano (1863–1963)</displayName>
+				<displayName count="one">Bolivian boliviano (1863–1963)</displayName>
+				<displayName count="other">Bolivian bolivianoa (1863–1963)</displayName>
 			</currency>
 			<currency type="BOP">
 				<displayName>Bolivian peso</displayName>
 				<displayName count="one">Bolivian peso</displayName>
 				<displayName count="other">Bolivian pesoa</displayName>
-				<symbol>BOP</symbol>
 			</currency>
 			<currency type="BOV">
 				<displayName>Bolivian mvdol</displayName>
@@ -2455,19 +3884,16 @@
 				<displayName>Brasilian uusi cruzeiro (1967–1986)</displayName>
 				<displayName count="one">Brasilian uusi cruzeiro (1967–1986)</displayName>
 				<displayName count="other">Brasilian uutta cruzeiroa (1967–1986)</displayName>
-				<symbol>BRB</symbol>
 			</currency>
 			<currency type="BRC">
-				<displayName>Brasilian cruzado</displayName>
-				<displayName count="one">Brasilian cruzado</displayName>
-				<displayName count="other">Brasilian cruzadoa</displayName>
-				<symbol>BRC</symbol>
+				<displayName>Brasilian cruzado (1986–1989)</displayName>
+				<displayName count="one">Brasilian cruzado (1986–1989)</displayName>
+				<displayName count="other">Brasilian cruzadoa (1986–1989)</displayName>
 			</currency>
 			<currency type="BRE">
 				<displayName>Brasilian cruzeiro (1990–1993)</displayName>
 				<displayName count="one">Brasilian cruzeiro (1990–1993)</displayName>
 				<displayName count="other">Brasilian cruzeiroa (1990–1993)</displayName>
-				<symbol>BRE</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>Brasilian real</displayName>
@@ -2476,31 +3902,29 @@
 				<symbol>BRL</symbol>
 			</currency>
 			<currency type="BRN">
-				<displayName>Brasilian uusi cruzado</displayName>
-				<displayName count="one">Brasilian uusi cruzado</displayName>
-				<displayName count="other">Brasilian uutta cruzadoa</displayName>
-				<symbol>BRN</symbol>
+				<displayName>Brasilian uusi cruzado (1989–1990)</displayName>
+				<displayName count="one">Brasilian uusi cruzado (1989–1990)</displayName>
+				<displayName count="other">Brasilian uutta cruzadoa (1989–1990)</displayName>
 			</currency>
 			<currency type="BRR">
-				<displayName>Brasilian cruzeiro</displayName>
-				<displayName count="one">Brasilian cruzeiro</displayName>
-				<displayName count="other">Brasilian cruzeiroa</displayName>
-				<symbol>BRR</symbol>
+				<displayName>Brasilian cruzeiro (1993–1994)</displayName>
+				<displayName count="one">Brasilian cruzeiro (1993–1994)</displayName>
+				<displayName count="other">Brasilian cruzeiroa (1993–1994)</displayName>
 			</currency>
 			<currency type="BRZ">
-				<symbol>BRZ</symbol>
+				<displayName>Brasilian cruzeiro (1942–1967)</displayName>
+				<displayName count="one">Brasilian cruzeiro (1942–1967)</displayName>
+				<displayName count="other">Brasilian cruzeiroa (1942–1967)</displayName>
 			</currency>
 			<currency type="BSD">
 				<displayName>Bahaman dollari</displayName>
 				<displayName count="one">Bahaman dollari</displayName>
 				<displayName count="other">Bahaman dollaria</displayName>
-				<symbol>BSD</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>Bhutanin ngultrum</displayName>
 				<displayName count="one">Bhutanin ngultrum</displayName>
 				<displayName count="other">Bhutanin ngultrumia</displayName>
-				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BUK">
 				<displayName>Burman kyat</displayName>
@@ -2526,7 +3950,6 @@
 				<displayName>Belizen dollari</displayName>
 				<displayName count="one">Belizen dollari</displayName>
 				<displayName count="other">Belizen dollaria</displayName>
-				<symbol>BZD</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>Kanadan dollari</displayName>
@@ -2548,7 +3971,6 @@
 				<displayName>Sveitsin frangi</displayName>
 				<displayName count="one">Sveitsin frangi</displayName>
 				<displayName count="other">Sveitsin frangia</displayName>
-				<symbol>CHF</symbol>
 			</currency>
 			<currency type="CHW">
 				<displayName>Sveitsin WIR-frangi</displayName>
@@ -2556,7 +3978,9 @@
 				<displayName count="other">Sveitsin WIR-frangia</displayName>
 			</currency>
 			<currency type="CLE">
-				<symbol>CLE</symbol>
+				<displayName>Chilen escudo</displayName>
+				<displayName count="one">Chilen escudo</displayName>
+				<displayName count="other">Chilen escudoa</displayName>
 			</currency>
 			<currency type="CLF">
 				<displayName>Chilen unidades de fomento</displayName>
@@ -2567,7 +3991,11 @@
 				<displayName>Chilen peso</displayName>
 				<displayName count="one">Chilen peso</displayName>
 				<displayName count="other">Chilen pesoa</displayName>
-				<symbol>CLP</symbol>
+			</currency>
+			<currency type="CNX">
+				<displayName>Kiinan kansanpankin dollari</displayName>
+				<displayName count="one">Kiinan kansanpankin dollari</displayName>
+				<displayName count="other">Kiinan kansanpankin dollaria</displayName>
 			</currency>
 			<currency type="CNY">
 				<displayName>Kiinan yuan</displayName>
@@ -2579,7 +4007,6 @@
 				<displayName>Kolumbian peso</displayName>
 				<displayName count="one">Kolumbian peso</displayName>
 				<displayName count="other">Kolumbian pesoa</displayName>
-				<symbol>COP</symbol>
 			</currency>
 			<currency type="COU">
 				<displayName>Kolumbian unidad de valor real</displayName>
@@ -2590,12 +4017,11 @@
 				<displayName>Costa Rican colon</displayName>
 				<displayName count="one">Costa Rican colon</displayName>
 				<displayName count="other">Costa Rican colonia</displayName>
-				<symbol>CRC</symbol>
 			</currency>
 			<currency type="CSD">
-				<displayName>Serbian vanha dinaari</displayName>
-				<displayName count="one">Serbian vanha dinaari</displayName>
-				<displayName count="other">Serbian vanhaa dinaaria</displayName>
+				<displayName>Serbian dinaari (2002–2006)</displayName>
+				<displayName count="one">Serbian dinaari (2002–2006)</displayName>
+				<displayName count="other">Serbian dinaaria (2002–2006)</displayName>
 			</currency>
 			<currency type="CSK">
 				<displayName>Tšekkoslovakian kova koruna</displayName>
@@ -2603,31 +4029,29 @@
 				<displayName count="other">Tšekkoslovakian kovaa korunaa</displayName>
 			</currency>
 			<currency type="CUC">
-				<symbol>CUC</symbol>
+				<displayName>Kuuban vaihdettava peso</displayName>
+				<displayName count="one">Kuuban vaihdettava peso</displayName>
+				<displayName count="other">Kuuban vaihdettavaa pesoa</displayName>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kuuban peso</displayName>
 				<displayName count="one">Kuuban peso</displayName>
 				<displayName count="other">Kuuban pesoa</displayName>
-				<symbol>CUP</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>Kap Verden escudo</displayName>
 				<displayName count="one">Kap Verden escudo</displayName>
 				<displayName count="other">Kap Verden escudoa</displayName>
-				<symbol>CVE</symbol>
 			</currency>
 			<currency type="CYP">
 				<displayName>Kyproksen punta</displayName>
 				<displayName count="one">Kyproksen punta</displayName>
 				<displayName count="other">Kyproksen puntaa</displayName>
-				<symbol>CYP</symbol>
 			</currency>
 			<currency type="CZK">
 				<displayName>Tšekin koruna</displayName>
 				<displayName count="one">Tšekin koruna</displayName>
 				<displayName count="other">Tšekin korunaa</displayName>
-				<symbol>CZK</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Itä-Saksan markka</displayName>
@@ -2638,31 +4062,26 @@
 				<displayName>Saksan markka</displayName>
 				<displayName count="one">Saksan markka</displayName>
 				<displayName count="other">Saksan markkaa</displayName>
-				<symbol>DEM</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>Djiboutin frangi</displayName>
 				<displayName count="one">Djiboutin frangi</displayName>
 				<displayName count="other">Djiboutin frangia</displayName>
-				<symbol>DJF</symbol>
 			</currency>
 			<currency type="DKK">
 				<displayName>Tanskan kruunu</displayName>
 				<displayName count="one">Tanskan kruunu</displayName>
 				<displayName count="other">Tanskan kruunua</displayName>
-				<symbol>Tkr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikaanisen tasavallan peso</displayName>
 				<displayName count="one">Dominikaanisen tasavallan peso</displayName>
 				<displayName count="other">Dominikaanisen tasavallan pesoa</displayName>
-				<symbol>DOP</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>Algerian dinaari</displayName>
 				<displayName count="one">Algerian dinaari</displayName>
 				<displayName count="other">Algerian dinaaria</displayName>
-				<symbol>DZD</symbol>
 			</currency>
 			<currency type="ECS">
 				<displayName>Ecuadorin sucre</displayName>
@@ -2678,24 +4097,21 @@
 				<displayName>Viron kruunu</displayName>
 				<displayName count="one">Viron kruunu</displayName>
 				<displayName count="other">Viron kruunua</displayName>
-				<symbol>EEK</symbol>
 			</currency>
 			<currency type="EGP">
 				<displayName>Egyptin punta</displayName>
 				<displayName count="one">Egyptin punta</displayName>
 				<displayName count="other">Egyptin puntaa</displayName>
-				<symbol>EGP</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrean nakfa</displayName>
 				<displayName count="one">Eritrean nakfa</displayName>
 				<displayName count="other">Eritrean nakfaa</displayName>
-				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ESA">
-				<displayName>Espanjan peseta (A-tili)</displayName>
-				<displayName count="one">Espanjan peseta (A-tili)</displayName>
-				<displayName count="other">Espanjan pesetaa (A-tili)</displayName>
+				<displayName>Espanjan peseta (A–tili)</displayName>
+				<displayName count="one">Espanjan peseta (A–tili)</displayName>
+				<displayName count="other">Espanjan pesetaa (A–tili)</displayName>
 			</currency>
 			<currency type="ESB">
 				<displayName>Espanjan peseta (vaihdettava tili)</displayName>
@@ -2706,18 +4122,17 @@
 				<displayName>Espanjan peseta</displayName>
 				<displayName count="one">Espanjan peseta</displayName>
 				<displayName count="other">Espanjan pesetaa</displayName>
-				<symbol>ESP</symbol>
 			</currency>
 			<currency type="ETB">
 				<displayName>Etiopian birr</displayName>
 				<displayName count="one">Etiopian birr</displayName>
 				<displayName count="other">Etiopian birriä</displayName>
-				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
 				<displayName>euro</displayName>
 				<displayName count="one">euro</displayName>
 				<displayName count="other">euroa</displayName>
+				<symbol>€</symbol>
 			</currency>
 			<currency type="FIM">
 				<displayName>Suomen markka</displayName>
@@ -2728,24 +4143,22 @@
 				<displayName>Fidžin dollari</displayName>
 				<displayName count="one">Fidžin dollari</displayName>
 				<displayName count="other">Fidžin dollaria</displayName>
-				<symbol>FJD</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>Falklandinsaarten punta</displayName>
 				<displayName count="one">Falklandinsaarten punta</displayName>
 				<displayName count="other">Falklandinsaarten puntaa</displayName>
-				<symbol>FKP</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Ranskan frangi</displayName>
 				<displayName count="one">Ranskan frangi</displayName>
 				<displayName count="other">Ranskan frangia</displayName>
-				<symbol>FRF</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>Englannin punta</displayName>
 				<displayName count="one">Englannin punta</displayName>
 				<displayName count="other">Englannin puntaa</displayName>
+				<symbol>£</symbol>
 			</currency>
 			<currency type="GEK">
 				<displayName>Georgian kuponkilari</displayName>
@@ -2761,19 +4174,16 @@
 				<displayName>Ghanan cedi (1979–2007)</displayName>
 				<displayName count="one">Ghanan cedi (1979–2007)</displayName>
 				<displayName count="other">Ghanan cediä (1979–2007)</displayName>
-				<symbol>GHC</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>Ghanan cedi</displayName>
 				<displayName count="one">Ghanan cedi</displayName>
 				<displayName count="other">Ghanan cediä</displayName>
-				<symbol>GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>Gibraltarin punta</displayName>
 				<displayName count="one">Gibraltarin punta</displayName>
 				<displayName count="other">Gibraltarin puntaa</displayName>
-				<symbol>GIP</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>Gambian dalasi</displayName>
@@ -2784,7 +4194,6 @@
 				<displayName>Guinean frangi</displayName>
 				<displayName count="one">Guinean frangi</displayName>
 				<displayName count="other">Guinean frangia</displayName>
-				<symbol>GNF</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guinean syli</displayName>
@@ -2792,15 +4201,14 @@
 				<displayName count="other">Guinean syliä</displayName>
 			</currency>
 			<currency type="GQE">
-				<displayName>Päiväntasaajan Guinean ekwele (–1986)</displayName>
-				<displayName count="one">Päiväntasaajan Guinean ekwele (–1986)</displayName>
-				<displayName count="other">Päiväntasaajan Guinean ekweleä (–1986)</displayName>
+				<displayName>Päiväntasaajan Guinean ekwele</displayName>
+				<displayName count="one">Päiväntasaajan Guinean ekwele</displayName>
+				<displayName count="other">Päiväntasaajan Guinean ekweleä</displayName>
 			</currency>
 			<currency type="GRD">
 				<displayName>Kreikan drakma</displayName>
 				<displayName count="one">Kreikan drakma</displayName>
 				<displayName count="other">Kreikan drakmaa</displayName>
-				<symbol>GRD</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>Guatemalan quetzal</displayName>
@@ -2821,7 +4229,6 @@
 				<displayName>Guyanan dollari</displayName>
 				<displayName count="one">Guyanan dollari</displayName>
 				<displayName count="other">Guyanan dollaria</displayName>
-				<symbol>GYD</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>Hongkongin dollari</displayName>
@@ -2843,7 +4250,6 @@
 				<displayName>Kroatian kuna</displayName>
 				<displayName count="one">Kroatian kuna</displayName>
 				<displayName count="other">Kroatian kunaa</displayName>
-				<symbol>HRK</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haitin gourde</displayName>
@@ -2854,30 +4260,26 @@
 				<displayName>Unkarin forintti</displayName>
 				<displayName count="one">Unkarin forintti</displayName>
 				<displayName count="other">Unkarin forinttia</displayName>
-				<symbol>HUF</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonesian rupia</displayName>
 				<displayName count="one">Indonesian rupia</displayName>
 				<displayName count="other">Indonesian rupiaa</displayName>
-				<symbol>IDR</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Irlannin punta</displayName>
 				<displayName count="one">Irlannin punta</displayName>
 				<displayName count="other">Irlannin puntaa</displayName>
-				<symbol>IEP</symbol>
 			</currency>
 			<currency type="ILP">
 				<displayName>Israelin punta</displayName>
 				<displayName count="one">Israelin punta</displayName>
 				<displayName count="other">Israelin puntaa</displayName>
-				<symbol>ILP</symbol>
 			</currency>
 			<currency type="ILR">
-				<displayName>Israelin vanha sekeli</displayName>
-				<displayName count="one">Israelin vanha sekeli</displayName>
-				<displayName count="other">Israelin vanhaa sekeliä</displayName>
+				<displayName>Israelin sekeli (1980–1985)</displayName>
+				<displayName count="one">Israelin sekeli (1980–1985)</displayName>
+				<displayName count="other">Israelin sekeliä (1980–1985)</displayName>
 			</currency>
 			<currency type="ILS">
 				<displayName>Israelin uusi sekeli</displayName>
@@ -2902,33 +4304,29 @@
 				<displayName count="other">Iranin rialia</displayName>
 			</currency>
 			<currency type="ISJ">
-				<displayName>Islannin vanha kruunu</displayName>
-				<displayName count="one">Islannin vanha kruunu</displayName>
-				<displayName count="other">Islannin vanhaa kruunua</displayName>
+				<displayName>Islannin kruunu (1918–1981)</displayName>
+				<displayName count="one">Islannin kruunu (1918–1981)</displayName>
+				<displayName count="other">Islannin kruunua (1918–1981)</displayName>
 			</currency>
 			<currency type="ISK">
 				<displayName>Islannin kruunu</displayName>
 				<displayName count="one">Islannin kruunu</displayName>
 				<displayName count="other">Islannin kruunua</displayName>
-				<symbol>ISK</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Italian liira</displayName>
 				<displayName count="one">Italian liira</displayName>
 				<displayName count="other">Italian liiraa</displayName>
-				<symbol>ITL</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>Jamaikan dollari</displayName>
 				<displayName count="one">Jamaikan dollari</displayName>
 				<displayName count="other">Jamaikan dollaria</displayName>
-				<symbol>JMD</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>Jordanian dinaari</displayName>
 				<displayName count="one">Jordanian dinaari</displayName>
 				<displayName count="other">Jordanian dinaaria</displayName>
-				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>Japanin jeni</displayName>
@@ -2940,7 +4338,6 @@
 				<displayName>Kenian šillinki</displayName>
 				<displayName count="one">Kenian šillinki</displayName>
 				<displayName count="other">Kenian šillinkiä</displayName>
-				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>Kirgisian som</displayName>
@@ -2956,13 +4353,21 @@
 				<displayName>Komorien frangi</displayName>
 				<displayName count="one">Komorien frangi</displayName>
 				<displayName count="other">Komorien frangia</displayName>
-				<symbol>KMF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Pohjois-Korean won</displayName>
 				<displayName count="one">Pohjois-Korean won</displayName>
 				<displayName count="other">Pohjois-Korean wonia</displayName>
-				<symbol>KPW</symbol>
+			</currency>
+			<currency type="KRH">
+				<displayName>Etelä-Korean hwan (1953–1962)</displayName>
+				<displayName count="one">Etelä-Korean hwan (1953–1962)</displayName>
+				<displayName count="other">Etelä-Korean hwania (1953–1962)</displayName>
+			</currency>
+			<currency type="KRO">
+				<displayName>Etelä-Korean won (1945–1953)</displayName>
+				<displayName count="one">Etelä-Korean won (1945–1953)</displayName>
+				<displayName count="other">Etelä-Korean wonia (1945–1953)</displayName>
 			</currency>
 			<currency type="KRW">
 				<displayName>Etelä-Korean won</displayName>
@@ -2974,13 +4379,11 @@
 				<displayName>Kuwaitin dinaari</displayName>
 				<displayName count="one">Kuwaitin dinaari</displayName>
 				<displayName count="other">Kuwaitin dinaaria</displayName>
-				<symbol>KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>Caymansaarten dollari</displayName>
 				<displayName count="one">Caymansaarten dollari</displayName>
 				<displayName count="other">Caymansaarten dollaria</displayName>
-				<symbol>KYD</symbol>
 			</currency>
 			<currency type="KZT">
 				<displayName>Kazakstanin tenge</displayName>
@@ -2991,25 +4394,21 @@
 				<displayName>Laosin kip</displayName>
 				<displayName count="one">Laosin kip</displayName>
 				<displayName count="other">Laosin kipiä</displayName>
-				<symbol>LAK</symbol>
 			</currency>
 			<currency type="LBP">
 				<displayName>Libanonin punta</displayName>
 				<displayName count="one">Libanonin punta</displayName>
 				<displayName count="other">Libanonin puntaa</displayName>
-				<symbol>LBP</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lankan rupia</displayName>
 				<displayName count="one">Sri Lankan rupia</displayName>
 				<displayName count="other">Sri Lankan rupiaa</displayName>
-				<symbol>LKR</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberian dollari</displayName>
 				<displayName count="one">Liberian dollari</displayName>
 				<displayName count="other">Liberian dollaria</displayName>
-				<symbol>LRD</symbol>
 			</currency>
 			<currency type="LSL">
 				<displayName>Lesothon loti</displayName>
@@ -3020,7 +4419,6 @@
 				<displayName>Liettuan liti</displayName>
 				<displayName count="one">Liettuan liti</displayName>
 				<displayName count="other">Liettuan litiä</displayName>
-				<symbol>LTL</symbol>
 			</currency>
 			<currency type="LTT">
 				<displayName>Liettuan talonas</displayName>
@@ -3046,7 +4444,6 @@
 				<displayName>Latvian lati</displayName>
 				<displayName count="one">Latvian lati</displayName>
 				<displayName count="other">Latvian latia</displayName>
-				<symbol>LVL</symbol>
 			</currency>
 			<currency type="LVR">
 				<displayName>Latvian rupla</displayName>
@@ -3057,7 +4454,6 @@
 				<displayName>Libyan dinaari</displayName>
 				<displayName count="one">Libyan dinaari</displayName>
 				<displayName count="other">Libyan dinaaria</displayName>
-				<symbol>LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>Marokon dirhami</displayName>
@@ -3069,6 +4465,16 @@
 				<displayName count="one">Marokon frangi</displayName>
 				<displayName count="other">Marokon frangia</displayName>
 			</currency>
+			<currency type="MCF">
+				<displayName>Monacon frangi</displayName>
+				<displayName count="one">Monacon frangi</displayName>
+				<displayName count="other">Monacon frangia</displayName>
+			</currency>
+			<currency type="MDC">
+				<displayName>Moldovan kuponkileu</displayName>
+				<displayName count="one">Moldovan kuponkileu</displayName>
+				<displayName count="other">Moldovan kuponkileuta</displayName>
+			</currency>
 			<currency type="MDL">
 				<displayName>Moldovan leu</displayName>
 				<displayName count="one">Moldovan leu</displayName>
@@ -3085,9 +4491,14 @@
 				<displayName count="other">Madagaskarin frangia</displayName>
 			</currency>
 			<currency type="MKD">
-				<displayName>Makedonian dinaari</displayName>
-				<displayName count="one">Makedonian dinaari</displayName>
-				<displayName count="other">Makedonian dinaaria</displayName>
+				<displayName>Makedonian denaari</displayName>
+				<displayName count="one">Makedonian denaari</displayName>
+				<displayName count="other">Makedonian denaaria</displayName>
+			</currency>
+			<currency type="MKN">
+				<displayName>Makedonian dinaari (1992–1993)</displayName>
+				<displayName count="one">Makedonian dinaari (1992–1993)</displayName>
+				<displayName count="other">Makedonian dinaaria (1992–1993)</displayName>
 			</currency>
 			<currency type="MLF">
 				<displayName>Malin frangi</displayName>
@@ -3103,60 +4514,52 @@
 				<displayName>Mongolian tugrik</displayName>
 				<displayName count="one">Mongolian tugrik</displayName>
 				<displayName count="other">Mongolian tugrikia</displayName>
-				<symbol>MNT</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>Macaon pataca</displayName>
 				<displayName count="one">Macaon pataca</displayName>
 				<displayName count="other">Macaon patacaa</displayName>
-				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>Mauritanian ouguiya</displayName>
 				<displayName count="one">Mauritanian ouguiya</displayName>
 				<displayName count="other">Mauritanian ouguiyaa</displayName>
-				<symbol>MRO</symbol>
 			</currency>
 			<currency type="MTL">
 				<displayName>Maltan liira</displayName>
 				<displayName count="one">Maltan liira</displayName>
 				<displayName count="other">Maltan liiraa</displayName>
-				<symbol>MTL</symbol>
 			</currency>
 			<currency type="MTP">
 				<displayName>Maltan punta</displayName>
 				<displayName count="one">Maltan punta</displayName>
 				<displayName count="other">Maltan puntaa</displayName>
-				<symbol>MTP</symbol>
 			</currency>
 			<currency type="MUR">
 				<displayName>Mauritiuksen rupia</displayName>
 				<displayName count="one">Mauritiuksen rupia</displayName>
 				<displayName count="other">Mauritiuksen rupiaa</displayName>
-				<symbol>MUR</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Malediivien rufiyaa</displayName>
 				<displayName count="one">Malediivien rufiyaa</displayName>
 				<displayName count="other">Malediivien rufiyaata</displayName>
-				<symbol>MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>Malawin kwacha</displayName>
 				<displayName count="one">Malawin kwacha</displayName>
 				<displayName count="other">Malawin kwachaa</displayName>
-				<symbol>MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>Meksikon peso</displayName>
 				<displayName count="one">Meksikon peso</displayName>
 				<displayName count="other">Meksikon pesoa</displayName>
+				<symbol>MXN</symbol>
 			</currency>
 			<currency type="MXP">
 				<displayName>Meksikon hopeapeso (1861–1992)</displayName>
 				<displayName count="one">Meksikon hopeapeso (1861–1992)</displayName>
 				<displayName count="other">Meksikon hopeapesoa (1861–1992)</displayName>
-				<symbol>MXP</symbol>
 			</currency>
 			<currency type="MXV">
 				<displayName>Meksikon UDI</displayName>
@@ -3167,7 +4570,6 @@
 				<displayName>Malesian ringgit</displayName>
 				<displayName count="one">Malesian ringgit</displayName>
 				<displayName count="other">Malesian ringgitiä</displayName>
-				<symbol>MYR</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mosambikin escudo</displayName>
@@ -3178,42 +4580,36 @@
 				<displayName>Mosambikin metical (1980–2006)</displayName>
 				<displayName count="one">Mosambikin metical (1980–2006)</displayName>
 				<displayName count="other">Mosambikin meticalia (1980–2006)</displayName>
-				<symbol>MZM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>Mosambikin metical</displayName>
 				<displayName count="one">Mosambikin metical</displayName>
 				<displayName count="other">Mosambikin meticalia</displayName>
-				<symbol>MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>Namibian dollari</displayName>
 				<displayName count="one">Namibian dollari</displayName>
 				<displayName count="other">Namibian dollaria</displayName>
-				<symbol>NAD</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>Nigerian naira</displayName>
 				<displayName count="one">Nigerian naira</displayName>
 				<displayName count="other">Nigerian nairaa</displayName>
-				<symbol>NGN</symbol>
 			</currency>
 			<currency type="NIC">
+				<displayName>Nicaraguan cordoba (1988–1991)</displayName>
+				<displayName count="one">Nicaraguan cordoba (1988–1991)</displayName>
+				<displayName count="other">Nicaraguan cordobaa (1988–1991)</displayName>
+			</currency>
+			<currency type="NIO">
 				<displayName>Nicaraguan cordoba</displayName>
 				<displayName count="one">Nicaraguan cordoba</displayName>
 				<displayName count="other">Nicaraguan cordobaa</displayName>
 			</currency>
-			<currency type="NIO">
-				<displayName>Nicaraguan kultacordoba</displayName>
-				<displayName count="one">Nicaraguan kultacordoba</displayName>
-				<displayName count="other">Nicaraguan kultacordobaa</displayName>
-				<symbol>NIO</symbol>
-			</currency>
 			<currency type="NLG">
 				<displayName>Alankomaiden guldeni</displayName>
 				<displayName count="one">Alankomaiden guldeni</displayName>
 				<displayName count="other">Alankomaiden guldenia</displayName>
-				<symbol>NLG</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>Norjan kruunu</displayName>
@@ -3224,7 +4620,6 @@
 				<displayName>Nepalin rupia</displayName>
 				<displayName count="one">Nepalin rupia</displayName>
 				<displayName count="other">Nepalin rupiaa</displayName>
-				<symbol>NPR</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Uuden-Seelannin dollari</displayName>
@@ -3241,24 +4636,21 @@
 				<displayName>Panaman balboa</displayName>
 				<displayName count="one">Panaman balboa</displayName>
 				<displayName count="other">Panaman balboaa</displayName>
-				<symbol>PAB</symbol>
 			</currency>
 			<currency type="PEI">
 				<displayName>Perun inti</displayName>
 				<displayName count="one">Perun inti</displayName>
 				<displayName count="other">Perun intiä</displayName>
-				<symbol>PEI</symbol>
 			</currency>
 			<currency type="PEN">
 				<displayName>Perun uusi sol</displayName>
 				<displayName count="one">Perun uusi sol</displayName>
 				<displayName count="other">Perun uutta solia</displayName>
-				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PES">
-				<displayName>Perun sol</displayName>
-				<displayName count="one">Perun sol</displayName>
-				<displayName count="other">Perun solia</displayName>
+				<displayName>Perun sol (1863–1965)</displayName>
+				<displayName count="one">Perun sol (1863–1965)</displayName>
+				<displayName count="other">Perun solia (1863–1965)</displayName>
 			</currency>
 			<currency type="PGK">
 				<displayName>Papua-Uuden-Guinean kina</displayName>
@@ -3269,19 +4661,16 @@
 				<displayName>Filippiinien peso</displayName>
 				<displayName count="one">Filippiinien peso</displayName>
 				<displayName count="other">Filippiinien pesoa</displayName>
-				<symbol>PHP</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>Pakistanin rupia</displayName>
 				<displayName count="one">Pakistanin rupia</displayName>
 				<displayName count="other">Pakistanin rupiaa</displayName>
-				<symbol>PKR</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Puolan zloty</displayName>
 				<displayName count="one">Puolan zloty</displayName>
 				<displayName count="other">Puolan zlotya</displayName>
-				<symbol>PLN</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Puolan zloty (1950–1995)</displayName>
@@ -3292,41 +4681,36 @@
 				<displayName>Portugalin escudo</displayName>
 				<displayName count="one">Portugalin escudo</displayName>
 				<displayName count="other">Portugalin escudoa</displayName>
-				<symbol>PTE</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>Paraguayn guarani</displayName>
 				<displayName count="one">Paraguayn guarani</displayName>
 				<displayName count="other">Paraguayn guarania</displayName>
-				<symbol>PYG</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>Qatarin rial</displayName>
 				<displayName count="one">Qatarin rial</displayName>
 				<displayName count="other">Qatarin rialia</displayName>
-				<symbol>QAR</symbol>
 			</currency>
 			<currency type="RHD">
 				<displayName>Rhodesian dollari</displayName>
 				<displayName count="one">Rhodesian dollari</displayName>
 				<displayName count="other">Rhodesian dollaria</displayName>
-				<symbol>RHD</symbol>
 			</currency>
 			<currency type="ROL">
-				<displayName>Romanian vanha leu</displayName>
-				<displayName count="one">Romanian vanha leu</displayName>
-				<displayName count="other">Romanian vanhaa leuta</displayName>
+				<displayName>Romanian leu (1952–2006)</displayName>
+				<displayName count="one">Romanian leu (1952–2006)</displayName>
+				<displayName count="other">Romanian leuta (1952–2006)</displayName>
 			</currency>
 			<currency type="RON">
-				<displayName>Romanian uusi leu</displayName>
-				<displayName count="one">Romanian uusi leu</displayName>
-				<displayName count="other">Romanian uutta leuta</displayName>
+				<displayName>Romanian leu</displayName>
+				<displayName count="one">Romanian leu</displayName>
+				<displayName count="other">Romanian leuta</displayName>
 			</currency>
 			<currency type="RSD">
 				<displayName>Serbian dinaari</displayName>
 				<displayName count="one">Serbian dinaari</displayName>
 				<displayName count="other">Serbian dinaaria</displayName>
-				<symbol>RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>Venäjän rupla</displayName>
@@ -3342,31 +4726,26 @@
 				<displayName>Ruandan frangi</displayName>
 				<displayName count="one">Ruandan frangi</displayName>
 				<displayName count="other">Ruandan frangia</displayName>
-				<symbol>RWF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saudi-Arabian rial</displayName>
 				<displayName count="one">Saudi-Arabian rial</displayName>
 				<displayName count="other">Saudi-Arabian rialia</displayName>
-				<symbol>SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>Salomonsaarten dollari</displayName>
 				<displayName count="one">Salomonsaarten dollari</displayName>
 				<displayName count="other">Salomonsaarten dollaria</displayName>
-				<symbol>SBD</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>Seychellien rupia</displayName>
 				<displayName count="one">Seychellien rupia</displayName>
 				<displayName count="other">Seychellien rupiaa</displayName>
-				<symbol>SCR</symbol>
 			</currency>
 			<currency type="SDD">
-				<displayName>Sudanin dinaari</displayName>
-				<displayName count="one">Sudanin dinaari</displayName>
-				<displayName count="other">Sudanin dinaaria</displayName>
-				<symbol>SDD</symbol>
+				<displayName>Sudanin dinaari (1992–2007)</displayName>
+				<displayName count="one">Sudanin dinaari (1992–2007)</displayName>
+				<displayName count="other">Sudanin dinaaria (1992–2007)</displayName>
 			</currency>
 			<currency type="SDG">
 				<displayName>Sudanin punta</displayName>
@@ -3374,27 +4753,24 @@
 				<displayName count="other">Sudanin puntaa</displayName>
 			</currency>
 			<currency type="SDP">
-				<displayName>Sudanin punta (1957–1999)</displayName>
-				<displayName count="one">Sudanin punta (1957–1999)</displayName>
-				<displayName count="other">Sudanin puntaa (1957–1999)</displayName>
+				<displayName>Sudanin punta (1957–1998)</displayName>
+				<displayName count="one">Sudanin punta (1957–1998)</displayName>
+				<displayName count="other">Sudanin puntaa (1957–1998)</displayName>
 			</currency>
 			<currency type="SEK">
 				<displayName>Ruotsin kruunu</displayName>
 				<displayName count="one">Ruotsin kruunu</displayName>
 				<displayName count="other">Ruotsin kruunua</displayName>
-				<symbol>Rkr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singaporen dollari</displayName>
 				<displayName count="one">Singaporen dollari</displayName>
 				<displayName count="other">Singaporen dollaria</displayName>
-				<symbol>SGD</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>Saint Helenan punta</displayName>
 				<displayName count="one">Saint Helenan punta</displayName>
 				<displayName count="other">Saint Helenan puntaa</displayName>
-				<symbol>SHP</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slovenian tolar</displayName>
@@ -3405,37 +4781,36 @@
 				<displayName>Slovakian koruna</displayName>
 				<displayName count="one">Slovakian koruna</displayName>
 				<displayName count="other">Slovakian korunaa</displayName>
-				<symbol>SKK</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>Sierra Leonen leone</displayName>
 				<displayName count="one">Sierra Leonen leone</displayName>
 				<displayName count="other">Sierra Leonen leonea</displayName>
-				<symbol>SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>Somalian šillinki</displayName>
 				<displayName count="one">Somalian šillinki</displayName>
 				<displayName count="other">Somalian šillinkiä</displayName>
-				<symbol>SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>Surinamin dollari</displayName>
 				<displayName count="one">Surinamin dollari</displayName>
 				<displayName count="other">Surinamin dollaria</displayName>
-				<symbol>SRD</symbol>
 			</currency>
 			<currency type="SRG">
 				<displayName>Surinamin guldeni</displayName>
 				<displayName count="one">Surinamin guldeni</displayName>
 				<displayName count="other">Surinamin guldenia</displayName>
-				<symbol>SRG</symbol>
+			</currency>
+			<currency type="SSP">
+				<displayName>Etelä-Sudanin punta</displayName>
+				<displayName count="one">Etelä-Sudanin punta</displayName>
+				<displayName count="other">Etelä-Sudanin puntaa</displayName>
 			</currency>
 			<currency type="STD">
 				<displayName>São Tomén ja Príncipen dobra</displayName>
 				<displayName count="one">São Tomén ja Príncipen dobra</displayName>
 				<displayName count="other">São Tomén ja Príncipen dobraa</displayName>
-				<symbol>STD</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Neuvostoliiton rupla</displayName>
@@ -3446,13 +4821,11 @@
 				<displayName>El Salvadorin colon</displayName>
 				<displayName count="one">El Salvadorin colon</displayName>
 				<displayName count="other">El Salvadorin colonia</displayName>
-				<symbol>SVC</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>Syyrian punta</displayName>
 				<displayName count="one">Syyrian punta</displayName>
 				<displayName count="other">Syyrian puntaa</displayName>
-				<symbol>SYP</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Swazimaan lilangeni</displayName>
@@ -3476,26 +4849,24 @@
 				<displayName count="other">Tadžikistanin somonia</displayName>
 			</currency>
 			<currency type="TMM">
+				<displayName>Turkmenistanin manat (1993–2009)</displayName>
+				<displayName count="one">Turkmenistanin manat (1993–2009)</displayName>
+				<displayName count="other">Turkmenistanin manatia (1993–2009)</displayName>
+			</currency>
+			<currency type="TMT">
 				<displayName>Turkmenistanin manat</displayName>
 				<displayName count="one">Turkmenistanin manat</displayName>
 				<displayName count="other">Turkmenistanin manatia</displayName>
 			</currency>
-			<currency type="TMT">
-				<displayName>Turkmenistanin uusi manat</displayName>
-				<displayName count="one">Turkmenistanin uusi manat</displayName>
-				<displayName count="other">Turkmenistanin uutta manatia</displayName>
-			</currency>
 			<currency type="TND">
 				<displayName>Tunisian dinaari</displayName>
 				<displayName count="one">Tunisian dinaari</displayName>
 				<displayName count="other">Tunisian dinaaria</displayName>
-				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>Tongan pa’anga</displayName>
 				<displayName count="one">Tongan pa’anga</displayName>
 				<displayName count="other">Tongan pa’angaa</displayName>
-				<symbol>TOP</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Timorin escudo</displayName>
@@ -3503,21 +4874,19 @@
 				<displayName count="other">Timorin escudoa</displayName>
 			</currency>
 			<currency type="TRL">
-				<displayName>Turkin vanha liira</displayName>
-				<displayName count="one">Turkin vanha liira</displayName>
-				<displayName count="other">Turkin vanhaa liiraa</displayName>
+				<displayName>Turkin liira (1922–2005)</displayName>
+				<displayName count="one">Turkin liira (1922–2005)</displayName>
+				<displayName count="other">Turkin liiraa (1922–2005)</displayName>
 			</currency>
 			<currency type="TRY">
 				<displayName>Turkin liira</displayName>
 				<displayName count="one">Turkin liira</displayName>
 				<displayName count="other">Turkin liiraa</displayName>
-				<symbol>TRY</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidadin ja Tobagon dollari</displayName>
 				<displayName count="one">Trinidadin ja Tobagon dollari</displayName>
 				<displayName count="other">Trinidadin ja Tobagon dollaria</displayName>
-				<symbol>TTD</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>Taiwanin uusi dollari</displayName>
@@ -3529,18 +4898,16 @@
 				<displayName>Tansanian šillinki</displayName>
 				<displayName count="one">Tansanian šillinki</displayName>
 				<displayName count="other">Tansanian šillinkiä</displayName>
-				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>Ukrainan hryvnia</displayName>
 				<displayName count="one">Ukrainan hryvnia</displayName>
 				<displayName count="other">Ukrainan hryvniaa</displayName>
-				<symbol>UAH</symbol>
 			</currency>
 			<currency type="UAK">
 				<displayName>Ukrainan karbovanetz</displayName>
 				<displayName count="one">Ukrainan karbovanetz</displayName>
-				<displayName count="other">Ukrainan karbovanetziä</displayName>
+				<displayName count="other">Ukrainan karbovanetzia</displayName>
 			</currency>
 			<currency type="UGS">
 				<displayName>Ugandan šillinki (1966–1987)</displayName>
@@ -3551,7 +4918,6 @@
 				<displayName>Ugandan šillinki</displayName>
 				<displayName count="one">Ugandan šillinki</displayName>
 				<displayName count="other">Ugandan šillinkiä</displayName>
-				<symbol>UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>Yhdysvaltain dollari</displayName>
@@ -3583,7 +4949,6 @@
 				<displayName>Uruguayn peso</displayName>
 				<displayName count="one">Uruguayn peso</displayName>
 				<displayName count="other">Uruguayn pesoa</displayName>
-				<symbol>UYU</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>Uzbekistanin som</displayName>
@@ -3591,16 +4956,14 @@
 				<displayName count="other">Uzbekistanin somia</displayName>
 			</currency>
 			<currency type="VEB">
+				<displayName>Venezuelan bolivar (1871–2008)</displayName>
+				<displayName count="one">Venezuelan bolivar (1871–2008)</displayName>
+				<displayName count="other">Venezuelan bolivaria (1871–2008)</displayName>
+			</currency>
+			<currency type="VEF">
 				<displayName>Venezuelan bolivar</displayName>
 				<displayName count="one">Venezuelan bolivar</displayName>
 				<displayName count="other">Venezuelan bolivaria</displayName>
-				<symbol>VEB</symbol>
-			</currency>
-			<currency type="VEF">
-				<displayName>Venezuelan bolivar fuerte</displayName>
-				<displayName count="one">Venezuelan bolivar fuerte</displayName>
-				<displayName count="other">Venezuelan bolivar fuertea</displayName>
-				<symbol>VEF</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnamin dong</displayName>
@@ -3608,23 +4971,26 @@
 				<displayName count="other">Vietnamin dongia</displayName>
 				<symbol>VND</symbol>
 			</currency>
+			<currency type="VNN">
+				<displayName>Vietnamin dong (1978–1985)</displayName>
+				<displayName count="one">Vietnamin dong (1978–1985)</displayName>
+				<displayName count="other">Vietnamin dongia (1978–1985)</displayName>
+			</currency>
 			<currency type="VUV">
 				<displayName>Vanuatun vatu</displayName>
 				<displayName count="one">Vanuatun vatu</displayName>
 				<displayName count="other">Vanuatun vatua</displayName>
-				<symbol>VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>Samoan tala</displayName>
 				<displayName count="one">Samoan tala</displayName>
 				<displayName count="other">Samoan talaa</displayName>
-				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
 				<displayName>CFA-frangi BEAC</displayName>
 				<displayName count="one">CFA-frangi BEAC</displayName>
 				<displayName count="other">CFA-frangia BEAC</displayName>
-				<symbol>XAF</symbol>
+				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
 				<displayName>hopea</displayName>
@@ -3660,6 +5026,7 @@
 				<displayName>Itä-Karibian dollari</displayName>
 				<displayName count="one">Itä-Karibian dollari</displayName>
 				<displayName count="other">Itä-Karibian dollaria</displayName>
+				<symbol>XCD</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>erityisnosto-oikeus (SDR)</displayName>
@@ -3685,6 +5052,7 @@
 				<displayName>CFA-frangi BCEAO</displayName>
 				<displayName count="one">CFA-frangi BCEAO</displayName>
 				<displayName count="other">CFA-frangia BCEAO</displayName>
+				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
 				<displayName>palladium</displayName>
@@ -3695,6 +5063,7 @@
 				<displayName>CFP-frangi</displayName>
 				<displayName count="one">CFP-frangi</displayName>
 				<displayName count="other">CFP-frangia</displayName>
+				<symbol>XPF</symbol>
 			</currency>
 			<currency type="XPT">
 				<displayName>platina</displayName>
@@ -3712,9 +5081,9 @@
 				<displayName count="other">testaustarkoitukseen varattua valuuttakoodia</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName>tuntematon tai virheellinen rahayksikkö</displayName>
-				<displayName count="one">tuntematon tai virheellinen rahayksikkö</displayName>
-				<displayName count="other">tuntematonta tai virheellistä rahayksikköä</displayName>
+				<displayName>tuntematon rahayksikkö</displayName>
+				<displayName count="one">tuntematon rahayksikkö</displayName>
+				<displayName count="other">tuntematonta rahayksikköä</displayName>
 			</currency>
 			<currency type="YDD">
 				<displayName>Jemenin dinaari</displayName>
@@ -3725,22 +5094,26 @@
 				<displayName>Jemenin rial</displayName>
 				<displayName count="one">Jemenin rial</displayName>
 				<displayName count="other">Jemenin rialia</displayName>
-				<symbol>YER</symbol>
 			</currency>
 			<currency type="YUD">
-				<displayName>Jugoslavian kova dinaari</displayName>
-				<displayName count="one">Jugoslavian kova dinaari</displayName>
-				<displayName count="other">Jugoslavian kovaa dinaaria</displayName>
+				<displayName>Jugoslavian kova dinaari (1966–1990)</displayName>
+				<displayName count="one">Jugoslavian kova dinaari (1966–1990)</displayName>
+				<displayName count="other">Jugoslavian kovaa dinaaria (1966–1990)</displayName>
 			</currency>
 			<currency type="YUM">
-				<displayName>Jugoslavian uusi dinaari</displayName>
-				<displayName count="one">Jugoslavian uusi dinaari</displayName>
-				<displayName count="other">Jugoslavian uutta dinaaria</displayName>
+				<displayName>Jugoslavian uusi dinaari (1994–2002)</displayName>
+				<displayName count="one">Jugoslavian uusi dinaari (1994–2002)</displayName>
+				<displayName count="other">Jugoslavian uutta dinaaria (1994–2002)</displayName>
 			</currency>
 			<currency type="YUN">
-				<displayName>Jugoslavian vaihdettava dinaari</displayName>
-				<displayName count="one">Jugoslavian vaihdettava dinaari</displayName>
-				<displayName count="other">Jugoslavian vaihdettavaa dinaaria</displayName>
+				<displayName>Jugoslavian vaihdettava dinaari (1990–1992)</displayName>
+				<displayName count="one">Jugoslavian vaihdettava dinaari (1990–1992)</displayName>
+				<displayName count="other">Jugoslavian vaihdettavaa dinaaria (1990–1992)</displayName>
+			</currency>
+			<currency type="YUR">
+				<displayName>Jugoslavian uudistettu dinaari (1992–1993)</displayName>
+				<displayName count="one">Jugoslavian uudistettu dinaari (1992–1993)</displayName>
+				<displayName count="other">Jugoslavian uudistettua dinaaria (1992–1993)</displayName>
 			</currency>
 			<currency type="ZAL">
 				<displayName>Etelä-Afrikan rahoitusrandi</displayName>
@@ -3751,30 +5124,31 @@
 				<displayName>Etelä-Afrikan randi</displayName>
 				<displayName count="one">Etelä-Afrikan randi</displayName>
 				<displayName count="other">Etelä-Afrikan randia</displayName>
-				<symbol>ZAR</symbol>
 			</currency>
 			<currency type="ZMK">
+				<displayName>Sambian kwacha (1968–2012)</displayName>
+				<displayName count="one">Sambian kwacha (1968–2012)</displayName>
+				<displayName count="other">Sambian kwachaa (1968–2012)</displayName>
+			</currency>
+			<currency type="ZMW">
 				<displayName>Sambian kwacha</displayName>
 				<displayName count="one">Sambian kwacha</displayName>
 				<displayName count="other">Sambian kwachaa</displayName>
-				<symbol>ZMK</symbol>
 			</currency>
 			<currency type="ZRN">
-				<displayName>Zairen uusi zaire</displayName>
-				<displayName count="one">Zairen uusi zaire</displayName>
-				<displayName count="other">Zairen uutta zairea</displayName>
-				<symbol>ZRN</symbol>
+				<displayName>Zairen uusi zaire (1993–1998)</displayName>
+				<displayName count="one">Zairen uusi zaire (1993–1998)</displayName>
+				<displayName count="other">Zairen uutta zairea (1993–1998)</displayName>
 			</currency>
 			<currency type="ZRZ">
-				<displayName>Zairen zaire</displayName>
-				<displayName count="one">Zairen zaire</displayName>
-				<displayName count="other">Zairen zairea</displayName>
+				<displayName>Zairen zaire (1971–1993)</displayName>
+				<displayName count="one">Zairen zaire (1971–1993)</displayName>
+				<displayName count="other">Zairen zairea (1971–1993)</displayName>
 			</currency>
 			<currency type="ZWD">
-				<displayName>Zimbabwen dollari</displayName>
-				<displayName count="one">Zimbabwen dollari</displayName>
-				<displayName count="other">Zimbabwen dollaria</displayName>
-				<symbol>ZWD</symbol>
+				<displayName>Zimbabwen dollari (1980–2008)</displayName>
+				<displayName count="one">Zimbabwen dollari (1980–2008)</displayName>
+				<displayName count="other">Zimbabwen dollaria (1980–2008)</displayName>
 			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabwen dollari (2009)</displayName>
@@ -3787,40 +5161,618 @@
 				<displayName count="other">Zimbabwen dollaria (2008)</displayName>
 			</currency>
 		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast">vähintään {0}</pattern>
+			<pattern type="range">{0}‒{1}</pattern>
+		</miscPatterns>
 	</numbers>
 	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} päivä</unitPattern>
-			<unitPattern count="other">{0} päivää</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} tunti</unitPattern>
-			<unitPattern count="other">{0} tuntia</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minuutti</unitPattern>
-			<unitPattern count="other">{0} minuuttia</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} kuukausi</unitPattern>
-			<unitPattern count="other">{0} kuukautta</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekunti</unitPattern>
-			<unitPattern count="other">{0} sekuntia</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} viikko</unitPattern>
-			<unitPattern count="other">{0} viikkoa</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} vuosi</unitPattern>
-			<unitPattern count="other">{0} vuotta</unitPattern>
-		</unit>
+		<unitLength type="long">
+			<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} kulmaminuutti</unitPattern>
+				<unitPattern count="other">{0} kulmaminuuttia</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<unitPattern count="one">{0} kulmasekunti</unitPattern>
+				<unitPattern count="other">{0} kulmasekuntia</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0} aste</unitPattern>
+				<unitPattern count="other">{0} astetta</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} eekkeri</unitPattern>
+				<unitPattern count="other">{0} eekkeriä</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="one">{0} hehtaari</unitPattern>
+				<unitPattern count="other">{0} hehtaaria</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} neliöjalka</unitPattern>
+				<unitPattern count="other">{0} neliöjalkaa</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} neliökilometri</unitPattern>
+				<unitPattern count="other">{0} neliökilometriä</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0} neliömetri</unitPattern>
+				<unitPattern count="other">{0} neliömetriä</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0} neliömaili</unitPattern>
+				<unitPattern count="other">{0} neliömailia</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<unitPattern count="one">{0} päivä</unitPattern>
+				<unitPattern count="other">{0} päivää</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="one">{0} tunti</unitPattern>
+				<unitPattern count="other">{0} tuntia</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<unitPattern count="one">{0} millisekunti</unitPattern>
+				<unitPattern count="other">{0} millisekuntia</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<unitPattern count="one">{0} minuutti</unitPattern>
+				<unitPattern count="other">{0} minuuttia</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one">{0} kuukausi</unitPattern>
+				<unitPattern count="other">{0} kuukautta</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<unitPattern count="one">{0} sekunti</unitPattern>
+				<unitPattern count="other">{0} sekuntia</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one">{0} viikko</unitPattern>
+				<unitPattern count="other">{0} viikkoa</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one">{0} vuosi</unitPattern>
+				<unitPattern count="other">{0} vuotta</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<unitPattern count="one">{0} senttimetri</unitPattern>
+				<unitPattern count="other">{0} senttimetriä</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} jalka</unitPattern>
+				<unitPattern count="other">{0} jalkaa</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} tuuma</unitPattern>
+				<unitPattern count="other">{0} tuumaa</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<unitPattern count="one">{0} kilometri</unitPattern>
+				<unitPattern count="other">{0} kilometriä</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} valovuosi</unitPattern>
+				<unitPattern count="other">{0} valovuotta</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<unitPattern count="one">{0} metri</unitPattern>
+				<unitPattern count="other">{0} metriä</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} maili</unitPattern>
+				<unitPattern count="other">{0} mailia</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<unitPattern count="one">{0} millimetri</unitPattern>
+				<unitPattern count="other">{0} millimetriä</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0} pikometri</unitPattern>
+				<unitPattern count="other">{0} pikometriä</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0} jaardi</unitPattern>
+				<unitPattern count="other">{0} jaardia</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="one">{0} gramma</unitPattern>
+				<unitPattern count="other">{0} grammaa</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<unitPattern count="one">{0} kilogramma</unitPattern>
+				<unitPattern count="other">{0} kilogrammaa</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} unssi</unitPattern>
+				<unitPattern count="other">{0} unssia</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} pauna</unitPattern>
+				<unitPattern count="other">{0} paunaa</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hevosvoima</unitPattern>
+				<unitPattern count="other">{0} hevosvoimaa</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="one">{0} kilowatti</unitPattern>
+				<unitPattern count="other">{0} kilowattia</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="one">{0} watti</unitPattern>
+				<unitPattern count="other">{0} wattia</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="one">{0} hehtopascal</unitPattern>
+				<unitPattern count="other">{0} hehtopascalia</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="one">{0} tuuma elohopeaa</unitPattern>
+				<unitPattern count="other">{0} tuumaa elohopeaa</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one">{0} millibaari</unitPattern>
+				<unitPattern count="other">{0} millibaaria</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<unitPattern count="one">{0} kilometri tunnissa</unitPattern>
+				<unitPattern count="other">{0} kilometriä tunnissa</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0} metri sekunnissa</unitPattern>
+				<unitPattern count="other">{0} metriä sekunnissa</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0} maili tunnissa</unitPattern>
+				<unitPattern count="other">{0} mailia tunnissa</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<unitPattern count="one">{0} celsiusaste</unitPattern>
+				<unitPattern count="other">{0} celsiusastetta</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<unitPattern count="one">{0} fahrenheitaste</unitPattern>
+				<unitPattern count="other">{0} fahrenheitastetta</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0} kuutiokilometri</unitPattern>
+				<unitPattern count="other">{0} kuutiokilometriä</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="one">{0} kuutiomaili</unitPattern>
+				<unitPattern count="other">{0} kuutiomailia</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="one">{0} litra</unitPattern>
+				<unitPattern count="other">{0} litraa</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}′</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-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<unitPattern count="one">{0} pv</unitPattern>
+				<unitPattern count="other">{0} pv</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</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} min</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one">{0} kk</unitPattern>
+				<unitPattern count="other">{0} kk</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} vk</unitPattern>
+				<unitPattern count="other">{0} vk</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one">{0} v</unitPattern>
+				<unitPattern count="other">{0} v</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} vv</unitPattern>
+				<unitPattern count="other">{0} vv</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} hv</unitPattern>
+				<unitPattern count="other">{0} hv</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} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0} mi/h</unitPattern>
+				<unitPattern count="other">{0} mi/h</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">
+			<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}′</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-kilometer">
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0}m²</unitPattern>
+				<unitPattern count="other">{0}m²</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<unitPattern count="one">{0}pv</unitPattern>
+				<unitPattern count="other">{0}pv</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="one">{0}t</unitPattern>
+				<unitPattern count="other">{0}t</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}min</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one">{0}kk</unitPattern>
+				<unitPattern count="other">{0}kk</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}vk</unitPattern>
+				<unitPattern count="other">{0}vk</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one">{0}v</unitPattern>
+				<unitPattern count="other">{0}v</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}vv</unitPattern>
+				<unitPattern count="other">{0}vv</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}hv</unitPattern>
+				<unitPattern count="other">{0}hv</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}″ Hg</unitPattern>
+				<unitPattern count="other">{0}″ Hg</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}km/h</unitPattern>
+				<unitPattern count="other">{0}km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0}m/s</unitPattern>
+				<unitPattern count="other">{0}m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0}mi/h</unitPattern>
+				<unitPattern count="other">{0}mi/h</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</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>
+		<durationUnit type="hm">
+			<durationUnitPattern>h.mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h.mm.ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m.ss</durationUnitPattern>
+		</durationUnit>
 	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} ja {1}</listPatternPart>
+			<listPatternPart type="2">{0} ja {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} ja {1}</listPatternPart>
+			<listPatternPart type="2">{0} ja {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start" draft="contributed">{0} {1}</listPatternPart>
+			<listPatternPart type="middle" draft="contributed">{0} {1}</listPatternPart>
+			<listPatternPart type="end" draft="contributed">{0} {1}</listPatternPart>
+			<listPatternPart type="2" draft="contributed">{0} {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{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>kyllä:kylla:k</yesstr>
+			<yesstr>kyllä:k</yesstr>
 			<nostr>ei:e</nostr>
 		</messages>
 	</posix>