< prev index next >

src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi.xml

Print this page

        

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

@@ -30,11 +33,11 @@
                         <language type="ain">ainu</language>
                         <language type="ak">akan</language>
                         <language type="akk">akkadi</language>
                         <language type="akz">alabama</language>
                         <language type="ale">aleutti</language>
-                        <language type="aln">geg</language>
+                        <language type="aln">gegi</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>

@@ -43,10 +46,11 @@
                         <language type="arc">valtakunnanaramea</language>
                         <language type="arn">mapudungun</language>
                         <language type="aro">araona</language>
                         <language type="arp">arapaho</language>
                         <language type="arq">algerianarabia</language>
+                        <language type="ars">arabia – najd</language>
                         <language type="arw">arawak</language>
                         <language type="ary">marokonarabia</language>
                         <language type="arz">egyptinarabia</language>
                         <language type="as">assami</language>
                         <language type="asa">asu</language>

@@ -121,10 +125,11 @@
                         <language type="cop">kopti</language>
                         <language type="cps">capiznon</language>
                         <language type="cr">cree</language>
                         <language type="crh">krimintataari</language>
                         <language type="crh" alt="secondary">kriminturkki</language>
+                        <language type="crs">seychellienkreoli</language>
                         <language type="cs">tšekki</language>
                         <language type="csb">kašubi</language>
                         <language type="cu">kirkkoslaavi</language>
                         <language type="cv">tšuvassi</language>
                         <language type="cy">kymri</language>

@@ -174,11 +179,11 @@
                         <language type="esu">alaskanjupik</language>
                         <language type="et">viro</language>
                         <language type="eu">baski</language>
                         <language type="ewo">ewondo</language>
                         <language type="ext">extremadura</language>
-                        <language type="fa">farsi</language>
+                        <language type="fa">persia</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>

@@ -188,11 +193,11 @@
                         <language type="fo">fääri</language>
                         <language type="fon">fon</language>
                         <language type="fr">ranska</language>
                         <language type="fr_CA">kanadanranska</language>
                         <language type="fr_CH">sveitsinranska</language>
-                        <language type="frc">cajun</language>
+                        <language type="frc">cajunranska</language>
                         <language type="frm">keskiranska</language>
                         <language type="fro">muinaisranska</language>
                         <language type="frp">arpitaani</language>
                         <language type="frr">pohjoisfriisi</language>
                         <language type="frs">itäfriisi</language>

@@ -337,10 +342,11 @@
                         <language type="lkt">lakota</language>
                         <language type="lmo">lombardi</language>
                         <language type="ln">lingala</language>
                         <language type="lo">lao</language>
                         <language type="lol">mongo</language>
+                        <language type="lou">louisianankreoli</language>
                         <language type="loz">lozi</language>
                         <language type="lrc">pohjoisluri</language>
                         <language type="lt">liettua</language>
                         <language type="ltg">latgalli</language>
                         <language type="lu">katanganluba</language>

@@ -384,11 +390,11 @@
                         <language type="mr">marathi</language>
                         <language type="mrj">vuorimari</language>
                         <language type="ms">malaiji</language>
                         <language type="mt">malta</language>
                         <language type="mua">mundang</language>
-                        <language type="mul">monia kieliä</language>
+                        <language type="mul">useita kieliä</language>
                         <language type="mus">creek</language>
                         <language type="mwl">mirandeesi</language>
                         <language type="mwr">marwari</language>
                         <language type="mwv">mentawai</language>
                         <language type="my">burma</language>

@@ -441,10 +447,11 @@
                         <language type="pal">pahlavi</language>
                         <language type="pam">pampanga</language>
                         <language type="pap">papiamentu</language>
                         <language type="pau">palau</language>
                         <language type="pcd">picardi</language>
+                        <language type="pcm">nigerianpidgin</language>
                         <language type="pdc">pennsylvaniansaksa</language>
                         <language type="pdt">plautdietsch</language>
                         <language type="peo">muinaispersia</language>
                         <language type="pfl">pfaltsi</language>
                         <language type="phn">foinikia</language>

@@ -586,11 +593,11 @@
                         <language type="udm">udmurtti</language>
                         <language type="ug">uiguuri</language>
                         <language type="uga">ugarit</language>
                         <language type="uk">ukraina</language>
                         <language type="umb">mbundu</language>
-                        <language type="und">määrittämätön kieli</language>
+                        <language type="und">tuntematon kieli</language>
                         <language type="ur">urdu</language>
                         <language type="uz">uzbekki</language>
                         <language type="vai">vai</language>
                         <language type="ve">venda</language>
                         <language type="vec">venetsia</language>

@@ -635,10 +642,11 @@
                         <language type="zun">zuni</language>
                         <language type="zxx">ei kielellistä sisältöä</language>
                         <language type="zza">zaza</language>
                 </languages>
                 <scripts>
+                        <script type="Adlm">fulanin adlam-aakkosto</script>
                         <script type="Afak">afaka</script>
                         <script type="Aghb">kaukasianalbanialainen</script>
                         <script type="Ahom">ahom</script>
                         <script type="Arab">arabialainen</script>
                         <script type="Arab" alt="variant">persialaisarabialainen</script>

@@ -648,10 +656,11 @@
                         <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="Bhks">sanskritin bhaiksuki-aakkosto</script>
                         <script type="Blis">bliss-symbolit</script>
                         <script type="Bopo">bopomofo</script>
                         <script type="Brah">brahmi</script>
                         <script type="Brai">braille-pistekirjoitus</script>
                         <script type="Bugi">bugilainen</script>

@@ -678,31 +687,34 @@
                         <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="Gonm" draft="contributed">masaram-gondi</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>
+                        <script type="Hanb">kiinan han ja bopomofo</script>
                         <script type="Hang">hangul</script>
                         <script type="Hani">kiinalainen han</script>
                         <script type="Hano">hanunoolainen</script>
-                        <script type="Hans">yksinkertaistettu han</script>
-                        <script type="Hans" alt="stand-alone">kiinalainen yksinkertaistettu han</script>
-                        <script type="Hant">perinteinen han</script>
-                        <script type="Hant" alt="stand-alone">kiinalainen perinteinen han</script>
+                        <script type="Hans">yksinkertaistettu</script>
+                        <script type="Hans" alt="stand-alone">yksinkertaistettu han</script>
+                        <script type="Hant">perinteinen</script>
+                        <script type="Hant" alt="stand-alone">perinteinen han</script>
                         <script type="Hatr">hatralainen</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="Hrkt">japanin tavumerkistöt</script>
                         <script type="Hung">muinaisunkarilainen</script>
                         <script type="Inds">induslainen</script>
                         <script type="Ital">muinaisitalialainen</script>
+                        <script type="Jamo">korean hangulin jamo-elementit</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>

@@ -727,10 +739,11 @@
                         <script type="Lyci">lyykialainen</script>
                         <script type="Lydi">lyydialainen</script>
                         <script type="Mahj">mahajanilainen</script>
                         <script type="Mand">mandealainen</script>
                         <script type="Mani">manikealainen</script>
+                        <script type="Marc">tiibetiläinen marchan-kirjoitus</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>

@@ -742,17 +755,19 @@
                         <script type="Mtei" alt="secondary">meitei mayek</script>
                         <script type="Mult">multanilainen</script>
                         <script type="Mymr">burmalainen</script>
                         <script type="Narb">muinaispohjoisarabialainen</script>
                         <script type="Nbat">nabatealainen</script>
+                        <script type="Newa">newarin newa-tavukirjoitus</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="Osge">osagen aakkosto</script>
                         <script type="Osma">osmanjalainen</script>
                         <script type="Palm">palmyralainen</script>
                         <script type="Pauc">zotuallai</script>
                         <script type="Perm">muinaispermiläinen</script>
                         <script type="Phag">phags-pa</script>

@@ -774,10 +789,11 @@
                         <script type="Shrd">šarada</script>
                         <script type="Sidd">siddham-tavukirjoitus</script>
                         <script type="Sind">khudabadi</script>
                         <script type="Sinh">sinhalilainen</script>
                         <script type="Sora">sorang sompeng</script>
+                        <script type="Soyo" draft="contributed">soyombo-kirjaimisto</script>
                         <script type="Sund">sundalainen</script>
                         <script type="Sylo">syloti nagri</script>
                         <script type="Syrc">syyrialainen</script>
                         <script type="Syre">syyrialainen estrangelo-muunnelma</script>
                         <script type="Syrj">syyrialainen läntinen muunnelma</script>

@@ -804,12 +820,14 @@
                         <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="Zanb" draft="contributed">zanabazar-neliökirjaimisto</script>
                         <script type="Zinh">peritty</script>
                         <script type="Zmth">matemaattinen</script>
+                        <script type="Zsye">emoji-symbolit</script>
                         <script type="Zsym">symbolit</script>
                         <script type="Zxxx">kirjoittamaton</script>
                         <script type="Zyyy">määrittämätön</script>
                         <script type="Zzzz">tuntematon kirjoitusjärjestelmä</script>
                 </scripts>

@@ -841,10 +859,11 @@
                         <territory type="145">Länsi-Aasia</territory>
                         <territory type="150">Eurooppa</territory>
                         <territory type="151">Itä-Eurooppa</territory>
                         <territory type="154">Pohjois-Eurooppa</territory>
                         <territory type="155">Länsi-Eurooppa</territory>
+                        <territory type="202" draft="contributed">Saharan eteläpuolinen Afrikka</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>

@@ -903,10 +922,11 @@
                         <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="CZ" alt="variant">Tšekin tasavalta</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>

@@ -919,10 +939,11 @@
                         <territory type="EH">Länsi-Sahara</territory>
                         <territory type="ER">Eritrea</territory>
                         <territory type="ES">Espanja</territory>
                         <territory type="ET">Etiopia</territory>
                         <territory type="EU">Euroopan unioni</territory>
+                        <territory type="EZ">euroalue</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>

@@ -1064,11 +1085,11 @@
                         <territory type="SK">Slovakia</territory>
                         <territory type="SL">Sierra Leone</territory>
                         <territory type="SM">San Marino</territory>
                         <territory type="SN">Senegal</territory>
                         <territory type="SO">Somalia</territory>
-                        <territory type="SR">Surinam</territory>
+                        <territory type="SR">Suriname</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>

@@ -1092,10 +1113,12 @@
                         <territory type="TW">Taiwan</territory>
                         <territory type="TZ">Tansania</territory>
                         <territory type="UA">Ukraina</territory>
                         <territory type="UG">Uganda</territory>
                         <territory type="UM">Yhdysvaltain erillissaaret</territory>
+                        <territory type="UN">Yhdistyneet kansakunnat</territory>
+                        <territory type="UN" alt="short">YK</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>

@@ -1120,48 +1143,60 @@
                         <variant type="1994">sloveenin resian murteen yhdenmukaistettu oikeinkirjoitus</variant>
                         <variant type="1996">saksan uusi oikeinkirjoitus</variant>
                         <variant type="1606NICT">myöhäiskeskiranska</variant>
                         <variant type="1694ACAD">varhaisnykyranska</variant>
                         <variant type="1959ACAD">valkovenäjän virallinen oikeinkirjoitus</variant>
+                        <variant type="ABL1943">portugalin oikeinkirjoitus 1943</variant>
                         <variant type="ALALC97">amerikkalainen kirjastolatinaistus 1997</variant>
                         <variant type="ALUKU">alukun kreolimurre</variant>
+                        <variant type="AO1990">portugalin oikeinkirjoitussopimus 1990</variant>
                         <variant type="AREVELA">itäarmenialainen</variant>
                         <variant type="AREVMDA">länsiarmenialainen</variant>
                         <variant type="BAKU1926">yhtenäistetty turkkilainen latinalainen aakkosto</variant>
                         <variant type="BALANKA">aniin balankalaismurre</variant>
                         <variant type="BARLA">kapverdenkreolin barlaventolainen murreryhmä</variant>
+                        <variant type="BASICENG">Ogdenin perusenglanti</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="BOHORIC">sloveenin Bohorič-aakkosto</variant>
                         <variant type="BOONT">englannin boontling-murre</variant>
+                        <variant type="COLB1945">portugalin oikeinkirjoitus 1945</variant>
+                        <variant type="CORNU">englannin cornu-murre</variant>
                         <variant type="DAJNKO">sloveenin Dajnko-aakkosto</variant>
                         <variant type="EKAVSK">serbian ekavialainen ääntämys</variant>
                         <variant type="EMODENG">varhaisnykyenglanti</variant>
                         <variant type="FONIPA">kansainvälinen foneettinen aakkosto IPA</variant>
+                        <variant type="FONNAPA" draft="contributed">pohjoisamerikkalainen foneettinen aakkosto NAPA</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="IJEKAVSK">serbian ijekavialainen ääntämiys</variant>
+                        <variant type="HSISTEMO" draft="contributed">esperanton h-kirjoitus</variant>
+                        <variant type="IJEKAVSK">serbian ijekavialainen ääntämys</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="KOCIEWIE">puolan kociewielainen murre</variant>
-                        <variant type="KSCOR">kornin standardikirjoitus</variant>
+                        <variant type="KSCOR">kornin Kernowek-ortografia</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="METELKO">sloveenin Metelko-aakkosto</variant>
                         <variant type="MONOTON">monotoninen kreikka</variant>
                         <variant type="NDYUKA">ndyukan kreolimurre</variant>
                         <variant type="NEDIS">sloveenin natisonen murre</variant>
+                        <variant type="NEWFOUND">englannin newfoundlandilaismurre</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="OXENDICT">englannin Oxfordin sanakirjan oikeinkirjoitus</variant>
+                        <variant type="PAHAWH2" draft="contributed">pahawh-hmongin tavukirjoituksen toinen vaihe</variant>
+                        <variant type="PAHAWH3" draft="contributed">pahawh-hmongin tavukirjoituksen kolmas vaihe</variant>
+                        <variant type="PAHAWH4" draft="contributed">pahawh-hmongin tavukirjoituksen viimeinen vaihe</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>

@@ -1171,12 +1206,14 @@
                         <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="SIMPLE">yksinkertaistettu kielimuoto</variant>
                         <variant type="SOLBA">sloveenin resian Stolvizzan/Solbican alamurre</variant>
                         <variant type="SOTAV">kapverdenkreolin sotaventolainen murreryhmä</variant>
+                        <variant type="SPANGLIS" draft="contributed">spanglish</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>

@@ -1185,18 +1222,19 @@
                         <variant type="UNIFON">englannin foneeminen unifon-aakkosto</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>
+                        <variant type="XSISTEMO" draft="contributed">esperanton x-kirjoitus</variant>
                 </variants>
                 <keys>
                         <key type="calendar">kalenteri</key>
+                        <key type="cf">valuuttojen esitysmuoto</key>
                         <key type="colAlternate">symbolien lajittelu</key>
                         <key type="colBackwards">painomerkkien lajittelu</key>
                         <key type="colCaseFirst">isojen ja pienten kirjainten järjestys</key>
                         <key type="colCaseLevel">aakkoslajien lajittelu</key>
-                        <key type="colHiraganaQuaternary">kana-merkkien lajittelu</key>
                         <key type="collation">lajittelujärjestys</key>
                         <key type="colNormalization">lajittelun normalisointi</key>
                         <key type="colNumeric">numeroiden lajittelu</key>
                         <key type="colStrength">lajittelun taso</key>
                         <key type="currency">valuutta</key>

@@ -1204,11 +1242,10 @@
                         <key type="lb">rivinvaihtotyyli</key>
                         <key type="ms">mittajärjestelmä</key>
                         <key type="numbers">numerot</key>
                         <key type="timezone">aikavyöhyke</key>
                         <key type="va">maavalinnan muunnelma</key>
-                        <key type="variableTop">lajittelu symboleina</key>
                         <key type="x">yksityiskäyttö</key>
                 </keys>
                 <types>
                         <type key="calendar" type="buddhist">buddhalainen kalenteri</type>
                         <type key="calendar" type="chinese">kiinalainen kalenteri</type>

@@ -1226,21 +1263,21 @@
                         <type key="calendar" type="islamic-umalqura">islamilainen Umm al-Qura -kalenteri</type>
                         <type key="calendar" type="iso8601">ISO 8601 -kalenteri</type>
                         <type key="calendar" type="japanese">japanilainen kalenteri</type>
                         <type key="calendar" type="persian">persialainen kalenteri</type>
                         <type key="calendar" type="roc">Kiinan tasavallan kalenteri</type>
+                        <type key="cf" type="account">valuuttojen laskentatoimen esitysmuoto</type>
+                        <type key="cf" type="standard">valuuttojen vakioesitysmuoto</type>
                         <type key="colAlternate" type="non-ignorable">symbolit huomioiva lajittelu</type>
                         <type key="colAlternate" type="shifted">symbolit ohittava lajittelu</type>
                         <type key="colBackwards" type="no">painomerkkien normaali lajittelu</type>
                         <type key="colBackwards" type="yes">painomerkkien käänteinen lajittelu</type>
                         <type key="colCaseFirst" type="lower">pienet kirjaimet edeltävät isoja</type>
                         <type key="colCaseFirst" type="no">isojen ja pienten kirjainten normaalijärjestys</type>
                         <type key="colCaseFirst" type="upper">isot kirjaimet edeltävät pieniä</type>
                         <type key="colCaseLevel" type="no">isojen ja pienten kirjainten lajittelu yhdessä</type>
                         <type key="colCaseLevel" type="yes">isojen ja pienten kirjainten lajittelu erikseen</type>
-                        <type key="colHiraganaQuaternary" type="no">kana-merkkien lajittelu erillisinä</type>
-                        <type key="colHiraganaQuaternary" type="yes">kana-merkkien lajittelu tyypin mukaan</type>
                         <type key="collation" type="big5han">perinteinen kiinalainen järjestys Big5</type>
                         <type key="collation" type="compat">aiempi lajittelujärjestys yhteensopivuutta varten</type>
                         <type key="collation" type="dictionary">sanakirjajärjestys</type>
                         <type key="collation" type="ducet">Unicoden oletusjärjestys</type>
                         <type key="collation" type="emoji">emojien lajittelujärjestys</type>

@@ -1264,29 +1301,36 @@
                         <type key="colStrength" type="identical">kaikkien merkkien lajittelu</type>
                         <type key="colStrength" type="primary">vain peruskirjainten lajittelu</type>
                         <type key="colStrength" type="quaternary">painomerkit ja aakkoslajit tai merkkileveydet ja kana-merkit huomioiva lajittelu</type>
                         <type key="colStrength" type="secondary">painomerkit huomioiva lajittelu</type>
                         <type key="colStrength" type="tertiary">painomerkit ja aakkoslajit tai merkkileveydet huomioiva lajittelu</type>
+                        <type key="d0" type="fwidth">ideogrammin levyinen</type>
+                        <type key="d0" type="hwidth">ideogrammin puolikkaan levyinen</type>
+                        <type key="d0" type="npinyin">numeerinen muunnos</type>
                         <type key="hc" type="h11">12 tunnin järjestelmä (0–11)</type>
                         <type key="hc" type="h12">12 tunnin järjestelmä (1–12)</type>
                         <type key="hc" type="h23">24 tunnin järjestelmä (0–23)</type>
                         <type key="hc" type="h24">24 tunnin järjestelmä (1–24)</type>
                         <type key="lb" type="loose">väljä rivinvaihto</type>
                         <type key="lb" type="normal">normaali rivinvaihto</type>
                         <type key="lb" type="strict">tarkka rivinvaihto</type>
+                        <type key="m0" type="bgn">BGN-latinaistus</type>
+                        <type key="m0" type="ungegn">UNGEGN-latinaistus</type>
                         <type key="ms" type="metric">metrijärjestelmä</type>
                         <type key="ms" type="uksystem">brittiläinen mittajärjestelmä</type>
                         <type key="ms" type="ussystem">yhdysvaltalainen mittajärjestelmä</type>
+                        <type key="numbers" type="ahom">ahom-numerot</type>
                         <type key="numbers" type="arab">arabialaiset numerot</type>
                         <type key="numbers" type="arabext">laajennetut arabialaiset numerot</type>
                         <type key="numbers" type="armn">armenialaiset numerot</type>
                         <type key="numbers" type="armnlow">armenialaiset piennumerot</type>
                         <type key="numbers" type="bali">balilaiset numerot</type>
                         <type key="numbers" type="beng">bengalilaiset numerot</type>
                         <type key="numbers" type="brah">brahmilaiset numerot</type>
                         <type key="numbers" type="cakm">chakmalaiset numerot</type>
                         <type key="numbers" type="cham">cham-numerot</type>
+                        <type key="numbers" type="cyrl">kyrilliset numerot</type>
                         <type key="numbers" type="deva">devanagarinumerot</type>
                         <type key="numbers" type="ethi">etiopialaiset numerot</type>
                         <type key="numbers" type="finance">talousnumerot</type>
                         <type key="numbers" type="fullwide">ideografin levyiset numerot</type>
                         <type key="numbers" type="geor">georgialaiset numerot</type>

@@ -1298,10 +1342,11 @@
                         <type key="numbers" type="hans">yksinkertaistetut kiinalaiset numerot</type>
                         <type key="numbers" type="hansfin">yksinkertaistetut kiinalaiset talousnumerot</type>
                         <type key="numbers" type="hant">perinteiset kiinalaiset numerot</type>
                         <type key="numbers" type="hantfin">perinteiset kiinalaiset talousnumerot</type>
                         <type key="numbers" type="hebr">heprealaiset numerot</type>
+                        <type key="numbers" type="hmng">pahawh hmong -numerot</type>
                         <type key="numbers" type="java">jaavalaiset numerot</type>
                         <type key="numbers" type="jpan">japanilaiset numerot</type>
                         <type key="numbers" type="jpanfin">japanilaiset talousnumerot</type>
                         <type key="numbers" type="kali">kayah li -numerot</type>
                         <type key="numbers" type="khmr">khmeriläiset numerot</type>

@@ -1310,48 +1355,48 @@
                         <type key="numbers" type="lanatham">taithamin tham-numerot</type>
                         <type key="numbers" type="laoo">laolaiset numerot</type>
                         <type key="numbers" type="latn">länsimaiset numerot</type>
                         <type key="numbers" type="lepc">lepchanumerot</type>
                         <type key="numbers" type="limb">limbunumerot</type>
+                        <type key="numbers" type="mathbold">matemaattiset lihavoidut numerot</type>
+                        <type key="numbers" type="mathdbl">matemaattiset kaksoislyöntinumerot</type>
+                        <type key="numbers" type="mathmono">matemaattiset tasalevyiset numerot</type>
+                        <type key="numbers" type="mathsanb">matemaattiset pääteviivattomat lihavoidut numerot</type>
+                        <type key="numbers" type="mathsans">matemaattiset pääteviivattomat numerot</type>
                         <type key="numbers" type="mlym">malajalamilaiset numerot</type>
+                        <type key="numbers" type="modi">modi-numerot</type>
                         <type key="numbers" type="mong">mongolialaiset numerot</type>
+                        <type key="numbers" type="mroo">mro-numerot</type>
                         <type key="numbers" type="mtei">meetei mayek -numerot</type>
                         <type key="numbers" type="mymr">burmalaiset numerot</type>
                         <type key="numbers" type="mymrshan">myanmarin shan-numerot</type>
+                        <type key="numbers" type="mymrtlng">myanmarin tai laing -numerot</type>
                         <type key="numbers" type="native">kielen omat numerot</type>
                         <type key="numbers" type="nkoo">n’ko-numerot</type>
                         <type key="numbers" type="olck">ol chiki -numerot</type>
                         <type key="numbers" type="orya">orijalaiset numerot</type>
                         <type key="numbers" type="osma">osmanjalaiset numerot</type>
                         <type key="numbers" type="roman">roomalaiset numerot</type>
                         <type key="numbers" type="romanlow">roomalaiset piennumerot</type>
                         <type key="numbers" type="saur">saurashtra-numerot</type>
-                        <type key="numbers" type="shrd">šarida-numerot</type>
+                        <type key="numbers" type="shrd">šarada-numerot</type>
+                        <type key="numbers" type="sind">khutabadi-numerot</type>
+                        <type key="numbers" type="sinh">sinhalan lith-numerot</type>
                         <type key="numbers" type="sora">sora sompeng -numerot</type>
                         <type key="numbers" type="sund">sundalaiset numerot</type>
                         <type key="numbers" type="takr">takri-numerot</type>
                         <type key="numbers" type="talu">uudet tai lue -numerot</type>
                         <type key="numbers" type="taml">perinteiset tamilinumerot</type>
                         <type key="numbers" type="tamldec">tamilinumerot</type>
                         <type key="numbers" type="telu">telugulaiset numerot</type>
                         <type key="numbers" type="thai">thainumerot</type>
                         <type key="numbers" type="tibt">tiibetiläiset numerot</type>
+                        <type key="numbers" type="tirh">tirhuta-numerot</type>
                         <type key="numbers" type="traditional">perinteiset numerot</type>
                         <type key="numbers" type="vaii">vai-numerot</type>
+                        <type key="numbers" type="wara">varang kshiti -numerot</type>
                 </types>
-                <transformNames>
-                        <transformName type="BGN">BGN-latinaistus</transformName>
-                        <transformName type="Numeric">numeerinen muunnos</transformName>
-                        <transformName type="Tone">tooni</transformName>
-                        <transformName type="UNGEGN">UNGEGN-latinaistus</transformName>
-                        <transformName type="x-Accents">aksenttimerkit</transformName>
-                        <transformName type="x-Fullwidth">ideogrammin levyinen</transformName>
-                        <transformName type="x-Halfwidth">ideogrammin puolikkaan levyinen</transformName>
-                        <transformName type="x-Jamo">jamo</transformName>
-                        <transformName type="x-Pinyin">pinyin-latinaistus</transformName>
-                        <transformName type="x-Publishing">julkaisuvalinta</transformName>
-                </transformNames>
                 <measurementSystemNames>
                         <measurementSystemName type="metric">metrinen</measurementSystemName>
                         <measurementSystemName type="UK">brittiläinen</measurementSystemName>
                         <measurementSystemName type="US">amerikkalainen</measurementSystemName>
                 </measurementSystemNames>

@@ -1366,23 +1411,47 @@
                         <contextTransform type="uiListOrMenu">titlecase-firstword</contextTransform>
                 </contextTransformUsage>
                 <contextTransformUsage type="relative">
                         <contextTransform type="stand-alone">titlecase-firstword</contextTransform>
                 </contextTransformUsage>
+                <contextTransformUsage type="typographicNames">
+                        <contextTransform type="stand-alone">titlecase-firstword</contextTransform>
+                        <contextTransform type="uiListOrMenu">titlecase-firstword</contextTransform>
+                </contextTransformUsage>
         </contextTransforms>
         <characters>
                 <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="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">[‐ – , ; \: ! ? . … ’ ” » ( ) \[ \] § @ * / \\ \&amp; #]</exemplarCharacters>
+                <exemplarCharacters type="numbers">[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+                <exemplarCharacters type="punctuation">[\- ‐ – , ; \: ! ? . … ’ ” » ( ) \[ \] § @ * / \\ \&amp; #]</exemplarCharacters>
                 <ellipsis type="final">{0}…</ellipsis>
                 <ellipsis type="initial">…{0}</ellipsis>
                 <ellipsis type="medial">{0}…{1}</ellipsis>
                 <ellipsis type="word-final">{0}…</ellipsis>
                 <ellipsis type="word-initial">…{0}</ellipsis>
-                <ellipsis type="word-medial">{0}… {1}</ellipsis>
+                <ellipsis type="word-medial">{0}…{1}</ellipsis>
                 <moreInformation>?</moreInformation>
+                <parseLenients scope="date" level="lenient">
+                        <parseLenient sample="-" draft="contributed">[\--/]</parseLenient>
+                        <parseLenient sample=":" draft="contributed">[\:∶]</parseLenient>
+                </parseLenients>
+                <parseLenients scope="general" level="lenient">
+                        <parseLenient sample="." draft="contributed">[.․。︒﹒.。]</parseLenient>
+                        <parseLenient sample="$" draft="contributed">[\$﹩$$]</parseLenient>
+                        <parseLenient sample="£" draft="contributed">[£₤]</parseLenient>
+                        <parseLenient sample="₹" draft="contributed">[₨₹{Rp}{Rs}]</parseLenient>
+                </parseLenients>
+                <parseLenients scope="number" level="lenient">
+                        <parseLenient sample="-" draft="contributed">[\-‒⁻₋−➖﹣-]</parseLenient>
+                        <parseLenient sample="," draft="contributed">[,،٫、︐︑﹐﹑,、]</parseLenient>
+                        <parseLenient sample="+" draft="contributed">[+⁺₊➕﬩﹢+]</parseLenient>
+                </parseLenients>
+                <parseLenients scope="number" level="stricter">
+                        <parseLenient sample="," draft="contributed">[,٫︐﹐,]</parseLenient>
+                        <parseLenient sample="." draft="contributed">[.․﹒.。]</parseLenient>
+                </parseLenients>
         </characters>
         <delimiters>
                 <quotationStart>”</quotationStart>
                 <quotationEnd>”</quotationEnd>
                 <alternateQuotationStart>’</alternateQuotationStart>

@@ -1390,13 +1459,19 @@
         </delimiters>
         <dates>
                 <calendars>
                         <calendar type="buddhist">
                                 <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">buddhalainen aika</era>
+                                        </eraNames>
                                         <eraAbbr>
                                                 <era type="0">BE</era>
                                         </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">BE</era>
+                                        </eraNarrow>
                                 </eras>
                                 <dateFormats>
                                         <dateFormatLength type="full">
                                                 <dateFormat>
                                                         <pattern>cccc d. MMMM y G</pattern>

@@ -1430,19 +1505,22 @@
                                                 <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="MMMMd" draft="contributed">d. MMMM</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" draft="contributed">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" draft="contributed">cccc d. MMMM y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
                                                 <dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
                                         </availableFormats>
                                 </dateTimeFormats>
                         </calendar>

@@ -1488,10 +1566,174 @@
                                                 <dateFormatItem id="yyyyMMMd">d.M.y</dateFormatItem>
                                                 <dateFormatItem id="yyyyMMMEd">E d.M.y</dateFormatItem>
                                         </availableFormats>
                                 </dateTimeFormats>
                         </calendar>
+                        <calendar type="coptic">
+                                <months>
+                                        <monthContext type="format">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">thoutkuuta</month>
+                                                        <month type="2" draft="contributed">paopikuuta</month>
+                                                        <month type="3" draft="contributed">hathorkuuta</month>
+                                                        <month type="4" draft="contributed">koiakkuuta</month>
+                                                        <month type="5" draft="contributed">tobikuuta</month>
+                                                        <month type="6" draft="contributed">meshirkuuta</month>
+                                                        <month type="7" draft="contributed">paremhatkuuta</month>
+                                                        <month type="8" draft="contributed">paremoudekuuta</month>
+                                                        <month type="9" draft="contributed">pashonskuuta</month>
+                                                        <month type="10" draft="contributed">paonikuuta</month>
+                                                        <month type="11" draft="contributed">epipkuuta</month>
+                                                        <month type="12" draft="contributed">mesorikuuta</month>
+                                                        <month type="13" draft="contributed">pi-kogi-enavotkuuta</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">thoutkuuta</month>
+                                                        <month type="2" draft="contributed">paopikuuta</month>
+                                                        <month type="3" draft="contributed">hathorkuuta</month>
+                                                        <month type="4" draft="contributed">koiakkuuta</month>
+                                                        <month type="5" draft="contributed">tobikuuta</month>
+                                                        <month type="6" draft="contributed">meshirkuuta</month>
+                                                        <month type="7" draft="contributed">paremhatkuuta</month>
+                                                        <month type="8" draft="contributed">paremoudekuuta</month>
+                                                        <month type="9" draft="contributed">pashonskuuta</month>
+                                                        <month type="10" draft="contributed">paonikuuta</month>
+                                                        <month type="11" draft="contributed">epipkuuta</month>
+                                                        <month type="12" draft="contributed">mesorikuuta</month>
+                                                        <month type="13" draft="contributed">pi-kogi-enavotkuuta</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">thout</month>
+                                                        <month type="2" draft="contributed">paopi</month>
+                                                        <month type="3" draft="contributed">hathor</month>
+                                                        <month type="4" draft="contributed">koiak</month>
+                                                        <month type="5" draft="contributed">toba</month>
+                                                        <month type="6" draft="contributed">meshir</month>
+                                                        <month type="7" draft="contributed">paremhat</month>
+                                                        <month type="8" draft="contributed">paremoude</month>
+                                                        <month type="9" draft="contributed">pashons</month>
+                                                        <month type="10" draft="contributed">paoni</month>
+                                                        <month type="11" draft="contributed">epip</month>
+                                                        <month type="12" draft="contributed">mesori</month>
+                                                        <month type="13" draft="contributed">pi kogi enavot</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">thoutkuu</month>
+                                                        <month type="2" draft="contributed">paopikuu</month>
+                                                        <month type="3" draft="contributed">hathorkuu</month>
+                                                        <month type="4" draft="contributed">koiakkuu</month>
+                                                        <month type="5" draft="contributed">tobikuu</month>
+                                                        <month type="6" draft="contributed">meshirkuu</month>
+                                                        <month type="7" draft="contributed">paremhatkuu</month>
+                                                        <month type="8" draft="contributed">paremoudekuu</month>
+                                                        <month type="9" draft="contributed">pashonskuu</month>
+                                                        <month type="10" draft="contributed">paonikuu</month>
+                                                        <month type="11" draft="contributed">epipkuu</month>
+                                                        <month type="12" draft="contributed">mesorikuu</month>
+                                                        <month type="13" draft="contributed">pi-kogi-enavotkuu</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">ERA0</era>
+                                                <era type="1" draft="contributed">ERA1</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">ERA0</era>
+                                                <era type="1" draft="contributed">ERA1</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">ERA0</era>
+                                                <era type="1" draft="contributed">ERA1</era>
+                                        </eraNarrow>
+                                </eras>
+                        </calendar>
+                        <calendar type="ethiopic">
+                                <months>
+                                        <monthContext type="format">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">mäskärämkuuta</month>
+                                                        <month type="2" draft="contributed">ṭəqəmtkuuta</month>
+                                                        <month type="3" draft="contributed">ḫədarkuuta</month>
+                                                        <month type="4" draft="contributed">taḫśaśkuuta</month>
+                                                        <month type="5" draft="contributed">ṭərrkuuta</month>
+                                                        <month type="6" draft="contributed">yäkatitkuuta</month>
+                                                        <month type="7" draft="contributed">mägabitkuuta</month>
+                                                        <month type="8" draft="contributed">miyazyakuuta</month>
+                                                        <month type="9" draft="contributed">gənbotkuuta</month>
+                                                        <month type="10" draft="contributed">sänekuuta</month>
+                                                        <month type="11" draft="contributed">ḥamlekuuta</month>
+                                                        <month type="12" draft="contributed">nähasekuuta</month>
+                                                        <month type="13" draft="contributed">ṗagumenkuuta</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">mäskärämkuuta</month>
+                                                        <month type="2" draft="contributed">ṭəqəmtkuuta</month>
+                                                        <month type="3" draft="contributed">ḫədarkuuta</month>
+                                                        <month type="4" draft="contributed">taḫśaśkuuta</month>
+                                                        <month type="5" draft="contributed">ṭərrkuuta</month>
+                                                        <month type="6" draft="contributed">yäkatitkuuta</month>
+                                                        <month type="7" draft="contributed">mägabitkuuta</month>
+                                                        <month type="8" draft="contributed">miyazyakuuta</month>
+                                                        <month type="9" draft="contributed">gənbotkuuta</month>
+                                                        <month type="10" draft="contributed">sänekuuta</month>
+                                                        <month type="11" draft="contributed">ḥamlekuuta</month>
+                                                        <month type="12" draft="contributed">nähasekuuta</month>
+                                                        <month type="13" draft="contributed">ṗagumenkuuta</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1">mäskärämkuu</month>
+                                                        <month type="2">ṭəqəmtkuu</month>
+                                                        <month type="3">ḫədarkuu</month>
+                                                        <month type="4">taḫśaśkuu</month>
+                                                        <month type="5">ṭərrkuu</month>
+                                                        <month type="6">yäkatitkuu</month>
+                                                        <month type="7">mägabitkuu</month>
+                                                        <month type="8">miyazyakuu</month>
+                                                        <month type="9">gənbotkuu</month>
+                                                        <month type="10">sänekuu</month>
+                                                        <month type="11">ḥamlekuu</month>
+                                                        <month type="12">nähasekuu</month>
+                                                        <month type="13">ṗagumenkuu</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">mäskärämkuu</month>
+                                                        <month type="2" draft="contributed">ṭəqəmtkuu</month>
+                                                        <month type="3" draft="contributed">ḫədarkuu</month>
+                                                        <month type="4" draft="contributed">taḫśaśkuu</month>
+                                                        <month type="5" draft="contributed">ṭərrkuu</month>
+                                                        <month type="6" draft="contributed">yäkatitkuu</month>
+                                                        <month type="7" draft="contributed">mägabitkuu</month>
+                                                        <month type="8" draft="contributed">miyazyakuu</month>
+                                                        <month type="9" draft="contributed">gənbotkuu</month>
+                                                        <month type="10" draft="contributed">sänekuu</month>
+                                                        <month type="11" draft="contributed">ḥamlekuu</month>
+                                                        <month type="12" draft="contributed">nähasekuu</month>
+                                                        <month type="13" draft="contributed">ṗagumenkuu</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">ERA0</era>
+                                                <era type="1" draft="contributed">ERA1</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">ERA0</era>
+                                                <era type="1" draft="contributed">ERA1</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">ERA0</era>
+                                                <era type="1" draft="contributed">ERA1</era>
+                                        </eraNarrow>
+                                </eras>
+                        </calendar>
                         <calendar type="generic">
                                 <dateFormats>
                                         <dateFormatLength type="full">
                                                 <dateFormat>
                                                         <pattern>cccc d. MMMM y G</pattern>

@@ -1533,13 +1775,22 @@
                                                 <dateTimeFormat>
                                                         <pattern>{1} {0}</pattern>
                                                 </dateTimeFormat>
                                         </dateTimeFormatLength>
                                         <availableFormats>
+                                                <dateFormatItem id="Bh">h B</dateFormatItem>
+                                                <dateFormatItem id="Bhm">h.mm B</dateFormatItem>
+                                                <dateFormatItem id="Bhms">h.mm.ss B</dateFormatItem>
                                                 <dateFormatItem id="d">d</dateFormatItem>
                                                 <dateFormatItem id="E">ccc</dateFormatItem>
+                                                <dateFormatItem id="EBhm">E h.mm. B</dateFormatItem>
+                                                <dateFormatItem id="EBhms">E h.mm.ss B</dateFormatItem>
                                                 <dateFormatItem id="Ed">E d.</dateFormatItem>
+                                                <dateFormatItem id="Ehm">E h.mm a</dateFormatItem>
+                                                <dateFormatItem id="EHm">E HH.mm</dateFormatItem>
+                                                <dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
+                                                <dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
                                                 <dateFormatItem id="Gy">y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMM">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>

@@ -1552,11 +1803,11 @@
                                                 <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="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMd">d. MMMM</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>

@@ -1672,22 +1923,22 @@
                         </calendar>
                         <calendar type="gregorian">
                                 <months>
                                         <monthContext type="format">
                                                 <monthWidth type="abbreviated">
-                                                        <month type="1">tammikuuta</month>
-                                                        <month type="2">helmikuuta</month>
-                                                        <month type="3">maaliskuuta</month>
-                                                        <month type="4">huhtikuuta</month>
-                                                        <month type="5">toukokuuta</month>
-                                                        <month type="6">kesäkuuta</month>
-                                                        <month type="7">heinäkuuta</month>
-                                                        <month type="8">elokuuta</month>
-                                                        <month type="9">syyskuuta</month>
-                                                        <month type="10">lokakuuta</month>
-                                                        <month type="11">marraskuuta</month>
-                                                        <month type="12">joulukuuta</month>
+                                                        <month type="1">tammik.</month>
+                                                        <month type="2">helmik.</month>
+                                                        <month type="3">maalisk.</month>
+                                                        <month type="4">huhtik.</month>
+                                                        <month type="5">toukok.</month>
+                                                        <month type="6">kesäk.</month>
+                                                        <month type="7">heinäk.</month>
+                                                        <month type="8">elok.</month>
+                                                        <month type="9">syysk.</month>
+                                                        <month type="10">lokak.</month>
+                                                        <month type="11">marrask.</month>
+                                                        <month type="12">jouluk.</month>
                                                 </monthWidth>
                                                 <monthWidth type="narrow">
                                                         <month type="1">T</month>
                                                         <month type="2">H</month>
                                                         <month type="3">M</month>

@@ -1882,30 +2133,30 @@
                                         </quarterContext>
                                 </quarters>
                                 <dayPeriods>
                                         <dayPeriodContext type="format">
                                                 <dayPeriodWidth type="abbreviated">
-                                                        <dayPeriod type="midnight">keskiyö</dayPeriod>
+                                                        <dayPeriod type="midnight">keskiyöllä</dayPeriod>
                                                         <dayPeriod type="am">ap.</dayPeriod>
                                                         <dayPeriod type="noon">keskip.</dayPeriod>
                                                         <dayPeriod type="pm">ip.</dayPeriod>
-                                                        <dayPeriod type="morning1">aamu</dayPeriod>
+                                                        <dayPeriod type="morning1">aamulla</dayPeriod>
                                                         <dayPeriod type="morning2">aamup.</dayPeriod>
                                                         <dayPeriod type="afternoon1">iltap.</dayPeriod>
-                                                        <dayPeriod type="evening1">ilta</dayPeriod>
-                                                        <dayPeriod type="night1">yö</dayPeriod>
+                                                        <dayPeriod type="evening1">illalla</dayPeriod>
+                                                        <dayPeriod type="night1">yöllä</dayPeriod>
                                                 </dayPeriodWidth>
                                                 <dayPeriodWidth type="narrow">
                                                         <dayPeriod type="midnight">ky.</dayPeriod>
                                                         <dayPeriod type="am">ap.</dayPeriod>
                                                         <dayPeriod type="noon">kp.</dayPeriod>
                                                         <dayPeriod type="pm">ip.</dayPeriod>
-                                                        <dayPeriod type="morning1">aamu</dayPeriod>
+                                                        <dayPeriod type="morning1">aamulla</dayPeriod>
                                                         <dayPeriod type="morning2">ap.</dayPeriod>
                                                         <dayPeriod type="afternoon1">ip.</dayPeriod>
-                                                        <dayPeriod type="evening1">ilta</dayPeriod>
-                                                        <dayPeriod type="night1">yö</dayPeriod>
+                                                        <dayPeriod type="evening1">illalla</dayPeriod>
+                                                        <dayPeriod type="night1">yöllä</dayPeriod>
                                                 </dayPeriodWidth>
                                                 <dayPeriodWidth type="wide">
                                                         <dayPeriod type="midnight">keskiyöllä</dayPeriod>
                                                         <dayPeriod type="am">ap.</dayPeriod>
                                                         <dayPeriod type="noon">keskipäivällä</dayPeriod>

@@ -1965,13 +2216,13 @@
                                                 <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">eKr</era>
                                                 <era type="0" alt="variant">eaa</era>
-                                                <era type="1">jK</era>
+                                                <era type="1">jKr</era>
                                                 <era type="1" alt="variant">jaa</era>
                                         </eraNarrow>
                                 </eras>
                                 <dateFormats>
                                         <dateFormatLength type="full">

@@ -2037,12 +2288,17 @@
                                                 <dateTimeFormat>
                                                         <pattern>{1} {0}</pattern>
                                                 </dateTimeFormat>
                                         </dateTimeFormatLength>
                                         <availableFormats>
+                                                <dateFormatItem id="Bh">h B</dateFormatItem>
+                                                <dateFormatItem id="Bhm">h.mm B</dateFormatItem>
+                                                <dateFormatItem id="Bhms">h.mm.ss B</dateFormatItem>
                                                 <dateFormatItem id="d">d</dateFormatItem>
                                                 <dateFormatItem id="E">ccc</dateFormatItem>
+                                                <dateFormatItem id="EBhm">E h.mm B</dateFormatItem>
+                                                <dateFormatItem id="EBhms">E h.mm.ss B</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>

@@ -2065,10 +2321,12 @@
                                                 <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="MMMMd">d. MMMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMW" count="one">LLLL'n' W. 'viikko'</dateFormatItem>
+                                                <dateFormatItem id="MMMMW" count="other">LLLL'n' W. 'viikko'</dateFormatItem>
                                                 <dateFormatItem id="ms">m.ss</dateFormatItem>
                                                 <dateFormatItem id="y">y</dateFormatItem>
                                                 <dateFormatItem id="yM">L.y</dateFormatItem>
                                                 <dateFormatItem id="yMd">d.M.y</dateFormatItem>
                                                 <dateFormatItem id="yMEd">E d.M.y</dateFormatItem>

@@ -2078,10 +2336,12 @@
                                                 <dateFormatItem id="yMMMEd">E d. MMM y</dateFormatItem>
                                                 <dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
                                                 <dateFormatItem id="yMMMMccccd">cccc d. MMMM y</dateFormatItem>
                                                 <dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
                                                 <dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+                                                <dateFormatItem id="yw" count="one">'vuoden' Y 'viikko' w</dateFormatItem>
+                                                <dateFormatItem id="yw" count="other">'vuoden' Y 'viikko' w</dateFormatItem>
                                         </availableFormats>
                                         <appendItems>
                                                 <appendItem request="Timezone">{0} {1}</appendItem>
                                         </appendItems>
                                         <intervalFormats>

@@ -2185,10 +2445,26 @@
                                 </dateTimeFormats>
                         </calendar>
                         <calendar type="hebrew">
                                 <months>
                                         <monthContext type="format">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">tišrí</month>
+                                                        <month type="2" draft="contributed">hešván</month>
+                                                        <month type="3" draft="contributed">kislév</month>
+                                                        <month type="4" draft="contributed">tevét</month>
+                                                        <month type="5" draft="contributed">ševát</month>
+                                                        <month type="6" draft="contributed">adár I</month>
+                                                        <month type="7" draft="contributed">adár</month>
+                                                        <month type="7" yeartype="leap" draft="contributed">adár II</month>
+                                                        <month type="8" draft="contributed">nisán</month>
+                                                        <month type="9" draft="contributed">ijjár</month>
+                                                        <month type="10" draft="contributed">siván</month>
+                                                        <month type="11" draft="contributed">tammúz</month>
+                                                        <month type="12" draft="contributed">ab</month>
+                                                        <month type="13" draft="contributed">elúl</month>
+                                                </monthWidth>
                                                 <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>

@@ -2253,10 +2529,96 @@
                                                         <month type="12">abkuu</month>
                                                         <month type="13">elúlkuu</month>
                                                 </monthWidth>
                                         </monthContext>
                                 </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">Anno Mundi</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">AM</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">AM</era>
+                                        </eraNarrow>
+                                </eras>
+                        </calendar>
+                        <calendar type="indian">
+                                <months>
+                                        <monthContext type="format">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">chaitrakuuta</month>
+                                                        <month type="2" draft="contributed">vaisakhakuuta</month>
+                                                        <month type="3" draft="contributed">jyaisthakuuta</month>
+                                                        <month type="4" draft="contributed">asadhakuuta</month>
+                                                        <month type="5" draft="contributed">sravanakuuta</month>
+                                                        <month type="6" draft="contributed">bhadrakuuta</month>
+                                                        <month type="7" draft="contributed">asvinakuuta</month>
+                                                        <month type="8" draft="contributed">kartikakuuta</month>
+                                                        <month type="9" draft="contributed">agrahayanakuuta</month>
+                                                        <month type="10" draft="contributed">pausakuuta</month>
+                                                        <month type="11" draft="contributed">maghakuuta</month>
+                                                        <month type="12" draft="contributed">phalgunakuuta</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">chaitrakuuta</month>
+                                                        <month type="2" draft="contributed">vaisakhakuuta</month>
+                                                        <month type="3" draft="contributed">jyaisthakuuta</month>
+                                                        <month type="4" draft="contributed">asadhakuuta</month>
+                                                        <month type="5" draft="contributed">sravanakuuta</month>
+                                                        <month type="6" draft="contributed">bhadrakuuta</month>
+                                                        <month type="7" draft="contributed">asvinakuuta</month>
+                                                        <month type="8" draft="contributed">kartikakuuta</month>
+                                                        <month type="9" draft="contributed">agrahayanakuuta</month>
+                                                        <month type="10" draft="contributed">pausakuuta</month>
+                                                        <month type="11" draft="contributed">maghakuuta</month>
+                                                        <month type="12" draft="contributed">phalgunakuuta</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">chaitra</month>
+                                                        <month type="2" draft="contributed">vaisakha</month>
+                                                        <month type="3" draft="contributed">jyaistha</month>
+                                                        <month type="4" draft="contributed">asadha</month>
+                                                        <month type="5" draft="contributed">sravana</month>
+                                                        <month type="6" draft="contributed">bhadra</month>
+                                                        <month type="7" draft="contributed">asvina</month>
+                                                        <month type="8" draft="contributed">kartika</month>
+                                                        <month type="9" draft="contributed">agrahayana</month>
+                                                        <month type="10" draft="contributed">pausa</month>
+                                                        <month type="11" draft="contributed">magha</month>
+                                                        <month type="12" draft="contributed">phalguna</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">chaitrakuu</month>
+                                                        <month type="2" draft="contributed">vaisakhakuu</month>
+                                                        <month type="3" draft="contributed">jyaisthakuu</month>
+                                                        <month type="4" draft="contributed">asadhakuu</month>
+                                                        <month type="5" draft="contributed">sravanakuu</month>
+                                                        <month type="6" draft="contributed">bhadrakuu</month>
+                                                        <month type="7" draft="contributed">asvinakuu</month>
+                                                        <month type="8" draft="contributed">kartikakuu</month>
+                                                        <month type="9" draft="contributed">agrahayanakuu</month>
+                                                        <month type="10" draft="contributed">pausakuu</month>
+                                                        <month type="11" draft="contributed">maghakuu</month>
+                                                        <month type="12" draft="contributed">phalgunakuu</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">Saka-ajanlaskua</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">Saka</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">Saka</era>
+                                        </eraNarrow>
+                                </eras>
                         </calendar>
                         <calendar type="islamic">
                                 <months>
                                         <monthContext type="format">
                                                 <monthWidth type="wide">

@@ -2289,10 +2651,21 @@
                                                         <month type="11">dhu-l-qa’da</month>
                                                         <month type="12">dhu-l-hiddža</month>
                                                 </monthWidth>
                                         </monthContext>
                                 </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">hidžran jälkeen</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">AH</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">AH</era>
+                                        </eraNarrow>
+                                </eras>
                         </calendar>
                         <calendar type="japanese">
                                 <dateFormats>
                                         <dateFormatLength type="full">
                                                 <dateFormat>

@@ -2314,23 +2687,112 @@
                                                         <pattern>d.M.y GGGGG</pattern>
                                                 </dateFormat>
                                         </dateFormatLength>
                                 </dateFormats>
                         </calendar>
+                        <calendar type="persian">
+                                <months>
+                                        <monthContext type="format">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">farvardinkuuta</month>
+                                                        <month type="2" draft="contributed">ordibeheštkuuta</month>
+                                                        <month type="3" draft="contributed">khordadkuuta</month>
+                                                        <month type="4" draft="contributed">tirkuuta</month>
+                                                        <month type="5" draft="contributed">mordadkuuta</month>
+                                                        <month type="6" draft="contributed">šahrivarkuuta</month>
+                                                        <month type="7" draft="contributed">mehrkuuta</month>
+                                                        <month type="8" draft="contributed">abankuuta</month>
+                                                        <month type="9" draft="contributed">azarkuuta</month>
+                                                        <month type="10" draft="contributed">deykuuta</month>
+                                                        <month type="11" draft="contributed">bahmankuuta</month>
+                                                        <month type="12" draft="contributed">esfandkuuta</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">farvardinkuuta</month>
+                                                        <month type="2" draft="contributed">ordibeheštkuuta</month>
+                                                        <month type="3" draft="contributed">khordadkuuta</month>
+                                                        <month type="4" draft="contributed">tirkuuta</month>
+                                                        <month type="5" draft="contributed">mordadkuuta</month>
+                                                        <month type="6" draft="contributed">šahrivarkuuta</month>
+                                                        <month type="7" draft="contributed">mehrkuuta</month>
+                                                        <month type="8" draft="contributed">abankuuta</month>
+                                                        <month type="9" draft="contributed">azarkuuta</month>
+                                                        <month type="10" draft="contributed">deykuuta</month>
+                                                        <month type="11" draft="contributed">bahmankuuta</month>
+                                                        <month type="12" draft="contributed">esfandkuuta</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">farvardin</month>
+                                                        <month type="2" draft="contributed">ordibehešt</month>
+                                                        <month type="3" draft="contributed">khordad</month>
+                                                        <month type="4" draft="contributed">tir</month>
+                                                        <month type="5" draft="contributed">mordad</month>
+                                                        <month type="6" draft="contributed">šahrivar</month>
+                                                        <month type="7" draft="contributed">mehr</month>
+                                                        <month type="8" draft="contributed">aban</month>
+                                                        <month type="9" draft="contributed">azar</month>
+                                                        <month type="10" draft="contributed">dey</month>
+                                                        <month type="11" draft="contributed">bahman</month>
+                                                        <month type="12" draft="contributed">esfand</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">farvardinkuu</month>
+                                                        <month type="2" draft="contributed">ordibeheštkuu</month>
+                                                        <month type="3" draft="contributed">khordadkuu</month>
+                                                        <month type="4" draft="contributed">tirkuu</month>
+                                                        <month type="5" draft="contributed">mordadkuu</month>
+                                                        <month type="6" draft="contributed">šahrivarkuu</month>
+                                                        <month type="7" draft="contributed">mehrkuu</month>
+                                                        <month type="8" draft="contributed">abankuu</month>
+                                                        <month type="9" draft="contributed">azarkuu</month>
+                                                        <month type="10" draft="contributed">deykuu</month>
+                                                        <month type="11" draft="contributed">bahmankuu</month>
+                                                        <month type="12" draft="contributed">esfandkuu</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">Anno Persico</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">AP</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">AP</era>
+                                        </eraNarrow>
+                                </eras>
+                        </calendar>
                         <calendar type="roc">
                                 <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">ennen Kiinan tasavaltaa</era>
+                                                <era type="1" draft="contributed">Minguo</era>
+                                        </eraNames>
                                         <eraAbbr>
-                                                <era type="0">Before R.O.C.</era>
+                                                <era type="0">e. Kiinan tasav.</era>
                                                 <era type="1">Minguo</era>
                                         </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">e. Kiinan tasav.</era>
+                                                <era type="1" draft="contributed">Minguo</era>
+                                        </eraNarrow>
                                 </eras>
                         </calendar>
                 </calendars>
                 <fields>
                         <field type="era">
                                 <displayName>aikakausi</displayName>
                         </field>
+                        <field type="era-short">
+                                <displayName>aikakausi</displayName>
+                        </field>
+                        <field type="era-narrow">
+                                <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>

@@ -2394,11 +2856,11 @@
                                         <relativeTimePattern count="one">{0} neljänneksen päästä</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} neljänneksen päästä</relativeTimePattern>
                                 </relativeTime>
                                 <relativeTime type="past">
                                         <relativeTimePattern count="one">{0} neljännes sitten</relativeTimePattern>
-                                        <relativeTimePattern count="other">{0} neljännes sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} neljännestä sitten</relativeTimePattern>
                                 </relativeTime>
                         </field>
                         <field type="quarter-narrow">
                                 <displayName>nelj.</displayName>
                                 <relative type="-1">viime nelj.</relative>

@@ -2466,10 +2928,11 @@
                                 </relativeTime>
                                 <relativeTime type="past">
                                         <relativeTimePattern count="one">{0} viikko sitten</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} viikkoa sitten</relativeTimePattern>
                                 </relativeTime>
+                                <relativePeriod>päivän {0} viikolla</relativePeriod>
                         </field>
                         <field type="week-short">
                                 <displayName>vk</displayName>
                                 <relative type="-1">viime vk</relative>
                                 <relative type="0">tällä vk</relative>

@@ -2480,10 +2943,11 @@
                                 </relativeTime>
                                 <relativeTime type="past">
                                         <relativeTimePattern count="one">{0} vk sitten</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} vk sitten</relativeTimePattern>
                                 </relativeTime>
+                                <relativePeriod>päivän {0} viikolla</relativePeriod>
                         </field>
                         <field type="week-narrow">
                                 <displayName>vk</displayName>
                                 <relative type="-1">viime vk</relative>
                                 <relative type="0">tällä vk</relative>

@@ -2494,10 +2958,20 @@
                                 </relativeTime>
                                 <relativeTime type="past">
                                         <relativeTimePattern count="one">{0} vk sitten</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} vk sitten</relativeTimePattern>
                                 </relativeTime>
+                                <relativePeriod>päivän {0} viikolla</relativePeriod>
+                        </field>
+                        <field type="weekOfMonth">
+                                <displayName>kuukauden viikko</displayName>
+                        </field>
+                        <field type="weekOfMonth-short">
+                                <displayName>kuukauden vk</displayName>
+                        </field>
+                        <field type="weekOfMonth-narrow">
+                                <displayName>kuukauden vk</displayName>
                         </field>
                         <field type="day">
                                 <displayName>päivä</displayName>
                                 <relative type="-2">toissa päivänä</relative>
                                 <relative type="-1">eilen</relative>

@@ -2543,123 +3017,322 @@
                                 <relativeTime type="past">
                                         <relativeTimePattern count="one">{0} pv sitten</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} pv sitten</relativeTimePattern>
                                 </relativeTime>
                         </field>
+                        <field type="dayOfYear">
+                                <displayName>vuodenpäivä</displayName>
+                        </field>
+                        <field type="dayOfYear-short">
+                                <displayName>vuodenpv</displayName>
+                        </field>
+                        <field type="dayOfYear-narrow">
+                                <displayName>vuodenpv</displayName>
+                        </field>
                         <field type="weekday">
                                 <displayName>viikonpäivä</displayName>
                         </field>
+                        <field type="weekday-short">
+                                <displayName>viikonpäivä</displayName>
+                        </field>
+                        <field type="weekday-narrow">
+                                <displayName>viikonpäivä</displayName>
+                        </field>
+                        <field type="weekdayOfMonth">
+                                <displayName>kuukauden viikonpäivä</displayName>
+                        </field>
+                        <field type="weekdayOfMonth-short">
+                                <displayName>kuukauden vk päivä</displayName>
+                        </field>
+                        <field type="weekdayOfMonth-narrow">
+                                <displayName>kuukauden vk pä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>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} sunnuntain päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} sunnuntain päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} sunnuntai sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} sunnuntaita sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sun-short">
                                 <relative type="-1">viime su</relative>
                                 <relative type="0">tänä su</relative>
                                 <relative type="1">ensi su</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} su päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} su päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} su sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} su sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sun-narrow">
                                 <relative type="-1">viime su</relative>
                                 <relative type="0">tänä su</relative>
                                 <relative type="1">ensi su</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} su päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} su päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} su sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} su sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="mon">
                                 <relative type="-1">viime maanantaina</relative>
                                 <relative type="0">tänä maanantaina</relative>
                                 <relative type="1">ensi maanantaina</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} maanantain päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} maanantain päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} maanantai sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} maanantaita sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="mon-short">
                                 <relative type="-1">viime ma</relative>
                                 <relative type="0">tänä ma</relative>
                                 <relative type="1">ensi ma</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} ma päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ma päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} ma sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ma sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="mon-narrow">
                                 <relative type="-1">viime ma</relative>
                                 <relative type="0">tänä ma</relative>
                                 <relative type="1">ensi ma</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} ma päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ma päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} ma sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ma sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="tue">
                                 <relative type="-1">viime tiistaina</relative>
                                 <relative type="0">tänä tiistaina</relative>
                                 <relative type="1">ensi tiistaina</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} tiistain päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} tiistain päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} tiistai sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} tiistaita sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="tue-short">
                                 <relative type="-1">viime ti</relative>
                                 <relative type="0">tänä ti</relative>
                                 <relative type="1">ensi ti</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} ti päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ti päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} ti sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ti sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="tue-narrow">
                                 <relative type="-1">viime ti</relative>
                                 <relative type="0">tänä ti</relative>
                                 <relative type="1">ensi ti</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} ti päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ti päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} ti sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ti sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="wed">
                                 <relative type="-1">viime keskiviikkona</relative>
                                 <relative type="0">tänä keskiviikkona</relative>
                                 <relative type="1">ensi keskiviikkona</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} keskiviikon päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} keskiviikon päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} keskiviikko sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} keskiviikkoa sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="wed-short">
                                 <relative type="-1">viime ke</relative>
                                 <relative type="0">tänä ke</relative>
                                 <relative type="1">ensi ke</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} ke päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ke päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} ke sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ke sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="wed-narrow">
                                 <relative type="-1">viime ke</relative>
                                 <relative type="0">tänä ke</relative>
                                 <relative type="1">ensi ke</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} ke päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ke päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} ke sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} ke sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="thu">
                                 <relative type="-1">viime torstaina</relative>
                                 <relative type="0">tänä torstaina</relative>
                                 <relative type="1">ensi torstaina</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} torstain päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} torstain päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} torstai sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} torstaita sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="thu-short">
                                 <relative type="-1">viime to</relative>
                                 <relative type="0">tänä to</relative>
                                 <relative type="1">ensi to</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} to päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} to päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} to sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} to sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="thu-narrow">
                                 <relative type="-1">viime to</relative>
                                 <relative type="0">tänä to</relative>
                                 <relative type="1">ensi to</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} to päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} to päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} to sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} to sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="fri">
                                 <relative type="-1">viime perjantaina</relative>
                                 <relative type="0">tänä perjantaina</relative>
                                 <relative type="1">ensi perjantaina</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} perjantain päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} perjantain päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} perjantai sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} perjantaita sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="fri-short">
                                 <relative type="-1">viime pe</relative>
                                 <relative type="0">tänä pe</relative>
                                 <relative type="1">ensi pe</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} pe päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} pe päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} pe sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} pe sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="fri-narrow">
                                 <relative type="-1">viime pe</relative>
                                 <relative type="0">tänä pe</relative>
                                 <relative type="1">ensi pe</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} pe päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} pe päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} pe sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} pe sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sat">
                                 <relative type="-1">viime lauantaina</relative>
                                 <relative type="0">tänä lauantaina</relative>
                                 <relative type="1">ensi lauantaina</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} lauantain päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} lauantain päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} lauantai sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} lauantaita sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sat-short">
                                 <relative type="-1">viime la</relative>
                                 <relative type="0">tänä la</relative>
                                 <relative type="1">ensi la</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} la päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} la päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} la sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} la sitten</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sat-narrow">
                                 <relative type="-1">viime la</relative>
                                 <relative type="0">tänä la</relative>
                                 <relative type="1">ensi la</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">{0} la päästä</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} la päästä</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">{0} la sitten</relativeTimePattern>
+                                        <relativeTimePattern count="other">{0} la sitten</relativeTimePattern>
+                                </relativeTime>
+                        </field>
+                        <field type="dayperiod-short">
+                                <displayName>vuorokaudenaika</displayName>
                         </field>
                         <field type="dayperiod">
                                 <displayName>vuorokaudenaika</displayName>
                         </field>
+                        <field type="dayperiod-narrow">
+                                <displayName>vuorokaudenaika</displayName>
+                        </field>
                         <field type="hour">
                                 <displayName>tunti</displayName>
+                                <relative type="0">tämän tunnin aikana</relative>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">{0} tunnin päästä</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} tunnin päästä</relativeTimePattern>
                                 </relativeTime>
                                 <relativeTime type="past">

@@ -2667,10 +3340,11 @@
                                         <relativeTimePattern count="other">{0} tuntia sitten</relativeTimePattern>
                                 </relativeTime>
                         </field>
                         <field type="hour-short">
                                 <displayName>t</displayName>
+                                <relative type="0">tunnin sisällä</relative>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">{0} t päästä</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} t päästä</relativeTimePattern>
                                 </relativeTime>
                                 <relativeTime type="past">

@@ -2678,10 +3352,11 @@
                                         <relativeTimePattern count="other">{0} t sitten</relativeTimePattern>
                                 </relativeTime>
                         </field>
                         <field type="hour-narrow">
                                 <displayName>t</displayName>
+                                <relative type="0">tunnin sisällä</relative>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">{0} t päästä</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} t päästä</relativeTimePattern>
                                 </relativeTime>
                                 <relativeTime type="past">

@@ -2689,10 +3364,11 @@
                                         <relativeTimePattern count="other">{0} t sitten</relativeTimePattern>
                                 </relativeTime>
                         </field>
                         <field type="minute">
                                 <displayName>minuutti</displayName>
+                                <relative type="0">tämän minuutin aikana</relative>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">{0} minuutin päästä</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} minuutin päästä</relativeTimePattern>
                                 </relativeTime>
                                 <relativeTime type="past">

@@ -2700,10 +3376,11 @@
                                         <relativeTimePattern count="other">{0} minuuttia sitten</relativeTimePattern>
                                 </relativeTime>
                         </field>
                         <field type="minute-short">
                                 <displayName>min</displayName>
+                                <relative type="0">minuutin sisällä</relative>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">{0} min päästä</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} min päästä</relativeTimePattern>
                                 </relativeTime>
                                 <relativeTime type="past">

@@ -2711,10 +3388,11 @@
                                         <relativeTimePattern count="other">{0} min sitten</relativeTimePattern>
                                 </relativeTime>
                         </field>
                         <field type="minute-narrow">
                                 <displayName>min</displayName>
+                                <relative type="0">minuutin sisällä</relative>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">{0} min päästä</relativeTimePattern>
                                         <relativeTimePattern count="other">{0} min päästä</relativeTimePattern>
                                 </relativeTime>
                                 <relativeTime type="past">

@@ -2759,19 +3437,36 @@
                                 </relativeTime>
                         </field>
                         <field type="zone">
                                 <displayName>aikavyöhyke</displayName>
                         </field>
+                        <field type="zone-short">
+                                <displayName>aikavyöhyke</displayName>
+                        </field>
+                        <field type="zone-narrow">
+                                <displayName>aikavyöhyke</displayName>
+                        </field>
                 </fields>
                 <timeZoneNames>
                         <hourFormat>+H.mm;-H.mm</hourFormat>
                         <gmtFormat>UTC{0}</gmtFormat>
                         <gmtZeroFormat>UTC</gmtZeroFormat>
                         <regionFormat>aikavyöhyke: {0}</regionFormat>
                         <regionFormat type="daylight">{0} (kesäaika)</regionFormat>
                         <regionFormat type="standard">{0} (normaaliaika)</regionFormat>
                         <fallbackFormat>{1} ({0})</fallbackFormat>
+                        <zone type="America/Santa_Isabel">
+                                <exemplarCity>Santa Isabel</exemplarCity>
+                        </zone>
+                        <zone type="Pacific/Honolulu">
+                                <exemplarCity>Honolulu</exemplarCity>
+                        </zone>
+                        <zone type="Etc/UTC">
+                                <long>
+                                        <standard>UTC-yleisaika</standard>
+                                </long>
+                        </zone>
                         <zone type="Etc/Unknown">
                                 <exemplarCity>tuntematon</exemplarCity>
                         </zone>
                         <zone type="Europe/Andorra">
                                 <exemplarCity>Andorra</exemplarCity>

@@ -3033,10 +3728,13 @@
                                 <exemplarCity>Inuvik</exemplarCity>
                         </zone>
                         <zone type="America/Vancouver">
                                 <exemplarCity>Vancouver</exemplarCity>
                         </zone>
+                        <zone type="America/Fort_Nelson">
+                                <exemplarCity>Fort Nelson</exemplarCity>
+                        </zone>
                         <zone type="America/Dawson_Creek">
                                 <exemplarCity>Dawson Creek</exemplarCity>
                         </zone>
                         <zone type="America/Creston">
                                 <exemplarCity>Creston</exemplarCity>

@@ -3129,10 +3827,13 @@
                                 <exemplarCity>Rarotonga</exemplarCity>
                         </zone>
                         <zone type="Pacific/Easter">
                                 <exemplarCity>Pääsiäissaari</exemplarCity>
                         </zone>
+                        <zone type="America/Punta_Arenas">
+                                <exemplarCity>Punta Arenas</exemplarCity>
+                        </zone>
                         <zone type="America/Santiago">
                                 <exemplarCity>Santiago de Chile</exemplarCity>
                         </zone>
                         <zone type="Africa/Douala">
                                 <exemplarCity>Douala</exemplarCity>

@@ -3162,15 +3863,18 @@
                                 <exemplarCity>Joulusaari</exemplarCity>
                         </zone>
                         <zone type="Asia/Nicosia">
                                 <exemplarCity>Nikosia</exemplarCity>
                         </zone>
+                        <zone type="Asia/Famagusta">
+                                <exemplarCity>Famagusta</exemplarCity>
+                        </zone>
                         <zone type="Europe/Prague">
                                 <exemplarCity>Praha</exemplarCity>
                         </zone>
                         <zone type="Europe/Busingen">
-                                <exemplarCity>Busingen</exemplarCity>
+                                <exemplarCity>Büsingen</exemplarCity>
                         </zone>
                         <zone type="Europe/Berlin">
                                 <exemplarCity>Berliini</exemplarCity>
                         </zone>
                         <zone type="Africa/Djibouti">

@@ -3423,10 +4127,13 @@
                                 <exemplarCity>Aqtaw</exemplarCity>
                         </zone>
                         <zone type="Asia/Oral">
                                 <exemplarCity>Uralsk</exemplarCity>
                         </zone>
+                        <zone type="Asia/Atyrau">
+                                <exemplarCity>Atıraw</exemplarCity>
+                        </zone>
                         <zone type="Asia/Aqtobe">
                                 <exemplarCity>Aqtöbe</exemplarCity>
                         </zone>
                         <zone type="Asia/Qyzylorda">
                                 <exemplarCity>Qızılorda</exemplarCity>

@@ -3537,13 +4244,10 @@
                                 <exemplarCity>Blantyre</exemplarCity>
                         </zone>
                         <zone type="America/Tijuana">
                                 <exemplarCity>Tijuana</exemplarCity>
                         </zone>
-                        <zone type="America/Santa_Isabel">
-                                <exemplarCity>Santa Isabel</exemplarCity>
-                        </zone>
                         <zone type="America/Hermosillo">
                                 <exemplarCity>Hermosillo</exemplarCity>
                         </zone>
                         <zone type="America/Mazatlan">
                                 <exemplarCity>Mazatlán</exemplarCity>

@@ -3619,11 +4323,11 @@
                         </zone>
                         <zone type="Pacific/Auckland">
                                 <exemplarCity>Auckland</exemplarCity>
                         </zone>
                         <zone type="Asia/Muscat">
-                                <exemplarCity>Muscat</exemplarCity>
+                                <exemplarCity>Masqat</exemplarCity>
                         </zone>
                         <zone type="America/Panama">
                                 <exemplarCity>Panama</exemplarCity>
                         </zone>
                         <zone type="America/Lima">

@@ -3705,10 +4409,22 @@
                                 <exemplarCity>Moskova</exemplarCity>
                         </zone>
                         <zone type="Europe/Volgograd">
                                 <exemplarCity>Volgograd</exemplarCity>
                         </zone>
+                        <zone type="Europe/Saratov">
+                                <exemplarCity>Saratov</exemplarCity>
+                        </zone>
+                        <zone type="Europe/Astrakhan">
+                                <exemplarCity>Astrahan</exemplarCity>
+                        </zone>
+                        <zone type="Europe/Ulyanovsk">
+                                <exemplarCity>Uljanovsk</exemplarCity>
+                        </zone>
+                        <zone type="Europe/Kirov">
+                                <exemplarCity>Kirov</exemplarCity>
+                        </zone>
                         <zone type="Europe/Samara">
                                 <exemplarCity>Samara</exemplarCity>
                         </zone>
                         <zone type="Asia/Yekaterinburg">
                                 <exemplarCity>Jekaterinburg</exemplarCity>

@@ -3717,10 +4433,16 @@
                                 <exemplarCity>Omsk</exemplarCity>
                         </zone>
                         <zone type="Asia/Novosibirsk">
                                 <exemplarCity>Novosibirsk</exemplarCity>
                         </zone>
+                        <zone type="Asia/Barnaul">
+                                <exemplarCity>Barnaul</exemplarCity>
+                        </zone>
+                        <zone type="Asia/Tomsk">
+                                <exemplarCity>Tomsk</exemplarCity>
+                        </zone>
                         <zone type="Asia/Novokuznetsk">
                                 <exemplarCity>Novokuznetsk</exemplarCity>
                         </zone>
                         <zone type="Asia/Krasnoyarsk">
                                 <exemplarCity>Krasnojarsk</exemplarCity>

@@ -3883,26 +4605,23 @@
                         </zone>
                         <zone type="Africa/Kampala">
                                 <exemplarCity>Kampala</exemplarCity>
                         </zone>
                         <zone type="Pacific/Midway">
-                                <exemplarCity>Midway</exemplarCity>
-                        </zone>
-                        <zone type="Pacific/Johnston">
-                                <exemplarCity>Johnston</exemplarCity>
+                                <exemplarCity>Midwaysaaret</exemplarCity>
                         </zone>
                         <zone type="Pacific/Wake">
                                 <exemplarCity>Wake</exemplarCity>
                         </zone>
                         <zone type="America/Adak">
                                 <exemplarCity>Adak</exemplarCity>
                         </zone>
                         <zone type="America/Nome">
                                 <exemplarCity>Nome</exemplarCity>
                         </zone>
-                        <zone type="Pacific/Honolulu">
-                                <exemplarCity>Honolulu</exemplarCity>
+                        <zone type="Pacific/Johnston">
+                                <exemplarCity>Johnston</exemplarCity>
                         </zone>
                         <zone type="America/Anchorage">
                                 <exemplarCity>Anchorage</exemplarCity>
                         </zone>
                         <zone type="America/Yakutat">

@@ -4121,13 +4840,13 @@
                                         <daylight>Anadyrin kesäaika</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Apia">
                                 <long>
-                                        <generic draft="contributed">Apian aika</generic>
-                                        <standard draft="contributed">Apian normaaliaika</standard>
-                                        <daylight draft="contributed">Apian kesäaika</daylight>
+                                        <generic>Apian aika</generic>
+                                        <standard>Apian normaaliaika</standard>
+                                        <daylight>Apian kesäaika</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Aqtau">
                                 <long>
                                         <generic>Aqtaw’n aika</generic>

@@ -4329,11 +5048,11 @@
                                         <standard>Davisin aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="DumontDUrville">
                                 <long>
-                                        <standard>Dumont-d’Urvillen aika</standard>
+                                        <standard>Dumont d’Urvillen aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="East_Timor">
                                 <long>
                                         <standard>Itä-Timorin aika</standard>

@@ -4406,11 +5125,11 @@
                                         <standard>Galápagossaarten aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="Gambier">
                                 <long>
-                                        <standard>Gambierin aika</standard>
+                                        <standard>Gambiersaarten aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="Georgia">
                                 <long>
                                         <generic>Georgian aika</generic>

@@ -4623,11 +5342,11 @@
                                         <standard>Malediivien aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="Marquesas">
                                 <long>
-                                        <standard>Marquesasin aika</standard>
+                                        <standard>Marquesassaarten aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="Marshall_Islands">
                                 <long>
                                         <standard>Marshallinsaarten aika</standard>

@@ -4714,11 +5433,11 @@
                                         <standard>Niuen aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="Norfolk">
                                 <long>
-                                        <standard>Norfolkinsaarten aika</standard>
+                                        <standard>Norfolkinsaaren aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="Noronha">
                                 <long>
                                         <generic>Fernando de Noronhan aika</generic>

@@ -4803,10 +5522,15 @@
                         <metazone type="Ponape">
                                 <long>
                                         <standard>Pohnpein aika</standard>
                                 </long>
                         </metazone>
+                        <metazone type="Pyongyang">
+                                <long>
+                                        <standard>Pjongjangin 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>

@@ -4863,11 +5587,11 @@
                                         <standard>Etelä-Georgian aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="Suriname">
                                 <long>
-                                        <standard>Surinamin aika</standard>
+                                        <standard>Surinamen aika</standard>
                                 </long>
                         </metazone>
                         <metazone type="Syowa">
                                 <long>
                                         <standard>Syowan aika</standard>

@@ -4989,13 +5713,13 @@
                                 </long>
                         </metazone>
                 </timeZoneNames>
         </dates>
         <numbers>
-                <defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+                <defaultNumberingSystem>latn</defaultNumberingSystem>
                 <otherNumberingSystems>
-                        <native draft="contributed">latn</native>
+                        <native>latn</native>
                 </otherNumberingSystems>
                 <minimumGroupingDigits>1</minimumGroupingDigits>
                 <symbols numberSystem="latn">
                         <decimal>,</decimal>
                         <group> </group>

@@ -5179,11 +5903,11 @@
                         <currency type="AOA">
                                 <displayName>Angolan kwanza</displayName>
                                 <displayName count="one">Angolan kwanza</displayName>
                                 <displayName count="other">Angolan kwanzaa</displayName>
                                 <symbol>AOA</symbol>
-                                <symbol alt="narrow" draft="contributed">Kz</symbol>
+                                <symbol alt="narrow">AOA</symbol>
                         </currency>
                         <currency type="AOK">
                                 <displayName>Angolan kwanza (1977–1991)</displayName>
                                 <displayName count="one">Angolan kwanza (1977–1990)</displayName>
                                 <displayName count="other">Angolan kwanzaa (1977–1990)</displayName>

@@ -5228,11 +5952,11 @@
                         <currency type="ARS">
                                 <displayName>Argentiinan peso</displayName>
                                 <displayName count="one">Argentiinan peso</displayName>
                                 <displayName count="other">Argentiinan pesoa</displayName>
                                 <symbol>ARS</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">ARS</symbol>
                         </currency>
                         <currency type="ATS">
                                 <displayName>Itävallan šillinki</displayName>
                                 <displayName count="one">Itävallan šillinki</displayName>
                                 <displayName count="other">Itävallan šillinkiä</displayName>

@@ -5241,11 +5965,11 @@
                         <currency type="AUD">
                                 <displayName>Australian dollari</displayName>
                                 <displayName count="one">Australian dollari</displayName>
                                 <displayName count="other">Australian dollaria</displayName>
                                 <symbol>AUD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">AUD</symbol>
                         </currency>
                         <currency type="AWG">
                                 <displayName>Aruban floriini</displayName>
                                 <displayName count="one">Aruban floriini</displayName>
                                 <displayName count="other">Aruban floriinia</displayName>

@@ -5272,11 +5996,11 @@
                         <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>
-                                <symbol alt="narrow" draft="contributed">KM</symbol>
+                                <symbol alt="narrow">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>

@@ -5285,18 +6009,18 @@
                         <currency type="BBD">
                                 <displayName>Barbadosin dollari</displayName>
                                 <displayName count="one">Barbadosin dollari</displayName>
                                 <displayName count="other">Barbadosin dollaria</displayName>
                                 <symbol>BBD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">৳</symbol>
+                                <symbol alt="narrow">BDT</symbol>
                         </currency>
                         <currency type="BEC">
                                 <displayName>Belgian vaihdettava frangi</displayName>
                                 <displayName count="one">Belgian vaihdettava frangi</displayName>
                                 <displayName count="other">Belgian vaihdettavaa frangia</displayName>

@@ -5353,25 +6077,25 @@
                         <currency type="BMD">
                                 <displayName>Bermudan dollari</displayName>
                                 <displayName count="one">Bermudan dollari</displayName>
                                 <displayName count="other">Bermudan dollaria</displayName>
                                 <symbol>BMD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">Bs</symbol>
+                                <symbol alt="narrow">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>

@@ -5410,11 +6134,11 @@
                         <currency type="BRL">
                                 <displayName>Brasilian real</displayName>
                                 <displayName count="one">Brasilian real</displayName>
                                 <displayName count="other">Brasilian realia</displayName>
                                 <symbol>BRL</symbol>
-                                <symbol alt="narrow" draft="contributed">R$</symbol>
+                                <symbol alt="narrow">BRL</symbol>
                         </currency>
                         <currency type="BRN">
                                 <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>

@@ -5435,11 +6159,11 @@
                         <currency type="BSD">
                                 <displayName>Bahaman dollari</displayName>
                                 <displayName count="one">Bahaman dollari</displayName>
                                 <displayName count="other">Bahaman dollaria</displayName>
                                 <symbol>BSD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">BSD</symbol>
                         </currency>
                         <currency type="BTN">
                                 <displayName>Bhutanin ngultrum</displayName>
                                 <displayName count="one">Bhutanin ngultrum</displayName>
                                 <displayName count="other">Bhutanin ngultrumia</displayName>

@@ -5454,38 +6178,44 @@
                         <currency type="BWP">
                                 <displayName>Botswanan pula</displayName>
                                 <displayName count="one">Botswanan pula</displayName>
                                 <displayName count="other">Botswanan pulaa</displayName>
                                 <symbol>BWP</symbol>
-                                <symbol alt="narrow" draft="contributed">P</symbol>
+                                <symbol alt="narrow">BWP</symbol>
                         </currency>
                         <currency type="BYB">
                                 <displayName>Valko-Venäjän uusi rupla (1994–1999)</displayName>
                                 <displayName count="one">Valko-Venäjän uusi rupla (1994–1999)</displayName>
                                 <displayName count="other">Valko-Venäjän uutta ruplaa (1994–1999)</displayName>
                                 <symbol>BYB</symbol>
                         </currency>
-                        <currency type="BYR">
+                        <currency type="BYN">
                                 <displayName>Valko-Venäjän rupla</displayName>
                                 <displayName count="one">Valko-Venäjän rupla</displayName>
                                 <displayName count="other">Valko-Venäjän ruplaa</displayName>
+                                <symbol>BYN</symbol>
+                                <symbol alt="narrow">BYN</symbol>
+                        </currency>
+                        <currency type="BYR">
+                                <displayName>Valko-Venäjän rupla (2000–2016)</displayName>
+                                <displayName count="one">Valko-Venäjän rupla (2000–2016)</displayName>
+                                <displayName count="other">Valko-Venäjän ruplaa (2000–2016)</displayName>
                                 <symbol>BYR</symbol>
-                                <symbol alt="narrow" draft="contributed">р.</symbol>
                         </currency>
                         <currency type="BZD">
                                 <displayName>Belizen dollari</displayName>
                                 <displayName count="one">Belizen dollari</displayName>
                                 <displayName count="other">Belizen dollaria</displayName>
                                 <symbol>BZD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">BZD</symbol>
                         </currency>
                         <currency type="CAD">
                                 <displayName>Kanadan dollari</displayName>
                                 <displayName count="one">Kanadan dollari</displayName>
                                 <displayName count="other">Kanadan dollaria</displayName>
                                 <symbol>CAD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">CAD</symbol>
                         </currency>
                         <currency type="CDF">
                                 <displayName>Kongon frangi</displayName>
                                 <displayName count="one">Kongon frangi</displayName>
                                 <displayName count="other">Kongon frangia</displayName>

@@ -5524,44 +6254,50 @@
                         <currency type="CLP">
                                 <displayName>Chilen peso</displayName>
                                 <displayName count="one">Chilen peso</displayName>
                                 <displayName count="other">Chilen pesoa</displayName>
                                 <symbol>CLP</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">CLP</symbol>
+                        </currency>
+                        <currency type="CNH">
+                                <displayName>Kiinan juan (offshore)</displayName>
+                                <displayName count="one">Kiinan juan (offshore)</displayName>
+                                <displayName count="other">Kiinan juania (offshore)</displayName>
+                                <symbol draft="contributed">CNH</symbol>
                         </currency>
                         <currency type="CNX">
                                 <displayName>Kiinan kansanpankin dollari</displayName>
                                 <displayName count="one">Kiinan kansanpankin dollari</displayName>
                                 <displayName count="other">Kiinan kansanpankin dollaria</displayName>
                                 <symbol>CNX</symbol>
                         </currency>
                         <currency type="CNY">
-                                <displayName>Kiinan yuan</displayName>
-                                <displayName count="one">Kiinan yuan</displayName>
-                                <displayName count="other">Kiinan yuania</displayName>
+                                <displayName>Kiinan juan</displayName>
+                                <displayName count="one">Kiinan juan</displayName>
+                                <displayName count="other">Kiinan juania</displayName>
                                 <symbol>CNY</symbol>
-                                <symbol alt="narrow" draft="contributed">¥</symbol>
+                                <symbol alt="narrow">CNY</symbol>
                         </currency>
                         <currency type="COP">
                                 <displayName>Kolumbian peso</displayName>
                                 <displayName count="one">Kolumbian peso</displayName>
                                 <displayName count="other">Kolumbian pesoa</displayName>
                                 <symbol>COP</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">COP</symbol>
                         </currency>
                         <currency type="COU">
                                 <displayName>Kolumbian unidad de valor real</displayName>
                                 <displayName count="one">Kolumbian unidad de valor real</displayName>
                                 <displayName count="other">Kolumbian unidad de valor realia</displayName>
                                 <symbol>COU</symbol>
                         </currency>
                         <currency type="CRC">
-                                <displayName>Costa Rican colon</displayName>
-                                <displayName count="one">Costa Rican colon</displayName>
-                                <displayName count="other">Costa Rican colonia</displayName>
+                                <displayName>Costa Rican colón</displayName>
+                                <displayName count="one">Costa Rican colón</displayName>
+                                <displayName count="other">Costa Rican colónia</displayName>
                                 <symbol>CRC</symbol>
-                                <symbol alt="narrow" draft="contributed">₡</symbol>
+                                <symbol alt="narrow">CRC</symbol>
                         </currency>
                         <currency type="CSD">
                                 <displayName>Serbian dinaari (2002–2006)</displayName>
                                 <displayName count="one">Serbian dinaari (2002–2006)</displayName>
                                 <displayName count="other">Serbian dinaaria (2002–2006)</displayName>

@@ -5576,18 +6312,18 @@
                         <currency type="CUC">
                                 <displayName>Kuuban vaihdettava peso</displayName>
                                 <displayName count="one">Kuuban vaihdettava peso</displayName>
                                 <displayName count="other">Kuuban vaihdettavaa pesoa</displayName>
                                 <symbol>CUC</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">CUC</symbol>
                         </currency>
                         <currency type="CUP">
                                 <displayName>Kuuban peso</displayName>
                                 <displayName count="one">Kuuban peso</displayName>
                                 <displayName count="other">Kuuban pesoa</displayName>
                                 <symbol>CUP</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">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>

@@ -5602,11 +6338,11 @@
                         <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>
-                                <symbol alt="narrow" draft="contributed">Kč</symbol>
+                                <symbol alt="narrow">CZK</symbol>
                         </currency>
                         <currency type="DDM">
                                 <displayName>Itä-Saksan markka</displayName>
                                 <displayName count="one">Itä-Saksan markka</displayName>
                                 <displayName count="other">Itä-Saksan markkaa</displayName>

@@ -5627,18 +6363,18 @@
                         <currency type="DKK">
                                 <displayName>Tanskan kruunu</displayName>
                                 <displayName count="one">Tanskan kruunu</displayName>
                                 <displayName count="other">Tanskan kruunua</displayName>
                                 <symbol>DKK</symbol>
-                                <symbol alt="narrow" draft="contributed">kr</symbol>
+                                <symbol alt="narrow">DKK</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>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">DOP</symbol>
                         </currency>
                         <currency type="DZD">
                                 <displayName>Algerian dinaari</displayName>
                                 <displayName count="one">Algerian dinaari</displayName>
                                 <displayName count="other">Algerian dinaaria</displayName>

@@ -5665,22 +6401,22 @@
                         <currency type="EGP">
                                 <displayName>Egyptin punta</displayName>
                                 <displayName count="one">Egyptin punta</displayName>
                                 <displayName count="other">Egyptin puntaa</displayName>
                                 <symbol>EGP</symbol>
-                                <symbol alt="narrow" draft="contributed">E£</symbol>
+                                <symbol alt="narrow">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>
                                 <symbol>ESA</symbol>
                         </currency>
                         <currency type="ESB">
                                 <displayName>Espanjan peseta (vaihdettava tili)</displayName>
                                 <displayName count="one">Espanjan peseta (vaihdettava tili)</displayName>

@@ -5690,10 +6426,11 @@
                         <currency type="ESP">
                                 <displayName>Espanjan peseta</displayName>
                                 <displayName count="one">Espanjan peseta</displayName>
                                 <displayName count="other">Espanjan pesetaa</displayName>
                                 <symbol>ESP</symbol>
+                                <symbol alt="narrow">ESP</symbol>
                         </currency>
                         <currency type="ETB">
                                 <displayName>Etiopian birr</displayName>
                                 <displayName count="one">Etiopian birr</displayName>
                                 <displayName count="other">Etiopian birriä</displayName>

@@ -5715,18 +6452,18 @@
                         <currency type="FJD">
                                 <displayName>Fidžin dollari</displayName>
                                 <displayName count="one">Fidžin dollari</displayName>
                                 <displayName count="other">Fidžin dollaria</displayName>
                                 <symbol>FJD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">£</symbol>
+                                <symbol alt="narrow">FKP</symbol>
                         </currency>
                         <currency type="FRF">
                                 <displayName>Ranskan frangi</displayName>
                                 <displayName count="one">Ranskan frangi</displayName>
                                 <displayName count="other">Ranskan frangia</displayName>

@@ -5748,11 +6485,11 @@
                         <currency type="GEL">
                                 <displayName>Georgian lari</displayName>
                                 <displayName count="one">Georgian lari</displayName>
                                 <displayName count="other">Georgian laria</displayName>
                                 <symbol>GEL</symbol>
-                                <symbol alt="variant" draft="contributed">₾</symbol>
+                                <symbol alt="narrow">GEL</symbol>
                         </currency>
                         <currency type="GHC">
                                 <displayName>Ghanan cedi (1979–2007)</displayName>
                                 <displayName count="one">Ghanan cedi (1979–2007)</displayName>
                                 <displayName count="other">Ghanan cediä (1979–2007)</displayName>

@@ -5767,11 +6504,11 @@
                         <currency type="GIP">
                                 <displayName>Gibraltarin punta</displayName>
                                 <displayName count="one">Gibraltarin punta</displayName>
                                 <displayName count="other">Gibraltarin puntaa</displayName>
                                 <symbol>GIP</symbol>
-                                <symbol alt="narrow" draft="contributed">£</symbol>
+                                <symbol alt="narrow">GIP</symbol>
                         </currency>
                         <currency type="GMD">
                                 <displayName>Gambian dalasi</displayName>
                                 <displayName count="one">Gambian dalasi</displayName>
                                 <displayName count="other">Gambian dalasia</displayName>

@@ -5780,11 +6517,11 @@
                         <currency type="GNF">
                                 <displayName>Guinean frangi</displayName>
                                 <displayName count="one">Guinean frangi</displayName>
                                 <displayName count="other">Guinean frangia</displayName>
                                 <symbol>GNF</symbol>
-                                <symbol alt="narrow" draft="contributed">FG</symbol>
+                                <symbol alt="narrow">GNF</symbol>
                         </currency>
                         <currency type="GNS">
                                 <displayName>Guinean syli</displayName>
                                 <displayName count="one">Guinean syli</displayName>
                                 <displayName count="other">Guinean syliä</displayName>

@@ -5805,11 +6542,11 @@
                         <currency type="GTQ">
                                 <displayName>Guatemalan quetzal</displayName>
                                 <displayName count="one">Guatemalan quetzal</displayName>
                                 <displayName count="other">Guatemalan quetzalia</displayName>
                                 <symbol>GTQ</symbol>
-                                <symbol alt="narrow" draft="contributed">Q</symbol>
+                                <symbol alt="narrow">GTQ</symbol>
                         </currency>
                         <currency type="GWE">
                                 <displayName>Portugalin Guinean escudo</displayName>
                                 <displayName count="one">Portugalin Guinean escudo</displayName>
                                 <displayName count="other">Portugalin Guinean escudoa</displayName>

@@ -5824,25 +6561,25 @@
                         <currency type="GYD">
                                 <displayName>Guyanan dollari</displayName>
                                 <displayName count="one">Guyanan dollari</displayName>
                                 <displayName count="other">Guyanan dollaria</displayName>
                                 <symbol>GYD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">GYD</symbol>
                         </currency>
                         <currency type="HKD">
                                 <displayName>Hongkongin dollari</displayName>
                                 <displayName count="one">Hongkongin dollari</displayName>
                                 <displayName count="other">Hongkongin dollaria</displayName>
                                 <symbol>HKD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">HKD</symbol>
                         </currency>
                         <currency type="HNL">
                                 <displayName>Hondurasin lempira</displayName>
                                 <displayName count="one">Hondurasin lempira</displayName>
                                 <displayName count="other">Hondurasin lempiraa</displayName>
                                 <symbol>HNL</symbol>
-                                <symbol alt="narrow" draft="contributed">L</symbol>
+                                <symbol alt="narrow">HNL</symbol>
                         </currency>
                         <currency type="HRD">
                                 <displayName>Kroatian dinaari</displayName>
                                 <displayName count="one">Kroatian dinaari</displayName>
                                 <displayName count="other">Kroatian dinaaria</displayName>

@@ -5851,11 +6588,11 @@
                         <currency type="HRK">
                                 <displayName>Kroatian kuna</displayName>
                                 <displayName count="one">Kroatian kuna</displayName>
                                 <displayName count="other">Kroatian kunaa</displayName>
                                 <symbol>HRK</symbol>
-                                <symbol alt="narrow" draft="contributed">kn</symbol>
+                                <symbol alt="narrow">HRK</symbol>
                         </currency>
                         <currency type="HTG">
                                 <displayName>Haitin gourde</displayName>
                                 <displayName count="one">Haitin gourde</displayName>
                                 <displayName count="other">Haitin gourdea</displayName>

@@ -5864,18 +6601,18 @@
                         <currency type="HUF">
                                 <displayName>Unkarin forintti</displayName>
                                 <displayName count="one">Unkarin forintti</displayName>
                                 <displayName count="other">Unkarin forinttia</displayName>
                                 <symbol>HUF</symbol>
-                                <symbol alt="narrow" draft="contributed">Ft</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">Rp</symbol>
+                                <symbol alt="narrow">IDR</symbol>
                         </currency>
                         <currency type="IEP">
                                 <displayName>Irlannin punta</displayName>
                                 <displayName count="one">Irlannin punta</displayName>
                                 <displayName count="other">Irlannin puntaa</displayName>

@@ -5896,18 +6633,18 @@
                         <currency type="ILS">
                                 <displayName>Israelin uusi sekeli</displayName>
                                 <displayName count="one">Israelin uusi sekeli</displayName>
                                 <displayName count="other">Israelin uutta sekeliä</displayName>
                                 <symbol>ILS</symbol>
-                                <symbol alt="narrow" draft="contributed">₪</symbol>
+                                <symbol alt="narrow">ILS</symbol>
                         </currency>
                         <currency type="INR">
                                 <displayName>Intian rupia</displayName>
                                 <displayName count="one">Intian rupia</displayName>
                                 <displayName count="other">Intian rupiaa</displayName>
                                 <symbol>INR</symbol>
-                                <symbol alt="narrow" draft="contributed">₹</symbol>
+                                <symbol alt="narrow">INR</symbol>
                         </currency>
                         <currency type="IQD">
                                 <displayName>Irakin dinaari</displayName>
                                 <displayName count="one">Irakin dinaari</displayName>
                                 <displayName count="other">Irakin dinaaria</displayName>

@@ -5928,11 +6665,11 @@
                         <currency type="ISK">
                                 <displayName>Islannin kruunu</displayName>
                                 <displayName count="one">Islannin kruunu</displayName>
                                 <displayName count="other">Islannin kruunua</displayName>
                                 <symbol>ISK</symbol>
-                                <symbol alt="narrow" draft="contributed">kr</symbol>
+                                <symbol alt="narrow">ISK</symbol>
                         </currency>
                         <currency type="ITL">
                                 <displayName>Italian liira</displayName>
                                 <displayName count="one">Italian liira</displayName>
                                 <displayName count="other">Italian liiraa</displayName>

@@ -5941,11 +6678,11 @@
                         <currency type="JMD">
                                 <displayName>Jamaikan dollari</displayName>
                                 <displayName count="one">Jamaikan dollari</displayName>
                                 <displayName count="other">Jamaikan dollaria</displayName>
                                 <symbol>JMD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">JMD</symbol>
                         </currency>
                         <currency type="JOD">
                                 <displayName>Jordanian dinaari</displayName>
                                 <displayName count="one">Jordanian dinaari</displayName>
                                 <displayName count="other">Jordanian dinaaria</displayName>

@@ -5973,25 +6710,25 @@
                         <currency type="KHR">
                                 <displayName>Kambodžan riel</displayName>
                                 <displayName count="one">Kambodžan riel</displayName>
                                 <displayName count="other">Kambodžan rieliä</displayName>
                                 <symbol>KHR</symbol>
-                                <symbol alt="narrow" draft="contributed">៛</symbol>
+                                <symbol alt="narrow">KHR</symbol>
                         </currency>
                         <currency type="KMF">
                                 <displayName>Komorien frangi</displayName>
                                 <displayName count="one">Komorien frangi</displayName>
                                 <displayName count="other">Komorien frangia</displayName>
                                 <symbol>KMF</symbol>
-                                <symbol alt="narrow" draft="contributed">CF</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">₩</symbol>
+                                <symbol alt="narrow">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>

@@ -6006,11 +6743,11 @@
                         <currency type="KRW">
                                 <displayName>Etelä-Korean won</displayName>
                                 <displayName count="one">Etelä-Korean won</displayName>
                                 <displayName count="other">Etelä-Korean wonia</displayName>
                                 <symbol>KRW</symbol>
-                                <symbol alt="narrow" draft="contributed">₩</symbol>
+                                <symbol alt="narrow">KRW</symbol>
                         </currency>
                         <currency type="KWD">
                                 <displayName>Kuwaitin dinaari</displayName>
                                 <displayName count="one">Kuwaitin dinaari</displayName>
                                 <displayName count="other">Kuwaitin dinaaria</displayName>

@@ -6019,46 +6756,46 @@
                         <currency type="KYD">
                                 <displayName>Caymansaarten dollari</displayName>
                                 <displayName count="one">Caymansaarten dollari</displayName>
                                 <displayName count="other">Caymansaarten dollaria</displayName>
                                 <symbol>KYD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">KYD</symbol>
                         </currency>
                         <currency type="KZT">
                                 <displayName>Kazakstanin tenge</displayName>
                                 <displayName count="one">Kazakstanin tenge</displayName>
                                 <displayName count="other">Kazakstanin tengeä</displayName>
                                 <symbol>KZT</symbol>
-                                <symbol alt="narrow" draft="contributed">₸</symbol>
+                                <symbol alt="narrow">KZT</symbol>
                         </currency>
                         <currency type="LAK">
                                 <displayName>Laosin kip</displayName>
                                 <displayName count="one">Laosin kip</displayName>
                                 <displayName count="other">Laosin kipiä</displayName>
                                 <symbol>LAK</symbol>
-                                <symbol alt="narrow" draft="contributed">₭</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">L£</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">Rs</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">LRD</symbol>
                         </currency>
                         <currency type="LSL">
                                 <displayName>Lesothon loti</displayName>
                                 <displayName count="one">Lesothon loti</displayName>
                                 <displayName count="other">Lesothon lotia</displayName>

@@ -6067,10 +6804,11 @@
                         <currency type="LTL">
                                 <displayName>Liettuan liti</displayName>
                                 <displayName count="one">Liettuan liti</displayName>
                                 <displayName count="other">Liettuan litiä</displayName>
                                 <symbol>LTL</symbol>
+                                <symbol alt="narrow">LTL</symbol>
                         </currency>
                         <currency type="LTT">
                                 <displayName>Liettuan talonas</displayName>
                                 <displayName count="one">Liettuan talonas</displayName>
                                 <displayName count="other">Liettuan talonasia</displayName>

@@ -6097,10 +6835,11 @@
                         <currency type="LVL">
                                 <displayName>Latvian lati</displayName>
                                 <displayName count="one">Latvian lati</displayName>
                                 <displayName count="other">Latvian latia</displayName>
                                 <symbol>LVL</symbol>
+                                <symbol alt="narrow">LVL</symbol>
                         </currency>
                         <currency type="LVR">
                                 <displayName>Latvian rupla</displayName>
                                 <displayName count="one">Latvian rupla</displayName>
                                 <displayName count="other">Latvian ruplaa</displayName>

@@ -6145,11 +6884,11 @@
                         <currency type="MGA">
                                 <displayName>Madagaskarin ariary</displayName>
                                 <displayName count="one">Madagaskarin ariary</displayName>
                                 <displayName count="other">Madagaskarin ariarya</displayName>
                                 <symbol>MGA</symbol>
-                                <symbol alt="narrow" draft="contributed">Ar</symbol>
+                                <symbol alt="narrow">MGA</symbol>
                         </currency>
                         <currency type="MGF">
                                 <displayName>Madagaskarin frangi</displayName>
                                 <displayName count="one">Madagaskarin frangi</displayName>
                                 <displayName count="other">Madagaskarin frangia</displayName>

@@ -6176,30 +6915,35 @@
                         <currency type="MMK">
                                 <displayName>Myanmarin kyat</displayName>
                                 <displayName count="one">Myanmarin kyat</displayName>
                                 <displayName count="other">Myanmarin kyatia</displayName>
                                 <symbol>MMK</symbol>
-                                <symbol alt="narrow" draft="contributed">K</symbol>
+                                <symbol alt="narrow">MMK</symbol>
                         </currency>
                         <currency type="MNT">
                                 <displayName>Mongolian tugrik</displayName>
                                 <displayName count="one">Mongolian tugrik</displayName>
                                 <displayName count="other">Mongolian tugrikia</displayName>
                                 <symbol>MNT</symbol>
-                                <symbol alt="narrow" draft="contributed">₮</symbol>
+                                <symbol alt="narrow">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 (1973–2017)</displayName>
+                                <displayName count="one">Mauritanian ouguiya (1973–2017)</displayName>
+                                <displayName count="other">Mauritanian ouguiyaa (1973–2017)</displayName>
+                                <symbol>MRO</symbol>
+                        </currency>
+                        <currency type="MRU">
                                 <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>

@@ -6214,11 +6958,11 @@
                         <currency type="MUR">
                                 <displayName>Mauritiuksen rupia</displayName>
                                 <displayName count="one">Mauritiuksen rupia</displayName>
                                 <displayName count="other">Mauritiuksen rupiaa</displayName>
                                 <symbol>MUR</symbol>
-                                <symbol alt="narrow" draft="contributed">Rs</symbol>
+                                <symbol alt="narrow">MUR</symbol>
                         </currency>
                         <currency type="MVP">
                                 <displayName>Malediivien rupia (1947–1981)</displayName>
                                 <displayName count="one">Malediivien rupia (1947–1981)</displayName>
                                 <displayName count="other">Malediivien rupiaa (1947–1981)</displayName>

@@ -6239,11 +6983,11 @@
                         <currency type="MXN">
                                 <displayName>Meksikon peso</displayName>
                                 <displayName count="one">Meksikon peso</displayName>
                                 <displayName count="other">Meksikon pesoa</displayName>
                                 <symbol>MXN</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">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>

@@ -6258,11 +7002,11 @@
                         <currency type="MYR">
                                 <displayName>Malesian ringgit</displayName>
                                 <displayName count="one">Malesian ringgit</displayName>
                                 <displayName count="other">Malesian ringgitiä</displayName>
                                 <symbol>MYR</symbol>
-                                <symbol alt="narrow" draft="contributed">RM</symbol>
+                                <symbol alt="narrow">MYR</symbol>
                         </currency>
                         <currency type="MZE">
                                 <displayName>Mosambikin escudo</displayName>
                                 <displayName count="one">Mosambikin escudo</displayName>
                                 <displayName count="other">Mosambikin escudoa</displayName>

@@ -6283,31 +7027,31 @@
                         <currency type="NAD">
                                 <displayName>Namibian dollari</displayName>
                                 <displayName count="one">Namibian dollari</displayName>
                                 <displayName count="other">Namibian dollaria</displayName>
                                 <symbol>NAD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">₦</symbol>
+                                <symbol alt="narrow">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>
+                                <displayName>Nicaraguan córdoba (1988–1991)</displayName>
+                                <displayName count="one">Nicaraguan córdoba (1988–1991)</displayName>
+                                <displayName count="other">Nicaraguan córdobaa (1988–1991)</displayName>
                                 <symbol>NIC</symbol>
                         </currency>
                         <currency type="NIO">
-                                <displayName>Nicaraguan cordoba</displayName>
-                                <displayName count="one">Nicaraguan cordoba</displayName>
-                                <displayName count="other">Nicaraguan cordobaa</displayName>
+                                <displayName>Nicaraguan córdoba</displayName>
+                                <displayName count="one">Nicaraguan córdoba</displayName>
+                                <displayName count="other">Nicaraguan córdobaa</displayName>
                                 <symbol>NIO</symbol>
-                                <symbol alt="narrow" draft="contributed">C$</symbol>
+                                <symbol alt="narrow">NIO</symbol>
                         </currency>
                         <currency type="NLG">
                                 <displayName>Alankomaiden guldeni</displayName>
                                 <displayName count="one">Alankomaiden guldeni</displayName>
                                 <displayName count="other">Alankomaiden guldenia</displayName>

@@ -6316,25 +7060,25 @@
                         <currency type="NOK">
                                 <displayName>Norjan kruunu</displayName>
                                 <displayName count="one">Norjan kruunu</displayName>
                                 <displayName count="other">Norjan kruunua</displayName>
                                 <symbol>NOK</symbol>
-                                <symbol alt="narrow" draft="contributed">kr</symbol>
+                                <symbol alt="narrow">NOK</symbol>
                         </currency>
                         <currency type="NPR">
                                 <displayName>Nepalin rupia</displayName>
                                 <displayName count="one">Nepalin rupia</displayName>
                                 <displayName count="other">Nepalin rupiaa</displayName>
                                 <symbol>NPR</symbol>
-                                <symbol alt="narrow" draft="contributed">Rs</symbol>
+                                <symbol alt="narrow">NPR</symbol>
                         </currency>
                         <currency type="NZD">
                                 <displayName>Uuden-Seelannin dollari</displayName>
                                 <displayName count="one">Uuden-Seelannin dollari</displayName>
                                 <displayName count="other">Uuden-Seelannin dollaria</displayName>
                                 <symbol>NZD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">NZD</symbol>
                         </currency>
                         <currency type="OMR">
                                 <displayName>Omanin rial</displayName>
                                 <displayName count="one">Omanin rial</displayName>
                                 <displayName count="other">Omanin rialia</displayName>

@@ -6351,13 +7095,13 @@
                                 <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>
+                                <displayName>Perun sol</displayName>
+                                <displayName count="one">Perun sol</displayName>
+                                <displayName count="other">Perun solia</displayName>
                                 <symbol>PEN</symbol>
                         </currency>
                         <currency type="PES">
                                 <displayName>Perun sol (1863–1965)</displayName>
                                 <displayName count="one">Perun sol (1863–1965)</displayName>

@@ -6373,30 +7117,30 @@
                         <currency type="PHP">
                                 <displayName>Filippiinien peso</displayName>
                                 <displayName count="one">Filippiinien peso</displayName>
                                 <displayName count="other">Filippiinien pesoa</displayName>
                                 <symbol>PHP</symbol>
-                                <symbol alt="narrow" draft="contributed">₱</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">Rs</symbol>
+                                <symbol alt="narrow">PKR</symbol>
                         </currency>
                         <currency type="PLN">
-                                <displayName>Puolan zloty</displayName>
-                                <displayName count="one">Puolan zloty</displayName>
-                                <displayName count="other">Puolan zlotya</displayName>
+                                <displayName>Puolan złoty</displayName>
+                                <displayName count="one">Puolan złoty</displayName>
+                                <displayName count="other">Puolan złotya</displayName>
                                 <symbol>PLN</symbol>
-                                <symbol alt="narrow" draft="contributed">zł</symbol>
+                                <symbol alt="narrow">PLN</symbol>
                         </currency>
                         <currency type="PLZ">
-                                <displayName>Puolan zloty (1950–1995)</displayName>
-                                <displayName count="one">Puolan zloty (1950–1995)</displayName>
-                                <displayName count="other">Puolan zlotya (1950–1995)</displayName>
+                                <displayName>Puolan złoty (1950–1995)</displayName>
+                                <displayName count="one">Puolan złoty (1950–1995)</displayName>
+                                <displayName count="other">Puolan złotya (1950–1995)</displayName>
                                 <symbol>PLZ</symbol>
                         </currency>
                         <currency type="PTE">
                                 <displayName>Portugalin escudo</displayName>
                                 <displayName count="one">Portugalin escudo</displayName>

@@ -6406,11 +7150,11 @@
                         <currency type="PYG">
                                 <displayName>Paraguayn guarani</displayName>
                                 <displayName count="one">Paraguayn guarani</displayName>
                                 <displayName count="other">Paraguayn guarania</displayName>
                                 <symbol>PYG</symbol>
-                                <symbol alt="narrow" draft="contributed">₲</symbol>
+                                <symbol alt="narrow">PYG</symbol>
                         </currency>
                         <currency type="QAR">
                                 <displayName>Qatarin rial</displayName>
                                 <displayName count="one">Qatarin rial</displayName>
                                 <displayName count="other">Qatarin rialia</displayName>

@@ -6431,10 +7175,11 @@
                         <currency type="RON">
                                 <displayName>Romanian leu</displayName>
                                 <displayName count="one">Romanian leu</displayName>
                                 <displayName count="other">Romanian leuta</displayName>
                                 <symbol>RON</symbol>
+                                <symbol alt="narrow">RON</symbol>
                         </currency>
                         <currency type="RSD">
                                 <displayName>Serbian dinaari</displayName>
                                 <displayName count="one">Serbian dinaari</displayName>
                                 <displayName count="other">Serbian dinaaria</displayName>

@@ -6443,24 +7188,25 @@
                         <currency type="RUB">
                                 <displayName>Venäjän rupla</displayName>
                                 <displayName count="one">Venäjän rupla</displayName>
                                 <displayName count="other">Venäjän ruplaa</displayName>
                                 <symbol>RUB</symbol>
-                                <symbol alt="narrow" draft="contributed">₽</symbol>
+                                <symbol alt="narrow">₽</symbol>
                         </currency>
                         <currency type="RUR">
                                 <displayName>Venäjän rupla (1991–1998)</displayName>
                                 <displayName count="one">Venäjän rupla (1991–1998)</displayName>
                                 <displayName count="other">Venäjän ruplaa (1991–1998)</displayName>
                                 <symbol>RUR</symbol>
+                                <symbol alt="narrow">RUR</symbol>
                         </currency>
                         <currency type="RWF">
                                 <displayName>Ruandan frangi</displayName>
                                 <displayName count="one">Ruandan frangi</displayName>
                                 <displayName count="other">Ruandan frangia</displayName>
                                 <symbol>RWF</symbol>
-                                <symbol alt="narrow" draft="contributed">RF</symbol>
+                                <symbol alt="narrow">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>

@@ -6469,11 +7215,11 @@
                         <currency type="SBD">
                                 <displayName>Salomonsaarten dollari</displayName>
                                 <displayName count="one">Salomonsaarten dollari</displayName>
                                 <displayName count="other">Salomonsaarten dollaria</displayName>
                                 <symbol>SBD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">SBD</symbol>
                         </currency>
                         <currency type="SCR">
                                 <displayName>Seychellien rupia</displayName>
                                 <displayName count="one">Seychellien rupia</displayName>
                                 <displayName count="other">Seychellien rupiaa</displayName>

@@ -6500,25 +7246,25 @@
                         <currency type="SEK">
                                 <displayName>Ruotsin kruunu</displayName>
                                 <displayName count="one">Ruotsin kruunu</displayName>
                                 <displayName count="other">Ruotsin kruunua</displayName>
                                 <symbol>SEK</symbol>
-                                <symbol alt="narrow" draft="contributed">kr</symbol>
+                                <symbol alt="narrow">SEK</symbol>
                         </currency>
                         <currency type="SGD">
                                 <displayName>Singaporen dollari</displayName>
                                 <displayName count="one">Singaporen dollari</displayName>
                                 <displayName count="other">Singaporen dollaria</displayName>
                                 <symbol>SGD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">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>
-                                <symbol alt="narrow" draft="contributed">£</symbol>
+                                <symbol alt="narrow">SHP</symbol>
                         </currency>
                         <currency type="SIT">
                                 <displayName>Slovenian tolar</displayName>
                                 <displayName count="one">Slovenian tolar</displayName>
                                 <displayName count="other">Slovenian tolaria</displayName>

@@ -6541,54 +7287,60 @@
                                 <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>
+                                <displayName>Surinamen dollari</displayName>
+                                <displayName count="one">Surinamen dollari</displayName>
+                                <displayName count="other">Surinamen dollaria</displayName>
                                 <symbol>SRD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">SRD</symbol>
                         </currency>
                         <currency type="SRG">
-                                <displayName>Surinamin guldeni</displayName>
-                                <displayName count="one">Surinamin guldeni</displayName>
-                                <displayName count="other">Surinamin guldenia</displayName>
+                                <displayName>Surinamen guldeni</displayName>
+                                <displayName count="one">Surinamen guldeni</displayName>
+                                <displayName count="other">Surinamen guldeni</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>
                                 <symbol>SSP</symbol>
-                                <symbol alt="narrow" draft="contributed">£</symbol>
+                                <symbol alt="narrow">SSP</symbol>
                         </currency>
                         <currency type="STD">
+                                <displayName>São Tomén ja Príncipen dobra (1977–2017)</displayName>
+                                <displayName count="one">São Tomén ja Príncipen dobra (1977–2017)</displayName>
+                                <displayName count="other">São Tomén ja Príncipen dobraa (1977–2017)</displayName>
+                                <symbol>STD</symbol>
+                        </currency>
+                        <currency type="STN">
                                 <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>
-                                <symbol alt="narrow" draft="contributed">Db</symbol>
+                                <symbol draft="contributed">STN</symbol>
+                                <symbol alt="narrow">STD</symbol>
                         </currency>
                         <currency type="SUR">
                                 <displayName>Neuvostoliiton rupla</displayName>
                                 <displayName count="one">Neuvostoliiton rupla</displayName>
                                 <displayName count="other">Neuvostoliiton ruplaa</displayName>
                                 <symbol>SUR</symbol>
                         </currency>
                         <currency type="SVC">
-                                <displayName>El Salvadorin colon</displayName>
-                                <displayName count="one">El Salvadorin colon</displayName>
-                                <displayName count="other">El Salvadorin colonia</displayName>
+                                <displayName>El Salvadorin colón</displayName>
+                                <displayName count="one">El Salvadorin colón</displayName>
+                                <displayName count="other">El Salvadorin colónia</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>
-                                <symbol alt="narrow" draft="contributed">£</symbol>
+                                <symbol alt="narrow">SYP</symbol>
                         </currency>
                         <currency type="SZL">
                                 <displayName>Swazimaan lilangeni</displayName>
                                 <displayName count="one">Swazimaan lilangeni</displayName>
                                 <displayName count="other">Swazimaan lilangenia</displayName>

@@ -6597,11 +7349,11 @@
                         <currency type="THB">
                                 <displayName>Thaimaan baht</displayName>
                                 <displayName count="one">Thaimaan baht</displayName>
                                 <displayName count="other">Thaimaan bahtia</displayName>
                                 <symbol>THB</symbol>
-                                <symbol alt="narrow" draft="contributed">฿</symbol>
+                                <symbol alt="narrow">THB</symbol>
                         </currency>
                         <currency type="TJR">
                                 <displayName>Tadžikistanin rupla</displayName>
                                 <displayName count="one">Tadžikistanin rupla</displayName>
                                 <displayName count="other">Tadžikistanin ruplaa</displayName>

@@ -6634,11 +7386,11 @@
                         <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>
-                                <symbol alt="narrow" draft="contributed">T$</symbol>
+                                <symbol alt="narrow">TOP</symbol>
                         </currency>
                         <currency type="TPE">
                                 <displayName>Timorin escudo</displayName>
                                 <displayName count="one">Timorin escudo</displayName>
                                 <displayName count="other">Timorin escudoa</displayName>

@@ -6653,26 +7405,26 @@
                         <currency type="TRY">
                                 <displayName>Turkin liira</displayName>
                                 <displayName count="one">Turkin liira</displayName>
                                 <displayName count="other">Turkin liiraa</displayName>
                                 <symbol>TRY</symbol>
-                                <symbol alt="narrow" draft="contributed">₺</symbol>
+                                <symbol alt="narrow">TRY</symbol>
                                 <symbol alt="variant" draft="contributed">TL</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>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">TTD</symbol>
                         </currency>
                         <currency type="TWD">
                                 <displayName>Taiwanin uusi dollari</displayName>
                                 <displayName count="one">Taiwanin uusi dollari</displayName>
                                 <displayName count="other">Taiwanin uutta dollaria</displayName>
                                 <symbol>TWD</symbol>
-                                <symbol alt="narrow" draft="contributed">NT$</symbol>
+                                <symbol alt="narrow">TWD</symbol>
                         </currency>
                         <currency type="TZS">
                                 <displayName>Tansanian šillinki</displayName>
                                 <displayName count="one">Tansanian šillinki</displayName>
                                 <displayName count="other">Tansanian šillinkiä</displayName>

@@ -6681,11 +7433,11 @@
                         <currency type="UAH">
                                 <displayName>Ukrainan hryvnia</displayName>
                                 <displayName count="one">Ukrainan hryvnia</displayName>
                                 <displayName count="other">Ukrainan hryvniaa</displayName>
                                 <symbol>UAH</symbol>
-                                <symbol alt="narrow" draft="contributed">₴</symbol>
+                                <symbol alt="narrow">UAH</symbol>
                         </currency>
                         <currency type="UAK">
                                 <displayName>Ukrainan karbovanetz</displayName>
                                 <displayName count="one">Ukrainan karbovanetz</displayName>
                                 <displayName count="other">Ukrainan karbovanetzia</displayName>

@@ -6737,11 +7489,11 @@
                         <currency type="UYU">
                                 <displayName>Uruguayn peso</displayName>
                                 <displayName count="one">Uruguayn peso</displayName>
                                 <displayName count="other">Uruguayn pesoa</displayName>
                                 <symbol>UYU</symbol>
-                                <symbol alt="narrow" draft="contributed">$U</symbol>
+                                <symbol alt="narrow">UYU</symbol>
                         </currency>
                         <currency type="UZS">
                                 <displayName>Uzbekistanin som</displayName>
                                 <displayName count="one">Uzbekistanin som</displayName>
                                 <displayName count="other">Uzbekistanin somia</displayName>

@@ -6756,18 +7508,18 @@
                         <currency type="VEF">
                                 <displayName>Venezuelan bolivar</displayName>
                                 <displayName count="one">Venezuelan bolivar</displayName>
                                 <displayName count="other">Venezuelan bolivaria</displayName>
                                 <symbol>VEF</symbol>
-                                <symbol alt="narrow" draft="contributed">Bs</symbol>
+                                <symbol alt="narrow">VEF</symbol>
                         </currency>
                         <currency type="VND">
                                 <displayName>Vietnamin dong</displayName>
                                 <displayName count="one">Vietnamin dong</displayName>
                                 <displayName count="other">Vietnamin dongia</displayName>
                                 <symbol>VND</symbol>
-                                <symbol alt="narrow" draft="contributed">₫</symbol>
+                                <symbol alt="narrow">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>

@@ -6830,11 +7582,11 @@
                         <currency type="XCD">
                                 <displayName>Itä-Karibian dollari</displayName>
                                 <displayName count="one">Itä-Karibian dollari</displayName>
                                 <displayName count="other">Itä-Karibian dollaria</displayName>
                                 <symbol>XCD</symbol>
-                                <symbol alt="narrow" draft="contributed">$</symbol>
+                                <symbol alt="narrow">XCD</symbol>
                         </currency>
                         <currency type="XDR">
                                 <displayName>erityisnosto-oikeus (SDR)</displayName>
                                 <displayName count="one">erityisnosto-oikeus (SDR)</displayName>
                                 <displayName count="other">erityisnosto-oikeutta (SDR)</displayName>

@@ -6899,13 +7651,13 @@
                                 <displayName count="one">testaustarkoitukseen varattu valuuttakoodi</displayName>
                                 <displayName count="other">testaustarkoitukseen varattua valuuttakoodia</displayName>
                                 <symbol>XTS</symbol>
                         </currency>
                         <currency type="XUA">
-                                <displayName>afrikkalainen ADB-laskentayksikkö</displayName>
-                                <displayName count="one">ADB-laskentayksikkö</displayName>
-                                <displayName count="other">ADB-laskentayksikköä</displayName>
+                                <displayName>afrikkalainen AfDB-laskentayksikkö</displayName>
+                                <displayName count="one">AfDB-laskentayksikkö</displayName>
+                                <displayName count="other">AfDB-laskentayksikköä</displayName>
                                 <symbol>XUA</symbol>
                         </currency>
                         <currency type="XXX">
                                 <displayName>tuntematon rahayksikkö</displayName>
                                 <displayName count="one">tuntematon rahayksikkö</displayName>

@@ -6957,11 +7709,11 @@
                         <currency type="ZAR">
                                 <displayName>Etelä-Afrikan randi</displayName>
                                 <displayName count="one">Etelä-Afrikan randi</displayName>
                                 <displayName count="other">Etelä-Afrikan randia</displayName>
                                 <symbol>ZAR</symbol>
-                                <symbol alt="narrow" draft="contributed">R</symbol>
+                                <symbol alt="narrow">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>

@@ -6970,11 +7722,11 @@
                         <currency type="ZMW">
                                 <displayName>Sambian kwacha</displayName>
                                 <displayName count="one">Sambian kwacha</displayName>
                                 <displayName count="other">Sambian kwachaa</displayName>
                                 <symbol>ZMW</symbol>
-                                <symbol alt="narrow" draft="contributed">ZK</symbol>
+                                <symbol alt="narrow">ZMW</symbol>
                         </currency>
                         <currency type="ZRN">
                                 <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>

@@ -7005,12 +7757,17 @@
                                 <symbol>ZWR</symbol>
                         </currency>
                 </currencies>
                 <miscPatterns numberSystem="latn">
                         <pattern type="atLeast">vähintään {0}</pattern>
-                        <pattern type="range">{0}‒{1}</pattern>
+                        <pattern type="range">{0}–{1}</pattern>
                 </miscPatterns>
+                <minimalPairs>
+                        <pluralMinimalPairs count="one">{0} päivä</pluralMinimalPairs>
+                        <pluralMinimalPairs count="other">{0} päivää</pluralMinimalPairs>
+                        <ordinalMinimalPairs ordinal="other">Käänny {0}. risteyksestä oikealle.</ordinalMinimalPairs>
+                </minimalPairs>
         </numbers>
         <units>
                 <unitLength type="long">
                         <compoundUnit type="per">
                                 <compoundUnitPattern>{0}/{1}</compoundUnitPattern>

@@ -7052,10 +7809,11 @@
                         </unit>
                         <unit type="area-square-kilometer">
                                 <displayName>neliökilometrit</displayName>
                                 <unitPattern count="one">{0} neliökilometri</unitPattern>
                                 <unitPattern count="other">{0} neliökilometriä</unitPattern>
+                                <perUnitPattern>{0} / neliökilometri</perUnitPattern>
                         </unit>
                         <unit type="area-hectare">
                                 <displayName>hehtaarit</displayName>
                                 <unitPattern count="one">{0} hehtaari</unitPattern>
                                 <unitPattern count="other">{0} hehtaaria</unitPattern>

@@ -7074,10 +7832,11 @@
                         </unit>
                         <unit type="area-square-mile">
                                 <displayName>neliömailit</displayName>
                                 <unitPattern count="one">{0} neliömaili</unitPattern>
                                 <unitPattern count="other">{0} neliömailia</unitPattern>
+                                <perUnitPattern>{0} / neliömaili</perUnitPattern>
                         </unit>
                         <unit type="area-acre">
                                 <displayName>eekkerit</displayName>
                                 <unitPattern count="one">{0} eekkeri</unitPattern>
                                 <unitPattern count="other">{0} eekkeriä</unitPattern>

@@ -7101,24 +7860,44 @@
                         <unit type="concentr-karat">
                                 <displayName>karaatit</displayName>
                                 <unitPattern count="one">{0} karaatti</unitPattern>
                                 <unitPattern count="other">{0} karaattia</unitPattern>
                         </unit>
+                        <unit type="concentr-milligram-per-deciliter">
+                                <displayName>mg/dl</displayName>
+                                <unitPattern count="one">{0} mg/dl</unitPattern>
+                                <unitPattern count="other">{0} mg/dl</unitPattern>
+                        </unit>
+                        <unit type="concentr-millimole-per-liter">
+                                <displayName>mmol/l</displayName>
+                                <unitPattern count="one">{0} mmol/l</unitPattern>
+                                <unitPattern count="other">{0} mmol/l</unitPattern>
+                        </unit>
+                        <unit type="concentr-part-per-million">
+                                <displayName>ppm</displayName>
+                                <unitPattern count="one">{0} ppm</unitPattern>
+                                <unitPattern count="other">{0} ppm</unitPattern>
+                        </unit>
                         <unit type="consumption-liter-per-kilometer">
-                                <displayName>litrat per kilometri</displayName>
-                                <unitPattern count="one">{0} litra per kilometri</unitPattern>
-                                <unitPattern count="other">{0} litraa per kilometri</unitPattern>
+                                <displayName>litrat / kilometri</displayName>
+                                <unitPattern count="one">{0} litra / kilometri</unitPattern>
+                                <unitPattern count="other">{0} litraa / kilometri</unitPattern>
                         </unit>
                         <unit type="consumption-liter-per-100kilometers">
-                                <displayName>litrat per 100 kilometriä</displayName>
-                                <unitPattern count="one">{0} litra per 100 km</unitPattern>
-                                <unitPattern count="other">{0} litraa per 100 km</unitPattern>
+                                <displayName>litrat / 100 kilometriä</displayName>
+                                <unitPattern count="one">{0} litra / 100 km</unitPattern>
+                                <unitPattern count="other">{0} litraa / 100 km</unitPattern>
                         </unit>
                         <unit type="consumption-mile-per-gallon">
-                                <displayName>mailit per gallona</displayName>
-                                <unitPattern count="one">{0} maili per gallona</unitPattern>
-                                <unitPattern count="other">{0} mailia per gallona</unitPattern>
+                                <displayName>mailit / am. gallona</displayName>
+                                <unitPattern count="one">{0} maili / am. gallona</unitPattern>
+                                <unitPattern count="other">{0} mailia / am. gallona</unitPattern>
+                        </unit>
+                        <unit type="consumption-mile-per-gallon-imperial">
+                                <displayName>mailit / br. gallona</displayName>
+                                <unitPattern count="one">{0} maili / br. gallona</unitPattern>
+                                <unitPattern count="other">{0} mailia / br. gallona</unitPattern>
                         </unit>
                         <unit type="digital-terabyte">
                                 <displayName>teratavut</displayName>
                                 <unitPattern count="one">{0} teratavu</unitPattern>
                                 <unitPattern count="other">{0} teratavua</unitPattern>

@@ -7175,47 +7954,47 @@
                         </unit>
                         <unit type="duration-year">
                                 <displayName>vuodet</displayName>
                                 <unitPattern count="one">{0} vuosi</unitPattern>
                                 <unitPattern count="other">{0} vuotta</unitPattern>
-                                <perUnitPattern>{0} vuodessa</perUnitPattern>
+                                <perUnitPattern>{0} / vuosi</perUnitPattern>
                         </unit>
                         <unit type="duration-month">
                                 <displayName>kuukaudet</displayName>
                                 <unitPattern count="one">{0} kuukausi</unitPattern>
                                 <unitPattern count="other">{0} kuukautta</unitPattern>
-                                <perUnitPattern>{0} kuukaudessa</perUnitPattern>
+                                <perUnitPattern>{0} / kuukausi</perUnitPattern>
                         </unit>
                         <unit type="duration-week">
                                 <displayName>viikot</displayName>
                                 <unitPattern count="one">{0} viikko</unitPattern>
                                 <unitPattern count="other">{0} viikkoa</unitPattern>
-                                <perUnitPattern>{0} viikossa</perUnitPattern>
+                                <perUnitPattern>{0} / viikko</perUnitPattern>
                         </unit>
                         <unit type="duration-day">
                                 <displayName>päivät</displayName>
                                 <unitPattern count="one">{0} päivä</unitPattern>
                                 <unitPattern count="other">{0} päivää</unitPattern>
-                                <perUnitPattern>{0} päivässä</perUnitPattern>
+                                <perUnitPattern>{0} / päivä</perUnitPattern>
                         </unit>
                         <unit type="duration-hour">
                                 <displayName>tunnit</displayName>
                                 <unitPattern count="one">{0} tunti</unitPattern>
                                 <unitPattern count="other">{0} tuntia</unitPattern>
-                                <perUnitPattern>{0} tunnissa</perUnitPattern>
+                                <perUnitPattern>{0} / tunti</perUnitPattern>
                         </unit>
                         <unit type="duration-minute">
                                 <displayName>minuutit</displayName>
                                 <unitPattern count="one">{0} minuutti</unitPattern>
                                 <unitPattern count="other">{0} minuuttia</unitPattern>
-                                <perUnitPattern>{0} minuutissa</perUnitPattern>
+                                <perUnitPattern>{0} / minuutti</perUnitPattern>
                         </unit>
                         <unit type="duration-second">
                                 <displayName>sekunnit</displayName>
                                 <unitPattern count="one">{0} sekunti</unitPattern>
                                 <unitPattern count="other">{0} sekuntia</unitPattern>
-                                <perUnitPattern>{0} sekunnissa</perUnitPattern>
+                                <perUnitPattern>{0} / sekunti</perUnitPattern>
                         </unit>
                         <unit type="duration-millisecond">
                                 <displayName>millisekunnit</displayName>
                                 <unitPattern count="one">{0} millisekunti</unitPattern>
                                 <unitPattern count="other">{0} millisekuntia</unitPattern>

@@ -7385,11 +8164,11 @@
                                 <unitPattern count="one">{0} furlong</unitPattern>
                                 <unitPattern count="other">{0} furlongia</unitPattern>
                         </unit>
                         <unit type="length-fathom">
                                 <displayName>sylet</displayName>
-                                <unitPattern count="one">syli</unitPattern>
+                                <unitPattern count="one">{0} syli</unitPattern>
                                 <unitPattern count="other">{0} syltä</unitPattern>
                         </unit>
                         <unit type="length-nautical-mile">
                                 <displayName>meripeninkulmat</displayName>
                                 <unitPattern count="one">{0} meripeninkulma</unitPattern>

@@ -7398,10 +8177,15 @@
                         <unit type="length-mile-scandinavian">
                                 <displayName>peninkulmat</displayName>
                                 <unitPattern count="one">{0} peninkulma</unitPattern>
                                 <unitPattern count="other">{0} peninkulmaa</unitPattern>
                         </unit>
+                        <unit type="length-point">
+                                <displayName>pt</displayName>
+                                <unitPattern count="one">{0} pt</unitPattern>
+                                <unitPattern count="other">{0} pt</unitPattern>
+                        </unit>
                         <unit type="light-lux">
                                 <displayName>luksit</displayName>
                                 <unitPattern count="one">{0} luksi</unitPattern>
                                 <unitPattern count="other">{0} luksia</unitPattern>
                         </unit>

@@ -7412,17 +8196,17 @@
                         </unit>
                         <unit type="mass-kilogram">
                                 <displayName>kilogrammat</displayName>
                                 <unitPattern count="one">{0} kilogramma</unitPattern>
                                 <unitPattern count="other">{0} kilogrammaa</unitPattern>
-                                <perUnitPattern>{0}/kg</perUnitPattern>
+                                <perUnitPattern>{0} / kilogramma</perUnitPattern>
                         </unit>
                         <unit type="mass-gram">
                                 <displayName>grammat</displayName>
                                 <unitPattern count="one">{0} gramma</unitPattern>
                                 <unitPattern count="other">{0} grammaa</unitPattern>
-                                <perUnitPattern>{0}/g</perUnitPattern>
+                                <perUnitPattern>{0} / gramma</perUnitPattern>
                         </unit>
                         <unit type="mass-milligram">
                                 <displayName>milligrammat</displayName>
                                 <unitPattern count="one">{0} milligramma</unitPattern>
                                 <unitPattern count="other">{0} milligrammaa</unitPattern>

@@ -7431,13 +8215,13 @@
                                 <displayName>mikrogrammat</displayName>
                                 <unitPattern count="one">{0} mikrogramma</unitPattern>
                                 <unitPattern count="other">{0} mikrogrammaa</unitPattern>
                         </unit>
                         <unit type="mass-ton">
-                                <displayName>US-tonnit</displayName>
-                                <unitPattern count="one">{0} US-tonni</unitPattern>
-                                <unitPattern count="other">{0} US-tonnia</unitPattern>
+                                <displayName>am. tonnit</displayName>
+                                <unitPattern count="one">{0} am. tonni</unitPattern>
+                                <unitPattern count="other">{0} am. tonnia</unitPattern>
                         </unit>
                         <unit type="mass-stone">
                                 <displayName>stonet</displayName>
                                 <unitPattern count="one">{0} stone</unitPattern>
                                 <unitPattern count="other">{0} stonea</unitPattern>

@@ -7503,13 +8287,13 @@
                                 <displayName>elohopeamillimetrit</displayName>
                                 <unitPattern count="one">{0} millimetri elohopeaa</unitPattern>
                                 <unitPattern count="other">{0} millimetriä elohopeaa</unitPattern>
                         </unit>
                         <unit type="pressure-pound-per-square-inch">
-                                <displayName>paunat neliötuumaa kohti</displayName>
-                                <unitPattern count="one">{0} pauna neliötuumaa kohti</unitPattern>
-                                <unitPattern count="other">{0} paunaa neliötuumaa kohti</unitPattern>
+                                <displayName>paunat / neliötuuma</displayName>
+                                <unitPattern count="one">{0} pauna / neliötuuma</unitPattern>
+                                <unitPattern count="other">{0} paunaa / neliötuuma</unitPattern>
                         </unit>
                         <unit type="pressure-inch-hg">
                                 <displayName>elohopeatuumat</displayName>
                                 <unitPattern count="one">{0} tuuma elohopeaa</unitPattern>
                                 <unitPattern count="other">{0} tuumaa elohopeaa</unitPattern>

@@ -7608,11 +8392,11 @@
                         </unit>
                         <unit type="volume-liter">
                                 <displayName>litrat</displayName>
                                 <unitPattern count="one">{0} litra</unitPattern>
                                 <unitPattern count="other">{0} litraa</unitPattern>
-                                <perUnitPattern>{0} litrassa</perUnitPattern>
+                                <perUnitPattern>{0} / litra</perUnitPattern>
                         </unit>
                         <unit type="volume-deciliter">
                                 <displayName>desilitrat</displayName>
                                 <unitPattern count="one">{0} desilitra</unitPattern>
                                 <unitPattern count="other">{0} desilitraa</unitPattern>

@@ -7646,14 +8430,20 @@
                                 <displayName>bushelit</displayName>
                                 <unitPattern count="one">{0} busheli</unitPattern>
                                 <unitPattern count="other">{0} bushelia</unitPattern>
                         </unit>
                         <unit type="volume-gallon">
-                                <displayName>gallonat</displayName>
-                                <unitPattern count="one">{0} gallona</unitPattern>
-                                <unitPattern count="other">{0} gallonaa</unitPattern>
-                                <perUnitPattern>{0} / gallona</perUnitPattern>
+                                <displayName>am. gallonat</displayName>
+                                <unitPattern count="one">{0} am. gallona</unitPattern>
+                                <unitPattern count="other">{0} am. gallonaa</unitPattern>
+                                <perUnitPattern>{0} / am. gallona</perUnitPattern>
+                        </unit>
+                        <unit type="volume-gallon-imperial">
+                                <displayName>br. gallonat</displayName>
+                                <unitPattern count="one">{0} br. gallona</unitPattern>
+                                <unitPattern count="other">{0} br. gallonaa</unitPattern>
+                                <perUnitPattern>{0} / br. gallona</perUnitPattern>
                         </unit>
                         <unit type="volume-quart">
                                 <displayName>neljännesgallonat</displayName>
                                 <unitPattern count="one">{0} neljännesgallona</unitPattern>
                                 <unitPattern count="other">{0} neljännesgallonaa</unitPattern>

@@ -7731,10 +8521,11 @@
                         </unit>
                         <unit type="area-square-kilometer">
                                 <displayName>km²</displayName>
                                 <unitPattern count="one">{0} km²</unitPattern>
                                 <unitPattern count="other">{0} km²</unitPattern>
+                                <perUnitPattern>{0}/km²</perUnitPattern>
                         </unit>
                         <unit type="area-hectare">
                                 <displayName>ha</displayName>
                                 <unitPattern count="one">{0} ha</unitPattern>
                                 <unitPattern count="other">{0} ha</unitPattern>

@@ -7753,10 +8544,11 @@
                         </unit>
                         <unit type="area-square-mile">
                                 <displayName>mi²</displayName>
                                 <unitPattern count="one">{0} mi²</unitPattern>
                                 <unitPattern count="other">{0} mi²</unitPattern>
+                                <perUnitPattern>{0}/mi²</perUnitPattern>
                         </unit>
                         <unit type="area-acre">
                                 <displayName>ac</displayName>
                                 <unitPattern count="one">{0} ac</unitPattern>
                                 <unitPattern count="other">{0} ac</unitPattern>

@@ -7780,10 +8572,25 @@
                         <unit type="concentr-karat">
                                 <displayName>ka</displayName>
                                 <unitPattern count="one">{0} ka</unitPattern>
                                 <unitPattern count="other">{0} ka</unitPattern>
                         </unit>
+                        <unit type="concentr-milligram-per-deciliter">
+                                <displayName>mg/dl</displayName>
+                                <unitPattern count="one">{0} mg/dl</unitPattern>
+                                <unitPattern count="other">{0} mg/dl</unitPattern>
+                        </unit>
+                        <unit type="concentr-millimole-per-liter">
+                                <displayName>mmol/l</displayName>
+                                <unitPattern count="one">{0} mmol/l</unitPattern>
+                                <unitPattern count="other">{0} mmol/l</unitPattern>
+                        </unit>
+                        <unit type="concentr-part-per-million">
+                                <displayName>ppm</displayName>
+                                <unitPattern count="one">{0} ppm</unitPattern>
+                                <unitPattern count="other">{0} ppm</unitPattern>
+                        </unit>
                         <unit type="consumption-liter-per-kilometer">
                                 <displayName>l/km</displayName>
                                 <unitPattern count="one">{0} l/km</unitPattern>
                                 <unitPattern count="other">{0} l/km</unitPattern>
                         </unit>

@@ -7791,13 +8598,18 @@
                                 <displayName>l/100 km</displayName>
                                 <unitPattern count="one">{0} l/100 km</unitPattern>
                                 <unitPattern count="other">{0} l/100 km</unitPattern>
                         </unit>
                         <unit type="consumption-mile-per-gallon">
-                                <displayName>mpg</displayName>
-                                <unitPattern count="one">{0} mpg</unitPattern>
-                                <unitPattern count="other">{0} mpg</unitPattern>
+                                <displayName>mpg-am</displayName>
+                                <unitPattern count="one">{0} mpg-am</unitPattern>
+                                <unitPattern count="other">{0} mpg-am</unitPattern>
+                        </unit>
+                        <unit type="consumption-mile-per-gallon-imperial">
+                                <displayName>mpg-br</displayName>
+                                <unitPattern count="one">{0} mpg-br</unitPattern>
+                                <unitPattern count="other">{0} mpg-br</unitPattern>
                         </unit>
                         <unit type="digital-terabyte">
                                 <displayName>Tt</displayName>
                                 <unitPattern count="one">{0} Tt</unitPattern>
                                 <unitPattern count="other">{0} Tt</unitPattern>

@@ -8077,10 +8889,15 @@
                         <unit type="length-mile-scandinavian">
                                 <displayName>pnk</displayName>
                                 <unitPattern count="one">{0} pnk</unitPattern>
                                 <unitPattern count="other">{0} pnk</unitPattern>
                         </unit>
+                        <unit type="length-point">
+                                <displayName>pt</displayName>
+                                <unitPattern count="one">{0} pt</unitPattern>
+                                <unitPattern count="other">{0} pt</unitPattern>
+                        </unit>
                         <unit type="light-lux">
                                 <displayName>lx</displayName>
                                 <unitPattern count="one">{0} lx</unitPattern>
                                 <unitPattern count="other">{0} lx</unitPattern>
                         </unit>

@@ -8110,13 +8927,13 @@
                                 <displayName>µg</displayName>
                                 <unitPattern count="one">{0} µg</unitPattern>
                                 <unitPattern count="other">{0} µg</unitPattern>
                         </unit>
                         <unit type="mass-ton">
-                                <displayName>US-tn</displayName>
-                                <unitPattern count="one">{0} US-tn</unitPattern>
-                                <unitPattern count="other">{0} US-tn</unitPattern>
+                                <displayName>am. tn</displayName>
+                                <unitPattern count="one">{0} am. tn</unitPattern>
+                                <unitPattern count="other">{0} am. tn</unitPattern>
                         </unit>
                         <unit type="mass-stone">
                                 <displayName>st</displayName>
                                 <unitPattern count="one">{0} st</unitPattern>
                                 <unitPattern count="other">{0} st</unitPattern>

@@ -8325,14 +9142,20 @@
                                 <displayName>bu</displayName>
                                 <unitPattern count="one">{0} bu</unitPattern>
                                 <unitPattern count="other">{0} bu</unitPattern>
                         </unit>
                         <unit type="volume-gallon">
-                                <displayName>gal</displayName>
-                                <unitPattern count="one">{0} gal</unitPattern>
-                                <unitPattern count="other">{0} gal</unitPattern>
-                                <perUnitPattern>{0}/gal</perUnitPattern>
+                                <displayName>am. gal</displayName>
+                                <unitPattern count="one">{0} am. gal</unitPattern>
+                                <unitPattern count="other">{0} am. gal</unitPattern>
+                                <perUnitPattern>{0}/am. gal</perUnitPattern>
+                        </unit>
+                        <unit type="volume-gallon-imperial">
+                                <displayName>br. gal</displayName>
+                                <unitPattern count="one">{0} br. gal</unitPattern>
+                                <unitPattern count="other">{0} br. gal</unitPattern>
+                                <perUnitPattern>{0}/br. gal</perUnitPattern>
                         </unit>
                         <unit type="volume-quart">
                                 <displayName>qt</displayName>
                                 <unitPattern count="one">{0} qt</unitPattern>
                                 <unitPattern count="other">{0} qt</unitPattern>

@@ -8410,10 +9233,11 @@
                         </unit>
                         <unit type="area-square-kilometer">
                                 <displayName>km²</displayName>
                                 <unitPattern count="one">{0}km²</unitPattern>
                                 <unitPattern count="other">{0}km²</unitPattern>
+                                <perUnitPattern>{0}/km²</perUnitPattern>
                         </unit>
                         <unit type="area-hectare">
                                 <displayName>ha</displayName>
                                 <unitPattern count="one">{0}ha</unitPattern>
                                 <unitPattern count="other">{0}ha</unitPattern>

@@ -8432,10 +9256,11 @@
                         </unit>
                         <unit type="area-square-mile">
                                 <displayName>mi²</displayName>
                                 <unitPattern count="one">{0}mi²</unitPattern>
                                 <unitPattern count="other">{0}mi²</unitPattern>
+                                <perUnitPattern>{0}/mi²</perUnitPattern>
                         </unit>
                         <unit type="area-acre">
                                 <displayName>ac</displayName>
                                 <unitPattern count="one">{0}ac</unitPattern>
                                 <unitPattern count="other">{0}ac</unitPattern>

@@ -8459,10 +9284,25 @@
                         <unit type="concentr-karat">
                                 <displayName>ka</displayName>
                                 <unitPattern count="one">{0}ka</unitPattern>
                                 <unitPattern count="other">{0}ka</unitPattern>
                         </unit>
+                        <unit type="concentr-milligram-per-deciliter">
+                                <displayName>mg/dl</displayName>
+                                <unitPattern count="one">{0}mg/dl</unitPattern>
+                                <unitPattern count="other">{0}mg/dl</unitPattern>
+                        </unit>
+                        <unit type="concentr-millimole-per-liter">
+                                <displayName>mmol/l</displayName>
+                                <unitPattern count="one">{0}mmol/l</unitPattern>
+                                <unitPattern count="other">{0}mmol/l</unitPattern>
+                        </unit>
+                        <unit type="concentr-part-per-million">
+                                <displayName>ppm</displayName>
+                                <unitPattern count="one">{0}ppm</unitPattern>
+                                <unitPattern count="other">{0}ppm</unitPattern>
+                        </unit>
                         <unit type="consumption-liter-per-kilometer">
                                 <displayName>l/km</displayName>
                                 <unitPattern count="one">{0}l/km</unitPattern>
                                 <unitPattern count="other">{0}l/km</unitPattern>
                         </unit>

@@ -8470,13 +9310,18 @@
                                 <displayName>l/100km</displayName>
                                 <unitPattern count="one">{0}l/100km</unitPattern>
                                 <unitPattern count="other">{0}l/100km</unitPattern>
                         </unit>
                         <unit type="consumption-mile-per-gallon">
-                                <displayName>mpg</displayName>
-                                <unitPattern count="one">{0}mpg</unitPattern>
-                                <unitPattern count="other">{0}mpg</unitPattern>
+                                <displayName>mpg-am</displayName>
+                                <unitPattern count="one">{0}mpg-am</unitPattern>
+                                <unitPattern count="other">{0}mpg-am</unitPattern>
+                        </unit>
+                        <unit type="consumption-mile-per-gallon-imperial">
+                                <displayName>mpg-br</displayName>
+                                <unitPattern count="one">{0}mpg-br</unitPattern>
+                                <unitPattern count="other">{0}mpg-br</unitPattern>
                         </unit>
                         <unit type="digital-terabyte">
                                 <displayName>Tt</displayName>
                                 <unitPattern count="one">{0}Tt</unitPattern>
                                 <unitPattern count="other">{0}Tt</unitPattern>

@@ -8753,12 +9598,12 @@
                                 <unitPattern count="one">{0}mpk</unitPattern>
                                 <unitPattern count="other">{0}mpk</unitPattern>
                         </unit>
                         <unit type="length-mile-scandinavian">
                                 <displayName>pnk</displayName>
-                                <unitPattern count="one">{0} pnk</unitPattern>
-                                <unitPattern count="other">{0} pnk</unitPattern>
+                                <unitPattern count="one">{0}pnk</unitPattern>
+                                <unitPattern count="other">{0}pnk</unitPattern>
                         </unit>
                         <unit type="light-lux">
                                 <displayName>lx</displayName>
                                 <unitPattern count="one">{0}lx</unitPattern>
                                 <unitPattern count="other">{0}lx</unitPattern>

@@ -8789,13 +9634,13 @@
                                 <displayName>µg</displayName>
                                 <unitPattern count="one">{0}μg</unitPattern>
                                 <unitPattern count="other">{0}μg</unitPattern>
                         </unit>
                         <unit type="mass-ton">
-                                <displayName>US-tn</displayName>
-                                <unitPattern count="one">{0}US-tn</unitPattern>
-                                <unitPattern count="other">{0}US-tn</unitPattern>
+                                <displayName>am.tn</displayName>
+                                <unitPattern count="one">{0}am.tn</unitPattern>
+                                <unitPattern count="other">{0}am.tn</unitPattern>
                         </unit>
                         <unit type="mass-stone">
                                 <displayName>st</displayName>
                                 <unitPattern count="one">{0}st</unitPattern>
                                 <unitPattern count="other">{0}st</unitPattern>

@@ -8856,13 +9701,13 @@
                                 <displayName>hPa</displayName>
                                 <unitPattern count="one">{0}hPa</unitPattern>
                                 <unitPattern count="other">{0}hPa</unitPattern>
                         </unit>
                         <unit type="pressure-millimeter-of-mercury">
-                                <displayName>mm Hg</displayName>
-                                <unitPattern count="one">{0}mm Hg</unitPattern>
-                                <unitPattern count="other">{0}mm Hg</unitPattern>
+                                <displayName>mmHg</displayName>
+                                <unitPattern count="one">{0}mmHg</unitPattern>
+                                <unitPattern count="other">{0}mmHg</unitPattern>
                         </unit>
                         <unit type="pressure-pound-per-square-inch">
                                 <displayName>psi</displayName>
                                 <unitPattern count="one">{0}psi</unitPattern>
                                 <unitPattern count="other">{0}psi</unitPattern>

@@ -8892,12 +9737,12 @@
                                 <unitPattern count="one">{0}mi/h</unitPattern>
                                 <unitPattern count="other">{0}mi/h</unitPattern>
                         </unit>
                         <unit type="speed-knot">
                                 <displayName>kn</displayName>
-                                <unitPattern count="one">{0} kn</unitPattern>
-                                <unitPattern count="other">{0} kn</unitPattern>
+                                <unitPattern count="one">{0}kn</unitPattern>
+                                <unitPattern count="other">{0}kn</unitPattern>
                         </unit>
                         <unit type="temperature-generic">
                                 <displayName>°</displayName>
                                 <unitPattern count="one">{0}°</unitPattern>
                                 <unitPattern count="other">{0}°</unitPattern>

@@ -8923,11 +9768,11 @@
                                 <unitPattern count="other">{0}km³</unitPattern>
                         </unit>
                         <unit type="volume-cubic-meter">
                                 <displayName>m³</displayName>
                                 <unitPattern count="one">{0}m³</unitPattern>
-                                <unitPattern count="other">{0} m³</unitPattern>
+                                <unitPattern count="other">{0}m³</unitPattern>
                                 <perUnitPattern>{0}/m³</perUnitPattern>
                         </unit>
                         <unit type="volume-cubic-centimeter">
                                 <displayName>cm³</displayName>
                                 <unitPattern count="one">{0}cm³</unitPattern>

@@ -8985,17 +9830,17 @@
                                 <unitPattern count="one">{0}ml</unitPattern>
                                 <unitPattern count="other">{0}ml</unitPattern>
                         </unit>
                         <unit type="volume-pint-metric">
                                 <displayName>tp</displayName>
-                                <unitPattern count="one">{0} tp</unitPattern>
-                                <unitPattern count="other">{0} tp</unitPattern>
+                                <unitPattern count="one">{0}tp</unitPattern>
+                                <unitPattern count="other">{0}tp</unitPattern>
                         </unit>
                         <unit type="volume-cup-metric">
                                 <displayName>tkp</displayName>
-                                <unitPattern count="one">{0} tkp</unitPattern>
-                                <unitPattern count="other">{0} tkp</unitPattern>
+                                <unitPattern count="one">{0}tkp</unitPattern>
+                                <unitPattern count="other">{0}tkp</unitPattern>
                         </unit>
                         <unit type="volume-acre-foot">
                                 <displayName>ac ft</displayName>
                                 <unitPattern count="one">{0}ac ft</unitPattern>
                                 <unitPattern count="other">{0}ac ft</unitPattern>

@@ -9004,14 +9849,20 @@
                                 <displayName>bu</displayName>
                                 <unitPattern count="one">{0}bu</unitPattern>
                                 <unitPattern count="other">{0}bu</unitPattern>
                         </unit>
                         <unit type="volume-gallon">
-                                <displayName>gal</displayName>
-                                <unitPattern count="one">{0}gal</unitPattern>
-                                <unitPattern count="other">{0}gal</unitPattern>
-                                <perUnitPattern>{0}/gal</perUnitPattern>
+                                <displayName>am.gal</displayName>
+                                <unitPattern count="one">{0}am.gal</unitPattern>
+                                <unitPattern count="other">{0}am.gal</unitPattern>
+                                <perUnitPattern>{0}/am.gal</perUnitPattern>
+                        </unit>
+                        <unit type="volume-gallon-imperial">
+                                <displayName>br.gal</displayName>
+                                <unitPattern count="one">{0}br.gal</unitPattern>
+                                <unitPattern count="other">{0}br.gal</unitPattern>
+                                <perUnitPattern>{0}/br.gal</perUnitPattern>
                         </unit>
                         <unit type="volume-quart">
                                 <displayName>qt</displayName>
                                 <unitPattern count="one">{0}qt</unitPattern>
                                 <unitPattern count="other">{0}qt</unitPattern>

@@ -9063,10 +9914,22 @@
                         <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="or">
+                        <listPatternPart type="start">{0}, {1}</listPatternPart>
+                        <listPatternPart type="middle">{0}, {1}</listPatternPart>
+                        <listPatternPart type="end">{0} tai {1}</listPatternPart>
+                        <listPatternPart type="2">{0} tai {1}</listPatternPart>
+                </listPattern>
+                <listPattern type="standard-short">
+                        <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>

@@ -9088,7 +9951,164 @@
                 <messages>
                         <yesstr>kyllä:k</yesstr>
                         <nostr>ei:e</nostr>
                 </messages>
         </posix>
+        <characterLabels>
+                <characterLabelPattern type="all">{0} – kaikki</characterLabelPattern>
+                <characterLabelPattern type="category-list">{0}: {1}</characterLabelPattern>
+                <characterLabelPattern type="compatibility">{0} – yhteensopivuus</characterLabelPattern>
+                <characterLabelPattern type="enclosed">{0} – ympäröity</characterLabelPattern>
+                <characterLabelPattern type="extended">{0} – laajennettu</characterLabelPattern>
+                <characterLabelPattern type="historic">{0} – historiallinen</characterLabelPattern>
+                <characterLabelPattern type="miscellaneous">{0} – sekalaiset</characterLabelPattern>
+                <characterLabelPattern type="other">{0} – muut</characterLabelPattern>
+                <characterLabelPattern type="scripts">kirjoitusjärjestelmät – {0}</characterLabelPattern>
+                <characterLabelPattern type="strokes" count="one">{0} piirtoviiva</characterLabelPattern>
+                <characterLabelPattern type="strokes" count="other">{0} piirtoviivaa</characterLabelPattern>
+                <characterLabel type="activities">toiminta</characterLabel>
+                <characterLabel type="african_scripts">afrikkalaiset kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="american_scripts">amerikkalaiset kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="animal">eläin</characterLabel>
+                <characterLabel type="animals_nature">eläimet ja luonto</characterLabel>
+                <characterLabel type="arrows">nuolet</characterLabel>
+                <characterLabel type="body">keho</characterLabel>
+                <characterLabel type="box_drawing">viivapiirrosmerkit</characterLabel>
+                <characterLabel type="braille">pistekirjoitus</characterLabel>
+                <characterLabel type="building">rakennus</characterLabel>
+                <characterLabel type="bullets_stars">luettelomerkit ja tähdet</characterLabel>
+                <characterLabel type="consonantal_jamo">jamo-konsonanttielementit</characterLabel>
+                <characterLabel type="currency_symbols">valuuttamerkit</characterLabel>
+                <characterLabel type="dash_connector">yhdysmerkit</characterLabel>
+                <characterLabel type="digits">numerot</characterLabel>
+                <characterLabel type="dingbats">ornamentit</characterLabel>
+                <characterLabel type="divination_symbols">ennustussymbolit</characterLabel>
+                <characterLabel type="downwards_arrows">alaspäin osoittavat nuolet</characterLabel>
+                <characterLabel type="downwards_upwards_arrows">alas- ja ylöspäin osoittavat nuolet</characterLabel>
+                <characterLabel type="east_asian_scripts">itäaasialaiset kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="emoji">emojit</characterLabel>
+                <characterLabel type="european_scripts">eurooppalaiset kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="female">naissukupuolinen</characterLabel>
+                <characterLabel type="flag">lippu</characterLabel>
+                <characterLabel type="flags">liput</characterLabel>
+                <characterLabel type="food_drink">ruoka ja juoma</characterLabel>
+                <characterLabel type="format">muotoilu</characterLabel>
+                <characterLabel type="format_whitespace">muotoilu ja tyhjämerkki</characterLabel>
+                <characterLabel type="full_width_form_variant">ideografin levyiset muotovariantit</characterLabel>
+                <characterLabel type="geometric_shapes">geometriset kuviot</characterLabel>
+                <characterLabel type="half_width_form_variant">ideografin puolikkaan levyiset muotovariantit</characterLabel>
+                <characterLabel type="han_characters">han-merkit</characterLabel>
+                <characterLabel type="han_radicals">han-radikaalit</characterLabel>
+                <characterLabel type="hanja">hanja</characterLabel>
+                <characterLabel type="hanzi_simplified">hanzi (yksinkertaistettu)</characterLabel>
+                <characterLabel type="hanzi_traditional">hanzi (perinteinen)</characterLabel>
+                <characterLabel type="heart">sydän</characterLabel>
+                <characterLabel type="historic_scripts">historialliset kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="ideographic_desc_characters">ideogrammien kuvausmerkit</characterLabel>
+                <characterLabel type="japanese_kana">japanilainen kana-kirjoitusjärjestelmä</characterLabel>
+                <characterLabel type="kanbun">kanbun</characterLabel>
+                <characterLabel type="kanji">kanji</characterLabel>
+                <characterLabel type="keycap">näppäin</characterLabel>
+                <characterLabel type="leftwards_arrows">vasemmalle osoittavat nuolet</characterLabel>
+                <characterLabel type="leftwards_rightwards_arrows">vasemmalle ja oikealle osoittavat nuolet</characterLabel>
+                <characterLabel type="letterlike_symbols">kirjainsymbolit</characterLabel>
+                <characterLabel type="limited_use">rajoitettu käyttö</characterLabel>
+                <characterLabel type="male">miessukupuolinen</characterLabel>
+                <characterLabel type="math_symbols">matemaattiset symbolit</characterLabel>
+                <characterLabel type="middle_eastern_scripts">Lähi-idän kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="miscellaneous">sekalaiset</characterLabel>
+                <characterLabel type="modern_scripts">nykyaikaiset kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="modifier">tarkkeenomaiset merkit</characterLabel>
+                <characterLabel type="musical_symbols">musiikkisymbolit</characterLabel>
+                <characterLabel type="nature">luonto</characterLabel>
+                <characterLabel type="nonspacing">omaa tilaa viemättömät merkit</characterLabel>
+                <characterLabel type="numbers">numerot</characterLabel>
+                <characterLabel type="objects">objektit</characterLabel>
+                <characterLabel type="other">muut</characterLabel>
+                <characterLabel type="paired">merkkiparit</characterLabel>
+                <characterLabel type="person">henkilö</characterLabel>
+                <characterLabel type="phonetic_alphabet">foneettiset aakkoset</characterLabel>
+                <characterLabel type="pictographs">kuvakirjoitus</characterLabel>
+                <characterLabel type="place">paikka</characterLabel>
+                <characterLabel type="plant">kasvi</characterLabel>
+                <characterLabel type="punctuation">välimerkit</characterLabel>
+                <characterLabel type="rightwards_arrows">oikealle osoittavat nuolet</characterLabel>
+                <characterLabel type="sign_standard_symbols">vakiosymboli</characterLabel>
+                <characterLabel type="small_form_variant">vähäiset muotovariantit</characterLabel>
+                <characterLabel type="smiley">hymiö</characterLabel>
+                <characterLabel type="smileys_people">hymiöt ja ihmiset</characterLabel>
+                <characterLabel type="south_asian_scripts">eteläaasialaiset kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="southeast_asian_scripts">kaakkoisaasialaiset kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="spacing">välistys</characterLabel>
+                <characterLabel type="sport">urheilu</characterLabel>
+                <characterLabel type="symbols">symbolit</characterLabel>
+                <characterLabel type="technical_symbols">tekniset symbolit</characterLabel>
+                <characterLabel type="tone_marks">toonimerkit</characterLabel>
+                <characterLabel type="travel">matkustus</characterLabel>
+                <characterLabel type="travel_places">matkustus ja paikat</characterLabel>
+                <characterLabel type="upwards_arrows">ylöspäin osoittavat nuolet</characterLabel>
+                <characterLabel type="variant_forms">varianttimuodot</characterLabel>
+                <characterLabel type="vocalic_jamo">jamo-vokaalielementit</characterLabel>
+                <characterLabel type="weather">sää</characterLabel>
+                <characterLabel type="western_asian_scripts">länsiaasialaiset kirjoitusjärjestelmät</characterLabel>
+                <characterLabel type="whitespace">tyhjämerkki</characterLabel>
+        </characterLabels>
+        <typographicNames>
+                <axisName type="ital">kursivoitu</axisName>
+                <axisName type="opsz">optinen koko</axisName>
+                <axisName type="slnt">kallistus</axisName>
+                <axisName type="wdth">leveys</axisName>
+                <axisName type="wght">paksuus</axisName>
+                <styleName type="ital" subtype="1">kursiivi</styleName>
+                <styleName type="opsz" subtype="18">otsikko</styleName>
+                <styleName type="opsz" subtype="72">näyttö</styleName>
+                <styleName type="opsz" subtype="144">juliste</styleName>
+                <styleName type="slnt" subtype="-12">taaksepäin kallistettu</styleName>
+                <styleName type="slnt" subtype="0">pysty</styleName>
+                <styleName type="slnt" subtype="12">vino</styleName>
+                <styleName type="slnt" subtype="24">extravino</styleName>
+                <styleName type="wdth" subtype="50">ultrakapea</styleName>
+                <styleName type="wdth" subtype="50" alt="compressed">ultratiivis</styleName>
+                <styleName type="wdth" subtype="62.5">extrakapea</styleName>
+                <styleName type="wdth" subtype="62.5" alt="compressed">extratiivis</styleName>
+                <styleName type="wdth" subtype="75">kavennettu</styleName>
+                <styleName type="wdth" subtype="75" alt="compressed">pakattu</styleName>
+                <styleName type="wdth" subtype="75" alt="narrow">kapea</styleName>
+                <styleName type="wdth" subtype="87.5">semikapea</styleName>
+                <styleName type="wdth" subtype="100">normaali</styleName>
+                <styleName type="wdth" subtype="112.5">semilaaja</styleName>
+                <styleName type="wdth" subtype="125">laajennettu</styleName>
+                <styleName type="wdth" subtype="125" alt="wide">leveä</styleName>
+                <styleName type="wdth" subtype="150">extralaaja</styleName>
+                <styleName type="wdth" subtype="150" alt="wide">extraleveä</styleName>
+                <styleName type="wdth" subtype="200">ultralaaja</styleName>
+                <styleName type="wght" subtype="100">kapea</styleName>
+                <styleName type="wght" subtype="200">extraohut</styleName>
+                <styleName type="wght" subtype="200" alt="ultra">ultraohut</styleName>
+                <styleName type="wght" subtype="300">ohut</styleName>
+                <styleName type="wght" subtype="350">semiohut</styleName>
+                <styleName type="wght" subtype="380">kirja</styleName>
+                <styleName type="wght" subtype="400">normaali</styleName>
+                <styleName type="wght" subtype="500">keskipaksu</styleName>
+                <styleName type="wght" subtype="600">semilihava</styleName>
+                <styleName type="wght" subtype="600" alt="demi">demilihava</styleName>
+                <styleName type="wght" subtype="700">lihavoitu</styleName>
+                <styleName type="wght" subtype="800">extralihava</styleName>
+                <styleName type="wght" subtype="800" alt="ultra">ultralihava</styleName>
+                <styleName type="wght" subtype="900">musta</styleName>
+                <styleName type="wght" subtype="900" alt="heavy">paksu</styleName>
+                <styleName type="wght" subtype="950">extramusta</styleName>
+                <styleName type="wght" subtype="950" alt="ultraheavy">ultrapaksu</styleName>
+                <styleName type="wght" subtype="950" alt="ultrablack">ultramusta</styleName>
+                <featureName type="afrc">pystysuuntaiset murtoluvut</featureName>
+                <featureName type="cpsp">versaalivälistys</featureName>
+                <featureName type="dlig">valinnaiset ligatuurit</featureName>
+                <featureName type="frac">vinoviivaiset murtoluvut</featureName>
+                <featureName type="lnum">otsikkonumerot</featureName>
+                <featureName type="onum">gemenanumerot</featureName>
+                <featureName type="ordn">järjestysluvut</featureName>
+                <featureName type="pnum">suhteelliset numerot</featureName>
+                <featureName type="smcp">kapiteelit</featureName>
+                <featureName type="tnum">sarkautuvat numerot</featureName>
+                <featureName type="zero">lävistetty nolla</featureName>
+        </typographicNames>
 </ldml>
-
< prev index next >