< prev index next >

src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl.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: 13911 $"/>
                 <language type="sl"/>
         </identity>
         <localeDisplayNames>
                 <localeDisplayPattern>
                         <localePattern>{0} ({1})</localePattern>

@@ -36,11 +39,11 @@
                         <language type="ang">stara angleščina</language>
                         <language type="anp">angikaščina</language>
                         <language type="ar">arabščina</language>
                         <language type="ar_001">sodobna standardna arabščina</language>
                         <language type="arc">aramejščina</language>
-                        <language type="arn">aravkanščina</language>
+                        <language type="arn">mapudungunščina</language>
                         <language type="arp">arapaščina</language>
                         <language type="arw">aravaščina</language>
                         <language type="as">asamščina</language>
                         <language type="asa">asujščina</language>
                         <language type="ast">asturijščina</language>

@@ -93,10 +96,11 @@
                         <language type="ckb">soranska kurdščina</language>
                         <language type="co">korziščina</language>
                         <language type="cop">koptščina</language>
                         <language type="cr">krijščina</language>
                         <language type="crh">krimska tatarščina</language>
+                        <language type="crs">sejšelska francoska kreolščina</language>
                         <language type="cs">češčina</language>
                         <language type="csb">kašubščina</language>
                         <language type="cu">stara cerkvena slovanščina</language>
                         <language type="cv">čuvaščina</language>
                         <language type="cy">valižanščina</language>

@@ -118,10 +122,11 @@
                         <language type="dum">srednja nizozemščina</language>
                         <language type="dv">diveščina</language>
                         <language type="dyo">jola-fonjiščina</language>
                         <language type="dyu">diula</language>
                         <language type="dz">dzonka</language>
+                        <language type="dzg">dazaga</language>
                         <language type="ebu">embujščina</language>
                         <language type="ee">evenščina</language>
                         <language type="efi">efiščina</language>
                         <language type="egy">stara egipčanščina</language>
                         <language type="eka">ekajuk</language>

@@ -136,11 +141,11 @@
                         <language type="en_US" alt="short">angleščina (ZDA)</language>
                         <language type="enm">srednja angleščina</language>
                         <language type="eo">esperanto</language>
                         <language type="es">španščina</language>
                         <language type="es_419">latinskoameriška španščina</language>
-                        <language type="es_ES">iberska španščina</language>
+                        <language type="es_ES">evropska španščina</language>
                         <language type="et">estonščina</language>
                         <language type="eu">baskovščina</language>
                         <language type="ewo">evondovščina</language>
                         <language type="fa">perzijščina</language>
                         <language type="fan">fangijščina</language>

@@ -152,16 +157,17 @@
                         <language type="fo">ferščina</language>
                         <language type="fon">fonščina</language>
                         <language type="fr">francoščina</language>
                         <language type="fr_CA">kanadska francoščina</language>
                         <language type="fr_CH">švicarska francoščina</language>
+                        <language type="frc" draft="contributed">cajunska francoščina</language>
                         <language type="frm">srednja francoščina</language>
                         <language type="fro">stara francoščina</language>
                         <language type="frr">severna frizijščina</language>
                         <language type="frs">vzhodna frizijščina</language>
                         <language type="fur">furlanščina</language>
-                        <language type="fy">frizijščina</language>
+                        <language type="fy">zahodna frizijščina</language>
                         <language type="ga">irščina</language>
                         <language type="gaa">ga</language>
                         <language type="gag">gagavščina</language>
                         <language type="gay">gajščina</language>
                         <language type="gba">gbajščina</language>

@@ -179,10 +185,11 @@
                         <language type="grc">stara grščina</language>
                         <language type="gsw">nemščina (Švica)</language>
                         <language type="gu">gudžaratščina</language>
                         <language type="guz">gusijščina</language>
                         <language type="gv">manščina</language>
+                        <language type="gwi">gvičin</language>
                         <language type="ha">havščina</language>
                         <language type="hai">haidščina</language>
                         <language type="haw">havajščina</language>
                         <language type="he">hebrejščina</language>
                         <language type="hi">hindujščina</language>

@@ -197,10 +204,11 @@
                         <language type="hup">hupa</language>
                         <language type="hy">armenščina</language>
                         <language type="hz">herero</language>
                         <language type="ia">interlingva</language>
                         <language type="iba">ibanščina</language>
+                        <language type="ibb">ibibijščina</language>
                         <language type="id">indonezijščina</language>
                         <language type="ie">interlingve</language>
                         <language type="ig">igboščina</language>
                         <language type="ii">sečuanska jiščina</language>
                         <language type="ik">inupiaščina</language>

@@ -215,44 +223,48 @@
                         <language type="jgo">ngomba</language>
                         <language type="jmc">mačamejščina</language>
                         <language type="jpr">judovska perzijščina</language>
                         <language type="jrb">judovska arabščina</language>
                         <language type="jv">javanščina</language>
-                        <language type="ka">gruzinščina</language>
+                        <language type="ka">gruzijščina</language>
                         <language type="kaa">karakalpaščina</language>
                         <language type="kab">kabilščina</language>
                         <language type="kac">kačinščina</language>
+                        <language type="kaj">jju</language>
                         <language type="kam">kambaščina</language>
                         <language type="kaw">kavi</language>
                         <language type="kbd">kabardinščina</language>
                         <language type="kcg">tjapska nigerijščina</language>
                         <language type="kde">makondščina</language>
                         <language type="kea">zelenortskootoška kreolščina</language>
+                        <language type="kfo">koro</language>
                         <language type="kg">kongovščina</language>
                         <language type="kha">kasi</language>
                         <language type="kho">kotanščina</language>
                         <language type="khq">koyra chiini</language>
                         <language type="ki">kikujščina</language>
                         <language type="kj">kvanjama</language>
                         <language type="kk">kazaščina</language>
+                        <language type="kkj">kako</language>
                         <language type="kl">grenlandščina</language>
                         <language type="kln">kalenjinščina</language>
                         <language type="km">kmerščina</language>
                         <language type="kmb">kimbundu</language>
-                        <language type="kn">kanada</language>
+                        <language type="kn">kanareščina</language>
                         <language type="ko">korejščina</language>
                         <language type="koi">komi-permjaščina</language>
                         <language type="kok">konkanščina</language>
                         <language type="kos">kosrajščina</language>
                         <language type="kpe">kpelejščina</language>
                         <language type="kr">kanurščina</language>
                         <language type="krc">karačaj-balkarščina</language>
                         <language type="krl">karelščina</language>
                         <language type="kru">kuruk</language>
                         <language type="ks">kašmirščina</language>
-                        <language type="ksb" draft="contributed">shambala</language>
+                        <language type="ksb">šambala</language>
                         <language type="ksf">bafia</language>
+                        <language type="ksh">kölnsko narečje</language>
                         <language type="ku">kurdščina</language>
                         <language type="kum">kumiščina</language>
                         <language type="kut">kutenajščina</language>
                         <language type="kv">komijščina</language>
                         <language type="kw">kornijščina</language>

@@ -268,19 +280,20 @@
                         <language type="li">limburščina</language>
                         <language type="lkt">lakotščina</language>
                         <language type="ln">lingala</language>
                         <language type="lo">laoščina</language>
                         <language type="lol">mongo</language>
+                        <language type="lou" draft="contributed">louisianska kreolščina</language>
                         <language type="loz">lozi</language>
-                        <language type="lrc">severnolurijščina</language>
+                        <language type="lrc">severna lurijščina</language>
                         <language type="lt">litovščina</language>
                         <language type="lu">luba-katanga</language>
                         <language type="lua">luba-lulua</language>
                         <language type="lui">luisenščina</language>
                         <language type="lun">lunda</language>
                         <language type="luo">luo</language>
-                        <language type="lus">lushai</language>
+                        <language type="lus">mizojščina</language>
                         <language type="luy">luhijščina</language>
                         <language type="lv">latvijščina</language>
                         <language type="mad">madurščina</language>
                         <language type="mag">magadščina</language>
                         <language type="mai">maitili</language>

@@ -310,30 +323,34 @@
                         <language type="mr">maratščina</language>
                         <language type="ms">malajščina</language>
                         <language type="mt">malteščina</language>
                         <language type="mua">mundang</language>
                         <language type="mul">več jezikov</language>
+                        <language type="mus">creekovščina</language>
                         <language type="mwl">mirandeščina</language>
                         <language type="mwr">marvarščina</language>
                         <language type="my">burmanščina</language>
                         <language type="myv">erzjanščina</language>
                         <language type="mzn">mazanderanščina</language>
                         <language type="na">naurujščina</language>
+                        <language type="nan" draft="contributed">min nan kitajščina</language>
                         <language type="nap">napolitanščina</language>
-                        <language type="naq" draft="contributed">khoekhoe</language>
+                        <language type="naq">khoekhoe</language>
                         <language type="nb">knjižna norveščina</language>
                         <language type="nd">severna ndebelščina</language>
                         <language type="nds">nizka nemščina</language>
                         <language type="nds_NL">nizka saščina</language>
                         <language type="ne">nepalščina</language>
                         <language type="new">nevarščina</language>
+                        <language type="ng">ndonga</language>
                         <language type="nia">niaščina</language>
                         <language type="niu">niuejščina</language>
                         <language type="nl">nizozemščina</language>
                         <language type="nl_BE">flamščina</language>
                         <language type="nmg">kwasio</language>
                         <language type="nn">novonorveščina</language>
+                        <language type="nnh">ngiemboonščina</language>
                         <language type="no">norveščina</language>
                         <language type="nog">nogajščina</language>
                         <language type="non">stara nordijščina</language>
                         <language type="nqo">n’ko</language>
                         <language type="nr">južna ndebelščina</language>

@@ -347,50 +364,55 @@
                         <language type="nyo">njoro</language>
                         <language type="nzi">nzima</language>
                         <language type="oc">okcitanščina</language>
                         <language type="oj">anašinabščina</language>
                         <language type="om">oromo</language>
-                        <language type="or">orijščina</language>
+                        <language type="or">odijščina</language>
                         <language type="os">osetinščina</language>
                         <language type="osa">osage</language>
                         <language type="ota">otomanska turščina</language>
                         <language type="pa">pandžabščina</language>
                         <language type="pag">pangasinanščina</language>
                         <language type="pam">pampanščina</language>
                         <language type="pap">papiamentu</language>
                         <language type="pau">palavanščina</language>
+                        <language type="pcm">nigerijski pidžin</language>
                         <language type="peo">stara perzijščina</language>
                         <language type="phn">feničanščina</language>
                         <language type="pi">palijščina</language>
                         <language type="pl">poljščina</language>
                         <language type="pon">ponpejščina</language>
+                        <language type="prg">stara pruščina</language>
                         <language type="pro">stara provansalščina</language>
                         <language type="ps">paštunščina</language>
                         <language type="pt">portugalščina</language>
                         <language type="pt_BR">brazilska portugalščina</language>
-                        <language type="pt_PT">iberska portugalščina</language>
+                        <language type="pt_PT">evropska portugalščina</language>
                         <language type="qu">kečuanščina</language>
                         <language type="quc">quiche</language>
                         <language type="raj">radžastanščina</language>
                         <language type="rap">rapanujščina</language>
                         <language type="rar">rarotongščina</language>
                         <language type="rm">retoromanščina</language>
                         <language type="rn">rundščina</language>
                         <language type="ro">romunščina</language>
-                        <language type="ro_MD">moldavščina</language>
+                        <language type="ro_MD" draft="contributed">moldavščina</language>
                         <language type="rof">rombo</language>
                         <language type="rom">romščina</language>
+                        <language type="root">rootščina</language>
                         <language type="ru">ruščina</language>
                         <language type="rup">aromunščina</language>
                         <language type="rw">ruandščina</language>
-                        <language type="rwk" draft="contributed">rwa</language>
+                        <language type="rwk">rwa</language>
                         <language type="sa">sanskrt</language>
+                        <language type="sad">sandavščina</language>
                         <language type="sah">jakutščina</language>
                         <language type="sam">samaritanska aramejščina</language>
                         <language type="saq">samburščina</language>
                         <language type="sas">sasaščina</language>
                         <language type="sat">santalščina</language>
+                        <language type="sba">ngambajščina</language>
                         <language type="sbp">sangujščina</language>
                         <language type="sc">sardinščina</language>
                         <language type="scn">sicilijanščina</language>
                         <language type="sco">škotščina</language>
                         <language type="sd">sindščina</language>

@@ -402,41 +424,42 @@
                         <language type="sg">sango</language>
                         <language type="sga">stara irščina</language>
                         <language type="sh">srbohrvaščina</language>
                         <language type="shi">tahelitska berberščina</language>
                         <language type="shn">šanščina</language>
-                        <language type="si">singalščina</language>
+                        <language type="si">sinhalščina</language>
                         <language type="sid">sidamščina</language>
                         <language type="sk">slovaščina</language>
                         <language type="sl">slovenščina</language>
                         <language type="sm">samoanščina</language>
                         <language type="sma">južna samijščina</language>
                         <language type="smj">luleška samijščina</language>
                         <language type="smn">inarska samijščina</language>
                         <language type="sms">samijščina Skolt</language>
                         <language type="sn">šonščina</language>
+                        <language type="snk">soninke</language>
                         <language type="so">somalščina</language>
                         <language type="sq">albanščina</language>
                         <language type="sr">srbščina</language>
                         <language type="srn">surinamska kreolščina</language>
                         <language type="srr">sererščina</language>
                         <language type="ss">svazijščina</language>
+                        <language type="ssy">saho</language>
                         <language type="st">sesoto</language>
                         <language type="su">sundanščina</language>
                         <language type="suk">sukuma</language>
                         <language type="sus">susujščina</language>
                         <language type="sux">sumerščina</language>
                         <language type="sv">švedščina</language>
                         <language type="sw">svahili</language>
-                        <language type="sw_CD">svahili (Kongo)</language>
                         <language type="swb">šikomor</language>
                         <language type="syc">klasična sirščina</language>
                         <language type="syr">sirščina</language>
                         <language type="ta">tamilščina</language>
                         <language type="te">telugijščina</language>
                         <language type="tem">temnejščina</language>
-                        <language type="teo" draft="contributed">teso</language>
+                        <language type="teo">teso</language>
                         <language type="tet">tetumščina</language>
                         <language type="tg">tadžiščina</language>
                         <language type="th">tajščina</language>
                         <language type="ti">tigrajščina</language>
                         <language type="tig">tigrejščina</language>

@@ -450,45 +473,49 @@
                         <language type="tn">cvanščina</language>
                         <language type="to">tongščina</language>
                         <language type="tog">malavijska tongščina</language>
                         <language type="tpi">tok pisin</language>
                         <language type="tr">turščina</language>
-                        <language type="ts">tsonga</language>
+                        <language type="trv">taroko</language>
+                        <language type="ts">congščina</language>
                         <language type="tsi">tsimščina</language>
                         <language type="tt">tatarščina</language>
                         <language type="tum">tumbukščina</language>
                         <language type="tvl">tuvalujščina</language>
                         <language type="tw">tvi</language>
-                        <language type="twq" draft="contributed">tasawaq</language>
+                        <language type="twq">tasawaq</language>
                         <language type="ty">tahitščina</language>
                         <language type="tyv">tuvinščina</language>
                         <language type="tzm">tamašek (srednji atlas)</language>
                         <language type="udm">udmurtščina</language>
                         <language type="ug">ujgurščina</language>
                         <language type="uga">ugaritski jezik</language>
                         <language type="uk">ukrajinščina</language>
                         <language type="umb">umbundščina</language>
-                        <language type="und">neznan ali neveljaven jezik</language>
+                        <language type="und">neznan jezik</language>
                         <language type="ur">urdujščina</language>
                         <language type="uz">uzbeščina</language>
                         <language type="vai">vajščina</language>
                         <language type="ve">venda</language>
                         <language type="vi">vietnamščina</language>
                         <language type="vo">volapuk</language>
                         <language type="vot">votjaščina</language>
                         <language type="vun">vunjo</language>
                         <language type="wa">valonščina</language>
+                        <language type="wae">walser</language>
                         <language type="wal">valamščina</language>
                         <language type="war">varajščina</language>
                         <language type="was">vašajščina</language>
                         <language type="wbp">varlpirščina</language>
                         <language type="wo">volofščina</language>
                         <language type="xal">kalmiščina</language>
                         <language type="xh">koščina</language>
                         <language type="xog">sogščina</language>
                         <language type="yao">jaojščina</language>
                         <language type="yap">japščina</language>
+                        <language type="yav">jangben</language>
+                        <language type="ybb">jembajščina</language>
                         <language type="yi">jidiš</language>
                         <language type="yo">jorubščina</language>
                         <language type="yue">kantonščina</language>
                         <language type="zap">zapoteščina</language>
                         <language type="zbl">znakovni jezik Bliss</language>

@@ -536,24 +563,26 @@
                         <script type="Glag">glagoliški</script>
                         <script type="Goth">gotski</script>
                         <script type="Grek">grški</script>
                         <script type="Gujr">gudžaratski</script>
                         <script type="Guru">gurmuki</script>
+                        <script type="Hanb">Han + Bopomofo</script>
                         <script type="Hang">hangul</script>
                         <script type="Hani">kanji</script>
                         <script type="Hano">hanunski</script>
                         <script type="Hans">poenostavljena pisava han</script>
                         <script type="Hans" alt="stand-alone">poenostavljena pisava han</script>
                         <script type="Hant">tradicionalna pisava han</script>
                         <script type="Hant" alt="stand-alone">tradicionalna pisava han</script>
                         <script type="Hebr">hebrejski</script>
                         <script type="Hira">hiragana</script>
                         <script type="Hmng">pahavhmonska zlogovna pisava</script>
-                        <script type="Hrkt">katakana ali hiragana</script>
+                        <script type="Hrkt">japonska zlogovnica</script>
                         <script type="Hung">staroogrski</script>
                         <script type="Inds">induški</script>
                         <script type="Ital">staroitalski</script>
+                        <script type="Jamo" draft="contributed">Jamo</script>
                         <script type="Java">javanski</script>
                         <script type="Jpan">japonski</script>
                         <script type="Kali">karenski</script>
                         <script type="Kana">katakana</script>
                         <script type="Khar">gandarski</script>

@@ -620,17 +649,18 @@
                         <script type="Visp">vidni govor</script>
                         <script type="Xpeo">staroperzijski</script>
                         <script type="Xsux">sumersko-akadski klinopis</script>
                         <script type="Zinh">podedovan</script>
                         <script type="Zmth">matematična znamenja</script>
+                        <script type="Zsye" draft="contributed">čustvenček</script>
                         <script type="Zsym">simboli</script>
                         <script type="Zxxx">nenapisano</script>
                         <script type="Zyyy">splošno</script>
                         <script type="Zzzz">neznan ali neveljaven zapis</script>
                 </scripts>
                 <territories>
-                        <territory type="001">Svet</territory>
+                        <territory type="001">svet</territory>
                         <territory type="002">Afrika</territory>
                         <territory type="003">Severna Amerika</territory>
                         <territory type="005">Južna Amerika</territory>
                         <territory type="009">Oceanija</territory>
                         <territory type="011">Zahodna Afrika</territory>

@@ -655,10 +685,11 @@
                         <territory type="145">Zahodna Azija</territory>
                         <territory type="150">Evropa</territory>
                         <territory type="151">Vzhodna Evropa</territory>
                         <territory type="154">Severna Evropa</territory>
                         <territory type="155">Zahodna Evropa</territory>
+                        <territory type="202" draft="contributed">podsaharska Afrika</territory>
                         <territory type="419">Latinska Amerika</territory>
                         <territory type="AC">Otok Ascension</territory>
                         <territory type="AD">Andora</territory>
                         <territory type="AE">Združeni arabski emirati</territory>
                         <territory type="AF">Afganistan</territory>

@@ -717,10 +748,11 @@
                         <territory type="CV">Zelenortski otoki</territory>
                         <territory type="CW">Curaçao</territory>
                         <territory type="CX">Božični otok</territory>
                         <territory type="CY">Ciper</territory>
                         <territory type="CZ">Češka</territory>
+                        <territory type="CZ" alt="variant">Češka republika</territory>
                         <territory type="DE">Nemčija</territory>
                         <territory type="DG">Diego Garcia</territory>
                         <territory type="DJ">Džibuti</territory>
                         <territory type="DK">Danska</territory>
                         <territory type="DM">Dominika</territory>

@@ -733,10 +765,11 @@
                         <territory type="EH">Zahodna Sahara</territory>
                         <territory type="ER">Eritreja</territory>
                         <territory type="ES">Španija</territory>
                         <territory type="ET">Etiopija</territory>
                         <territory type="EU">Evropska unija</territory>
+                        <territory type="EZ">evroobmočje</territory>
                         <territory type="FI">Finska</territory>
                         <territory type="FJ">Fidži</territory>
                         <territory type="FK">Falklandski otoki</territory>
                         <territory type="FK" alt="variant">Falklandski otoki (Malvini)</territory>
                         <territory type="FM">Mikronezija</territory>

@@ -752,19 +785,19 @@
                         <territory type="GH">Gana</territory>
                         <territory type="GI">Gibraltar</territory>
                         <territory type="GL">Grenlandija</territory>
                         <territory type="GM">Gambija</territory>
                         <territory type="GN">Gvineja</territory>
-                        <territory type="GP">Gvadalupe</territory>
+                        <territory type="GP">Guadeloupe</territory>
                         <territory type="GQ">Ekvatorialna Gvineja</territory>
                         <territory type="GR">Grčija</territory>
                         <territory type="GS">Južna Georgia in Južni Sandwichevi otoki</territory>
                         <territory type="GT">Gvatemala</territory>
                         <territory type="GU">Guam</territory>
                         <territory type="GW">Gvineja Bissau</territory>
                         <territory type="GY">Gvajana</territory>
-                        <territory type="HK">Posebno administrativno območje LR Kitajske Hong Kong</territory>
+                        <territory type="HK">Posebno administrativno območje LR Kitajske Hongkong</territory>
                         <territory type="HK" alt="short">Hongkong</territory>
                         <territory type="HM">Heardov otok in McDonaldovi otoki</territory>
                         <territory type="HN">Honduras</territory>
                         <territory type="HR">Hrvaška</territory>
                         <territory type="HT">Haiti</territory>

@@ -886,29 +919,32 @@
                         <territory type="SV">Salvador</territory>
                         <territory type="SX">Sint Maarten</territory>
                         <territory type="SY">Sirija</territory>
                         <territory type="SZ">Svazi</territory>
                         <territory type="TA">Tristan da Cunha</territory>
-                        <territory type="TC">Otočji Turks in Caicos</territory>
+                        <territory type="TC">Otoki Turks in Caicos</territory>
                         <territory type="TD">Čad</territory>
                         <territory type="TF">Francosko južno ozemlje</territory>
                         <territory type="TG">Togo</territory>
                         <territory type="TH">Tajska</territory>
                         <territory type="TJ">Tadžikistan</territory>
                         <territory type="TK">Tokelau</territory>
-                        <territory type="TL">Vzhodni Timor</territory>
+                        <territory type="TL">Timor-Leste</territory>
+                        <territory type="TL" alt="variant">Vzhodni Timor</territory>
                         <territory type="TM">Turkmenistan</territory>
                         <territory type="TN">Tunizija</territory>
                         <territory type="TO">Tonga</territory>
                         <territory type="TR">Turčija</territory>
                         <territory type="TT">Trinidad in Tobago</territory>
                         <territory type="TV">Tuvalu</territory>
                         <territory type="TW">Tajvan</territory>
                         <territory type="TZ">Tanzanija</territory>
                         <territory type="UA">Ukrajina</territory>
                         <territory type="UG">Uganda</territory>
-                        <territory type="UM">Druga ameriška ozemlja v Tihem oceanu</territory>
+                        <territory type="UM">Stranski zunanji otoki Združenih držav</territory>
+                        <territory type="UN">Združeni narodi</territory>
+                        <territory type="UN" alt="short">ZN</territory>
                         <territory type="US">Združene države Amerike</territory>
                         <territory type="US" alt="short">ZDA</territory>
                         <territory type="UY">Urugvaj</territory>
                         <territory type="UZ">Uzbekistan</territory>
                         <territory type="VA">Vatikan</territory>

@@ -963,15 +999,15 @@
                         <variant type="VALENCIA">valencijski pravopis</variant>
                         <variant type="WADEGILE">romanizacija Wade-Giles</variant>
                 </variants>
                 <keys>
                         <key type="calendar">koledar</key>
+                        <key type="cf">oblika zapisa valute</key>
                         <key type="colAlternate" draft="contributed">Razvrščanje s prezrtimi znaki</key>
                         <key type="colBackwards" draft="contributed">Razvrščanje z obratnimi naglasi</key>
                         <key type="colCaseFirst" draft="contributed">Razvrščanje velike črke/male črke</key>
                         <key type="colCaseLevel" draft="contributed">Razvrščanje, občutljivo na velike/male črke</key>
-                        <key type="colHiraganaQuaternary" draft="contributed">Razvrščanje kana</key>
                         <key type="collation">razvrščanje</key>
                         <key type="colNormalization" draft="contributed">Normalizirano razvrščanje</key>
                         <key type="colNumeric" draft="contributed">Številsko razvrščanje</key>
                         <key type="colStrength" draft="contributed">Moč razvrščanja</key>
                         <key type="currency">valuta</key>

@@ -979,11 +1015,10 @@
                         <key type="lb">Slog preloma vrstic</key>
                         <key type="ms">merski sistem</key>
                         <key type="numbers">številke</key>
                         <key type="timezone" draft="contributed">Časovni pas</key>
                         <key type="va" draft="contributed">Različica območnih nastavitev</key>
-                        <key type="variableTop" draft="contributed">Razvrščanje kot simboli</key>
                         <key type="x" draft="contributed">Private-Use</key>
                 </keys>
                 <types>
                         <type key="calendar" type="buddhist">budistični koledar</type>
                         <type key="calendar" type="chinese">kitajski koledar</type>

@@ -994,28 +1029,34 @@
                         <type key="calendar" type="gregorian">gregorijanski koledar</type>
                         <type key="calendar" type="hebrew">hebrejski koledar</type>
                         <type key="calendar" type="indian">indijanski koledar</type>
                         <type key="calendar" type="islamic">islamski koledar</type>
                         <type key="calendar" type="islamic-civil">islamski civilni koledar</type>
+                        <type key="calendar" type="islamic-rgsa" draft="contributed">islamski koledar ( Saudova Arabija, opazovalni)</type>
+                        <type key="calendar" type="islamic-tbla" draft="contributed">islamski koledar (tabelarni, astronomska epoha)</type>
+                        <type key="calendar" type="islamic-umalqura" draft="contributed">islamski koledar Umm al-Qura</type>
                         <type key="calendar" type="iso8601">koledar ISO-8601</type>
                         <type key="calendar" type="japanese">japonski koledar</type>
                         <type key="calendar" type="persian">perzijski koledar</type>
-                        <type key="calendar" type="roc">kitajski državni koledar</type>
+                        <type key="calendar" type="roc">koledar Minguo</type>
+                        <type key="cf" type="account">oblika zapisa valute v računovodstvu</type>
+                        <type key="cf" type="standard">standardna oblika zapisa valute</type>
                         <type key="colAlternate" type="non-ignorable" draft="contributed">Razvrščanje simbolov</type>
                         <type key="colAlternate" type="shifted" draft="contributed">Razvrščanje s prezrtjem simbolov</type>
                         <type key="colBackwards" type="no" draft="contributed">Navadno razvrščanje naglasov</type>
                         <type key="colBackwards" type="yes" draft="contributed">Obratno razvrščanje naglasov</type>
                         <type key="colCaseFirst" type="lower" draft="contributed">Razvrščanje malih črk najprej</type>
                         <type key="colCaseFirst" type="no" draft="contributed">Razvrščanje v običajnem zaporedju velikih/malih črk</type>
                         <type key="colCaseFirst" type="upper" draft="contributed">Razvrščanje velikih črk najprej</type>
                         <type key="colCaseLevel" type="no" draft="contributed">Razvrščanje ne glede na velike/male črke</type>
                         <type key="colCaseLevel" type="yes" draft="contributed">Razvrščanje ob upoštevanju velikih/malih črk</type>
-                        <type key="colHiraganaQuaternary" type="no" draft="contributed">Razvrščanje kana ločeno</type>
-                        <type key="colHiraganaQuaternary" type="yes" draft="contributed">Razvrščanje kana različno</type>
                         <type key="collation" type="big5han">razvrščanje po sistemu tradicionalne kitajščine - Big5</type>
+                        <type key="collation" type="compat" draft="contributed">prej uporabljeno razvrščanje za združljivost</type>
                         <type key="collation" type="dictionary" draft="contributed">Vrstni red razvrščanja v slovarju</type>
                         <type key="collation" type="ducet">Privzeto razvrščanje Unicode</type>
+                        <type key="collation" type="emoji" draft="contributed">razvrščanje čustvenčkov</type>
+                        <type key="collation" type="eor" draft="contributed">evropska pravila razvrščanja</type>
                         <type key="collation" type="gb2312han">razvrščanje po sistemu poenostavljene kitajščine - GB2312</type>
                         <type key="collation" type="phonebook">razvrščanje po abecedi</type>
                         <type key="collation" type="phonetic" draft="contributed">Fonetično razvrščanje</type>
                         <type key="collation" type="pinyin">razvrščanje po sistemu pinjin</type>
                         <type key="collation" type="reformed" draft="contributed">Reformirano razvrščanje</type>

@@ -1023,113 +1064,402 @@
                         <type key="collation" type="searchjl" draft="contributed">Iskanje po začetnem soglasniku hangul</type>
                         <type key="collation" type="standard">Standardno razvrščanje</type>
                         <type key="collation" type="stroke">razvrščanje po zaporedju pisanja pismenk</type>
                         <type key="collation" type="traditional">razvrščanje po tradicionalnem sistemu</type>
                         <type key="collation" type="unihan" draft="contributed">Razvrščanje koren-poteza</type>
+                        <type key="collation" type="zhuyin" draft="contributed">Razvrščanje po pismenkah Zhuyin</type>
                         <type key="colNormalization" type="no" draft="contributed">Razvrščanje brez normaliziranja</type>
                         <type key="colNormalization" type="yes" draft="contributed">Normalizirano razvrščanje Unicode</type>
                         <type key="colNumeric" type="no" draft="contributed">Ločeno razvrščanje številk</type>
                         <type key="colNumeric" type="yes" draft="contributed">Številsko razvrščanje števk</type>
                         <type key="colStrength" type="identical" draft="contributed">Razvrščanje vsega</type>
                         <type key="colStrength" type="primary" draft="contributed">Razvrščanje samo osnovnih črk</type>
                         <type key="colStrength" type="quaternary" draft="contributed">Razvrščanje po naglasih/velikih črkah/malih črkah/širini/kana</type>
                         <type key="colStrength" type="secondary" draft="contributed">Razvrščanje naglasov</type>
                         <type key="colStrength" type="tertiary" draft="contributed">Razvrščanje po naglasih/velikih črkah/malih črkah/širini</type>
+                        <type key="d0" type="fwidth" draft="contributed">Polna širina</type>
+                        <type key="d0" type="hwidth" draft="contributed">Polovična širina</type>
+                        <type key="d0" type="npinyin" draft="contributed">Številsko</type>
                         <type key="hc" type="h11">12-urni sistem (0–11)</type>
                         <type key="hc" type="h12">12-urni sistem (1–12)</type>
                         <type key="hc" type="h23">24-urni sistem (0–23)</type>
                         <type key="hc" type="h24">24-urni sistem (1–24)</type>
                         <type key="lb" type="loose">Prosti slog preloma vrstic</type>
                         <type key="lb" type="normal">Običajni slog preloma vrstic</type>
                         <type key="lb" type="strict">Strogi slog preloma vrstic</type>
+                        <type key="m0" type="bgn" draft="contributed">BGN</type>
+                        <type key="m0" type="ungegn" draft="contributed">UNGEGN</type>
                         <type key="ms" type="metric">metrični sistem</type>
                         <type key="ms" type="uksystem">imperialni merski sistem</type>
                         <type key="ms" type="ussystem">merski sistem Združenih držav</type>
+                        <type key="numbers" type="ahom" draft="contributed">števke ahom</type>
                         <type key="numbers" type="arab">arabskoindijske števke</type>
                         <type key="numbers" type="arabext">razširjene arabskoindijske števke</type>
                         <type key="numbers" type="armn">armenske številke</type>
                         <type key="numbers" type="armnlow">armenske majhne številke</type>
-                        <type key="numbers" type="beng" draft="contributed">Bengalske števke</type>
+                        <type key="numbers" type="bali" draft="contributed">balinezijske števke</type>
+                        <type key="numbers" type="beng">bengalske števke</type>
+                        <type key="numbers" type="brah" draft="contributed">brahmi števke</type>
+                        <type key="numbers" type="cakm" draft="contributed">čakma števke</type>
+                        <type key="numbers" type="cham" draft="contributed">Cham števke</type>
+                        <type key="numbers" type="cyrl" draft="contributed">cirilične številke</type>
                         <type key="numbers" type="deva">devangarske števke</type>
-                        <type key="numbers" type="ethi" draft="contributed">Etiopijske številke</type>
+                        <type key="numbers" type="ethi">etiopijske številke</type>
                         <type key="numbers" type="finance" draft="contributed">Finančne številke</type>
                         <type key="numbers" type="fullwide">števke polne širine</type>
                         <type key="numbers" type="geor">gruzijske številke</type>
+                        <type key="numbers" type="gonm" draft="contributed">Masaram gondi števke</type>
                         <type key="numbers" type="grek">grške številke</type>
                         <type key="numbers" type="greklow">grške male številke</type>
                         <type key="numbers" type="gujr">gudžaratske števke</type>
                         <type key="numbers" type="guru">gurmuške števke</type>
                         <type key="numbers" type="hanidec">kitajske decimalne številke</type>
                         <type key="numbers" type="hans">poenostavljene kitajske številke</type>
                         <type key="numbers" type="hansfin">poenostavljene kitajske finančne številke</type>
                         <type key="numbers" type="hant">tradicionalne kitajske številke</type>
                         <type key="numbers" type="hantfin">tradicionalne kitajske finančne številke</type>
                         <type key="numbers" type="hebr">hebrejske številke</type>
+                        <type key="numbers" type="hmng" draft="contributed">Pahawh Hmong števke</type>
+                        <type key="numbers" type="java" draft="contributed">javanske števke</type>
                         <type key="numbers" type="jpan">japonske številke</type>
                         <type key="numbers" type="jpanfin">japonske finančne številke</type>
+                        <type key="numbers" type="kali" draft="contributed">Kayah Li števke</type>
                         <type key="numbers" type="khmr">kmerske števke</type>
-                        <type key="numbers" type="knda" draft="contributed">Kanaredske števke</type>
+                        <type key="numbers" type="knda">kanaredske števke</type>
+                        <type key="numbers" type="lana" draft="contributed">Tai Tham Hora števke</type>
+                        <type key="numbers" type="lanatham" draft="contributed">Tai Tham Tham števke</type>
                         <type key="numbers" type="laoo">laoške števke</type>
                         <type key="numbers" type="latn">zahodne števke</type>
+                        <type key="numbers" type="lepc" draft="contributed">Lepcha števke</type>
+                        <type key="numbers" type="limb" draft="contributed">Limbu števke</type>
+                        <type key="numbers" type="mathbold" draft="contributed">Krepke matematične števke</type>
+                        <type key="numbers" type="mathdbl" draft="contributed">dvojno prečrtane matematične števke</type>
+                        <type key="numbers" type="mathmono" draft="contributed">matematične števke z enim prostorom</type>
+                        <type key="numbers" type="mathsanb" draft="contributed">matematične krepke Sans-Serif števke</type>
+                        <type key="numbers" type="mathsans" draft="contributed">matematične Sans-Serif števke</type>
                         <type key="numbers" type="mlym">malajalamske števke</type>
+                        <type key="numbers" type="modi" draft="contributed">Modi števke</type>
                         <type key="numbers" type="mong" draft="contributed">Mongolske števke</type>
+                        <type key="numbers" type="mroo" draft="contributed">Mro števke</type>
+                        <type key="numbers" type="mtei" draft="contributed">Meetei Mayek števke</type>
                         <type key="numbers" type="mymr">mjanmarske števke</type>
+                        <type key="numbers" type="mymrshan" draft="contributed">mjanmarske shan števke</type>
+                        <type key="numbers" type="mymrtlng" draft="contributed">mjanmarske števke Tai Laing</type>
                         <type key="numbers" type="native" draft="contributed">Domače števke</type>
+                        <type key="numbers" type="nkoo" draft="contributed">N’Ko števke</type>
+                        <type key="numbers" type="olck" draft="contributed">Ol Chiki števke</type>
                         <type key="numbers" type="orya">orijske števke</type>
+                        <type key="numbers" type="osma" draft="contributed">osmanijske števke</type>
                         <type key="numbers" type="roman">rimske številke</type>
                         <type key="numbers" type="romanlow">rimske male številke</type>
-                        <type key="numbers" type="taml">tamilske številke</type>
+                        <type key="numbers" type="saur" draft="contributed">Saurashtra števke</type>
+                        <type key="numbers" type="shrd" draft="contributed">Sharada števke</type>
+                        <type key="numbers" type="sind" draft="contributed">Khudawadi števke</type>
+                        <type key="numbers" type="sinh" draft="contributed">Sinhala Lith števke</type>
+                        <type key="numbers" type="sora" draft="contributed">Sora Sompeng števke</type>
+                        <type key="numbers" type="sund" draft="contributed">sundijske števke</type>
+                        <type key="numbers" type="takr" draft="contributed">Takri števke</type>
+                        <type key="numbers" type="talu" draft="contributed">Nove Tai Lue števke</type>
+                        <type key="numbers" type="taml">tradicionalne tamilske številke</type>
                         <type key="numbers" type="tamldec">tamilske števke</type>
                         <type key="numbers" type="telu">teluške števke</type>
                         <type key="numbers" type="thai">tajske števke</type>
                         <type key="numbers" type="tibt">tibetanske števke</type>
+                        <type key="numbers" type="tirh" draft="contributed">Tirhuta števke</type>
                         <type key="numbers" type="traditional" draft="contributed">Tradicionalne številke</type>
                         <type key="numbers" type="vaii" draft="contributed">Številke vai</type>
+                        <type key="numbers" type="wara" draft="contributed">Warang Citi števke</type>
                 </types>
-                <transformNames>
-                        <transformName type="BGN" draft="contributed">BGN</transformName>
-                        <transformName type="Numeric" draft="contributed">Številsko</transformName>
-                        <transformName type="Tone" draft="contributed">Ton</transformName>
-                        <transformName type="UNGEGN" draft="contributed">UNGEGN</transformName>
-                        <transformName type="x-Accents" draft="contributed">Accents</transformName>
-                        <transformName type="x-Fullwidth" draft="contributed">Polna širina</transformName>
-                        <transformName type="x-Halfwidth" draft="contributed">Polovična širina</transformName>
-                        <transformName type="x-Jamo" draft="contributed">Jamo</transformName>
-                        <transformName type="x-Pinyin" draft="contributed">Pinjin</transformName>
-                        <transformName type="x-Publishing" draft="contributed">Publishing</transformName>
-                </transformNames>
                 <measurementSystemNames>
                         <measurementSystemName type="metric">metrični</measurementSystemName>
                         <measurementSystemName type="UK">angleški</measurementSystemName>
                         <measurementSystemName type="US">imperialni</measurementSystemName>
                 </measurementSystemNames>
                 <codePatterns>
                         <codePattern type="language">Jezik: {0}</codePattern>
-                        <codePattern type="script" draft="contributed">{0}</codePattern>
+                        <codePattern type="script">Pisava: {0}</codePattern>
                         <codePattern type="territory">Regija: {0}</codePattern>
                 </codePatterns>
         </localeDisplayNames>
         <characters>
                 <exemplarCharacters>[a b c č d e f g h i j k l m n o p r s š t u v z ž]</exemplarCharacters>
                 <exemplarCharacters type="auxiliary">[á à ă â å ä ā æ ç ć đ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ q ú ù ŭ û ü ū w x y ÿ]</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="numbers">[, . % ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+                <exemplarCharacters type="punctuation">[\- – , ; \: ! ? . … ' &quot; „ ‟ « » ( ) \[ \] \{ \} @ *]</exemplarCharacters>
                 <ellipsis type="final">{0}…</ellipsis>
                 <ellipsis type="initial">…{0}</ellipsis>
                 <ellipsis type="medial">{0}…{1}</ellipsis>
                 <ellipsis type="word-final">{0} …</ellipsis>
                 <ellipsis type="word-initial">… {0}</ellipsis>
                 <ellipsis type="word-medial">{0} … {1}</ellipsis>
                 <moreInformation>?</moreInformation>
+                <parseLenients scope="date" level="lenient">
+                        <parseLenient sample="-" draft="contributed">[\--/]</parseLenient>
+                        <parseLenient sample=":" draft="contributed">[\:∶]</parseLenient>
+                </parseLenients>
+                <parseLenients scope="general" level="lenient">
+                        <parseLenient sample="." draft="contributed">[.․。︒﹒.。]</parseLenient>
+                        <parseLenient sample="$" draft="contributed">[\$﹩$$]</parseLenient>
+                        <parseLenient sample="£" draft="contributed">[£₤]</parseLenient>
+                        <parseLenient sample="₹" draft="contributed">[₨₹{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>
                 <alternateQuotationEnd>‘</alternateQuotationEnd>
         </delimiters>
         <dates>
                 <calendars>
+                        <calendar type="buddhist">
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">budistični koledar</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">bud. kol.</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">BK</era>
+                                        </eraNarrow>
+                                </eras>
+                        </calendar>
+                        <calendar type="coptic">
+                                <months>
+                                        <monthContext type="format">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Tout</month>
+                                                        <month type="2" draft="contributed">Baba</month>
+                                                        <month type="3" draft="contributed">Hator</month>
+                                                        <month type="4" draft="contributed">Kiahk</month>
+                                                        <month type="5" draft="contributed">Toba</month>
+                                                        <month type="6" draft="contributed">Amshir</month>
+                                                        <month type="7" draft="contributed">Baramhat</month>
+                                                        <month type="8" draft="contributed">Baramouda</month>
+                                                        <month type="9" draft="contributed">Bashans</month>
+                                                        <month type="10" draft="contributed">Paona</month>
+                                                        <month type="11" draft="contributed">Epep</month>
+                                                        <month type="12" draft="contributed">Mesra</month>
+                                                        <month type="13" draft="contributed">Nasie</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Tout</month>
+                                                        <month type="2" draft="contributed">Baba</month>
+                                                        <month type="3" draft="contributed">Hator</month>
+                                                        <month type="4" draft="contributed">Kiahk</month>
+                                                        <month type="5" draft="contributed">Toba</month>
+                                                        <month type="6" draft="contributed">Amshir</month>
+                                                        <month type="7" draft="contributed">Baramhat</month>
+                                                        <month type="8" draft="contributed">Baramouda</month>
+                                                        <month type="9" draft="contributed">Bashans</month>
+                                                        <month type="10" draft="contributed">Paona</month>
+                                                        <month type="11" draft="contributed">Epep</month>
+                                                        <month type="12" draft="contributed">Mesra</month>
+                                                        <month type="13" draft="contributed">Nasie</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Tout</month>
+                                                        <month type="2" draft="contributed">Baba</month>
+                                                        <month type="3" draft="contributed">Hator</month>
+                                                        <month type="4" draft="contributed">Kiahk</month>
+                                                        <month type="5" draft="contributed">Toba</month>
+                                                        <month type="6" draft="contributed">Amshir</month>
+                                                        <month type="7" draft="contributed">Baramhat</month>
+                                                        <month type="8" draft="contributed">Baramouda</month>
+                                                        <month type="9" draft="contributed">Bashans</month>
+                                                        <month type="10" draft="contributed">Paona</month>
+                                                        <month type="11" draft="contributed">Epep</month>
+                                                        <month type="12" draft="contributed">Mesra</month>
+                                                        <month type="13" draft="contributed">Nasie</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Tout</month>
+                                                        <month type="2" draft="contributed">Baba</month>
+                                                        <month type="3" draft="contributed">Hator</month>
+                                                        <month type="4" draft="contributed">Kiahk</month>
+                                                        <month type="5" draft="contributed">Toba</month>
+                                                        <month type="6" draft="contributed">Amshir</month>
+                                                        <month type="7" draft="contributed">Baramhat</month>
+                                                        <month type="8" draft="contributed">Baramouda</month>
+                                                        <month type="9" draft="contributed">Bashans</month>
+                                                        <month type="10" draft="contributed">Paona</month>
+                                                        <month type="11" draft="contributed">Epep</month>
+                                                        <month type="12" draft="contributed">Mesra</month>
+                                                        <month type="13" draft="contributed">Nasie</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">Meskerem</month>
+                                                        <month type="2" draft="contributed">Tekemt</month>
+                                                        <month type="3" draft="contributed">Hedar</month>
+                                                        <month type="4" draft="contributed">Tahsas</month>
+                                                        <month type="5" draft="contributed">Ter</month>
+                                                        <month type="6" draft="contributed">Yekatit</month>
+                                                        <month type="7" draft="contributed">Megabit</month>
+                                                        <month type="8" draft="contributed">Miazia</month>
+                                                        <month type="9" draft="contributed">Genbot</month>
+                                                        <month type="10" draft="contributed">Sene</month>
+                                                        <month type="11" draft="contributed">Hamle</month>
+                                                        <month type="12" draft="contributed">Nehasse</month>
+                                                        <month type="13" draft="contributed">Pagumen</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Meskerem</month>
+                                                        <month type="2" draft="contributed">Tekemt</month>
+                                                        <month type="3" draft="contributed">Hedar</month>
+                                                        <month type="4" draft="contributed">Tahsas</month>
+                                                        <month type="5" draft="contributed">Ter</month>
+                                                        <month type="6" draft="contributed">Yekatit</month>
+                                                        <month type="7" draft="contributed">Megabit</month>
+                                                        <month type="8" draft="contributed">Miazia</month>
+                                                        <month type="9" draft="contributed">Genbot</month>
+                                                        <month type="10" draft="contributed">Sene</month>
+                                                        <month type="11" draft="contributed">Hamle</month>
+                                                        <month type="12" draft="contributed">Nehasse</month>
+                                                        <month type="13" draft="contributed">Pagumen</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Meskerem</month>
+                                                        <month type="2" draft="contributed">Tekemt</month>
+                                                        <month type="3" draft="contributed">Hedar</month>
+                                                        <month type="4" draft="contributed">Tahsas</month>
+                                                        <month type="5" draft="contributed">Ter</month>
+                                                        <month type="6" draft="contributed">Yekatit</month>
+                                                        <month type="7" draft="contributed">Megabit</month>
+                                                        <month type="8" draft="contributed">Miazia</month>
+                                                        <month type="9" draft="contributed">Genbot</month>
+                                                        <month type="10" draft="contributed">Sene</month>
+                                                        <month type="11" draft="contributed">Hamle</month>
+                                                        <month type="12" draft="contributed">Nehasse</month>
+                                                        <month type="13" draft="contributed">Pagumen</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Meskerem</month>
+                                                        <month type="2" draft="contributed">Tekemt</month>
+                                                        <month type="3" draft="contributed">Hedar</month>
+                                                        <month type="4" draft="contributed">Tahsas</month>
+                                                        <month type="5" draft="contributed">Ter</month>
+                                                        <month type="6" draft="contributed">Yekatit</month>
+                                                        <month type="7" draft="contributed">Megabit</month>
+                                                        <month type="8" draft="contributed">Miazia</month>
+                                                        <month type="9" draft="contributed">Genbot</month>
+                                                        <month type="10" draft="contributed">Sene</month>
+                                                        <month type="11" draft="contributed">Hamle</month>
+                                                        <month type="12" draft="contributed">Nehasse</month>
+                                                        <month type="13" draft="contributed">Pagumen</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>EEEE, dd. MMMM y G</pattern>

@@ -1152,65 +1482,74 @@
                                         </dateFormatLength>
                                 </dateFormats>
                                 <dateTimeFormats>
                                         <dateTimeFormatLength type="full">
                                                 <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                        <pattern>{1} {0}</pattern>
                                                 </dateTimeFormat>
                                         </dateTimeFormatLength>
                                         <dateTimeFormatLength type="long">
                                                 <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                        <pattern>{1} {0}</pattern>
                                                 </dateTimeFormat>
                                         </dateTimeFormatLength>
                                         <dateTimeFormatLength type="medium">
                                                 <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                        <pattern>{1} {0}</pattern>
                                                 </dateTimeFormat>
                                         </dateTimeFormatLength>
                                         <dateTimeFormatLength type="short">
                                                 <dateTimeFormat>
-                                                        <pattern draft="contributed">{1} {0}</pattern>
+                                                        <pattern>{1} {0}</pattern>
                                                 </dateTimeFormat>
                                         </dateTimeFormatLength>
                                         <availableFormats>
-                                                <dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+                                                <dateFormatItem id="Bh" draft="contributed">h B</dateFormatItem>
+                                                <dateFormatItem id="Bhm" draft="contributed">h:mm B</dateFormatItem>
+                                                <dateFormatItem id="Bhms" draft="contributed">h:mm:ss B</dateFormatItem>
+                                                <dateFormatItem id="d">d</dateFormatItem>
                                                 <dateFormatItem id="E">ccc</dateFormatItem>
+                                                <dateFormatItem id="EBhm" draft="contributed">E h:mm B</dateFormatItem>
+                                                <dateFormatItem id="EBhms" draft="contributed">E h:mm:ss B</dateFormatItem>
                                                 <dateFormatItem id="Ed">E, d.</dateFormatItem>
-                                                <dateFormatItem id="Gy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="GyM" draft="contributed">M/y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMd" draft="contributed">d. MMM y G</dateFormatItem>
-                                                <dateFormatItem id="GyMMMEd" draft="contributed">E, d. MMM y G</dateFormatItem>
+                                                <dateFormatItem id="Ehm" draft="contributed">E h:mm a</dateFormatItem>
+                                                <dateFormatItem id="EHm" draft="contributed">E, HH:mm</dateFormatItem>
+                                                <dateFormatItem id="Ehms" draft="contributed">E h:mm:ss a</dateFormatItem>
+                                                <dateFormatItem id="EHms" draft="contributed">E, HH:mm:ss</dateFormatItem>
+                                                <dateFormatItem id="Gy">y G</dateFormatItem>
+                                                <dateFormatItem id="GyM">M/y G</dateFormatItem>
+                                                <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+                                                <dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
+                                                <dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
                                                 <dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
                                                 <dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
                                                 <dateFormatItem id="hm" draft="contributed">h:mm a</dateFormatItem>
                                                 <dateFormatItem id="Hm">HH:mm</dateFormatItem>
                                                 <dateFormatItem id="hms" draft="contributed">h:mm:ss a</dateFormatItem>
                                                 <dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-                                                <dateFormatItem id="M" draft="contributed">L</dateFormatItem>
+                                                <dateFormatItem id="M">L</dateFormatItem>
                                                 <dateFormatItem id="Md">d. M.</dateFormatItem>
-                                                <dateFormatItem id="MEd">E, d. MM.</dateFormatItem>
-                                                <dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
+                                                <dateFormatItem id="MEd">E, d. M.</dateFormatItem>
+                                                <dateFormatItem id="MMM">LLL</dateFormatItem>
                                                 <dateFormatItem id="MMMd">d. MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
                                                 <dateFormatItem id="ms">mm:ss</dateFormatItem>
                                                 <dateFormatItem id="y">y</dateFormatItem>
-                                                <dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyM" draft="contributed">M/y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMd" draft="contributed">d. M. y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMEd" draft="contributed">E, d. M. y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMM" draft="contributed">MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMd" draft="contributed">d. MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMEd" draft="contributed">E, d. MMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
-                                                <dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
+                                                <dateFormatItem id="yyyy">y G</dateFormatItem>
+                                                <dateFormatItem id="yyyyM">M/y G</dateFormatItem>
+                                                <dateFormatItem id="yyyyMd">d. M. y G</dateFormatItem>
+                                                <dateFormatItem id="yyyyMEd">E, d. M. y G</dateFormatItem>
+                                                <dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+                                                <dateFormatItem id="yyyyMMMd">d. MMM y G</dateFormatItem>
+                                                <dateFormatItem id="yyyyMMMEd">E, d. MMM y G</dateFormatItem>
+                                                <dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
+                                                <dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+                                                <dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
                                         </availableFormats>
                                         <intervalFormats>
-                                                <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+                                                <intervalFormatFallback>{0}–{1}</intervalFormatFallback>
                                                 <intervalFormatItem id="d">
                                                         <greatestDifference id="d">d.–d.</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="h">
                                                         <greatestDifference id="a">h a – h a</greatestDifference>

@@ -1246,27 +1585,27 @@
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="M">
                                                         <greatestDifference id="M">M.–M.</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="Md">
-                                                        <greatestDifference id="d">d. – d. M.</greatestDifference>
-                                                        <greatestDifference id="M">d. M. – d. M.</greatestDifference>
+                                                        <greatestDifference id="d">d.–d. M.</greatestDifference>
+                                                        <greatestDifference id="M">d. M.–d. M.</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="MEd">
-                                                        <greatestDifference id="d">E, d. – E, d. M.</greatestDifference>
-                                                        <greatestDifference id="M">E, d. M. – E, d. M.</greatestDifference>
+                                                        <greatestDifference id="d">E, d.–E, d. M.</greatestDifference>
+                                                        <greatestDifference id="M">E, d. M.–E, d. M.</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="MMM">
                                                         <greatestDifference id="M">MMM–MMM</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="MMMd">
                                                         <greatestDifference id="d">d.–d. MMM</greatestDifference>
-                                                        <greatestDifference id="M">d. MMM – d. MMM</greatestDifference>
+                                                        <greatestDifference id="M">d. MMM–d. MMM</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="MMMEd">
-                                                        <greatestDifference id="d">E, d. – E, d. MMM</greatestDifference>
-                                                        <greatestDifference id="M">E, d. MMM – E, d. MMM</greatestDifference>
+                                                        <greatestDifference id="d">E, d.–E, d. MMM</greatestDifference>
+                                                        <greatestDifference id="M">E, d. MMM–E, d. MMM</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="y">
                                                         <greatestDifference id="y">y–y</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="yM">

@@ -1296,12 +1635,12 @@
                                                         <greatestDifference id="d">E, d. MMM – E, d. MMM y</greatestDifference>
                                                         <greatestDifference id="M">E, d. MMM – E, d. MMM y</greatestDifference>
                                                         <greatestDifference id="y">E, d. MMM y – E, d. MMM y</greatestDifference>
                                                 </intervalFormatItem>
                                                 <intervalFormatItem id="yMMMM">
-                                                        <greatestDifference id="M" draft="contributed">MMMM–MMMM y</greatestDifference>
-                                                        <greatestDifference id="y" draft="contributed">MMMM y – MMMM y</greatestDifference>
+                                                        <greatestDifference id="M">MMMM–MMMM y</greatestDifference>
+                                                        <greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
                                                 </intervalFormatItem>
                                         </intervalFormats>
                                 </dateTimeFormats>
                         </calendar>
                         <calendar type="gregorian">

@@ -1350,22 +1689,22 @@
                                                         <month type="12">december</month>
                                                 </monthWidth>
                                         </monthContext>
                                         <monthContext type="stand-alone">
                                                 <monthWidth type="abbreviated">
-                                                        <month type="1">jan</month>
-                                                        <month type="2">feb</month>
-                                                        <month type="3">mar</month>
-                                                        <month type="4">apr</month>
+                                                        <month type="1">jan.</month>
+                                                        <month type="2">feb.</month>
+                                                        <month type="3">mar.</month>
+                                                        <month type="4">apr.</month>
                                                         <month type="5">maj</month>
-                                                        <month type="6">jun</month>
-                                                        <month type="7">jul</month>
-                                                        <month type="8">avg</month>
-                                                        <month type="9">sep</month>
-                                                        <month type="10">okt</month>
-                                                        <month type="11">nov</month>
-                                                        <month type="12">dec</month>
+                                                        <month type="6">jun.</month>
+                                                        <month type="7">jul.</month>
+                                                        <month type="8">avg.</month>
+                                                        <month type="9">sep.</month>
+                                                        <month type="10">okt.</month>
+                                                        <month type="11">nov.</month>
+                                                        <month type="12">dec.</month>
                                                 </monthWidth>
                                                 <monthWidth type="narrow">
                                                         <month type="1">j</month>
                                                         <month type="2">f</month>
                                                         <month type="3">m</month>

@@ -1434,17 +1773,17 @@
                                                         <day type="sat">sobota</day>
                                                 </dayWidth>
                                         </dayContext>
                                         <dayContext type="stand-alone">
                                                 <dayWidth type="abbreviated">
-                                                        <day type="sun">ned</day>
-                                                        <day type="mon">pon</day>
-                                                        <day type="tue">tor</day>
-                                                        <day type="wed">sre</day>
-                                                        <day type="thu">čet</day>
-                                                        <day type="fri">pet</day>
-                                                        <day type="sat">sob</day>
+                                                        <day type="sun">ned.</day>
+                                                        <day type="mon">pon.</day>
+                                                        <day type="tue">tor.</day>
+                                                        <day type="wed">sre.</day>
+                                                        <day type="thu">čet.</day>
+                                                        <day type="fri">pet.</day>
+                                                        <day type="sat">sob.</day>
                                                 </dayWidth>
                                                 <dayWidth type="narrow">
                                                         <day type="sun">n</day>
                                                         <day type="mon">p</day>
                                                         <day type="tue">t</day>

@@ -1516,19 +1855,19 @@
                                         </quarterContext>
                                 </quarters>
                                 <dayPeriods>
                                         <dayPeriodContext type="format">
                                                 <dayPeriodWidth type="abbreviated">
-                                                        <dayPeriod type="midnight">poln.</dayPeriod>
+                                                        <dayPeriod type="midnight">opoln.</dayPeriod>
                                                         <dayPeriod type="am">dop.</dayPeriod>
-                                                        <dayPeriod type="noon">pold.</dayPeriod>
+                                                        <dayPeriod type="noon">opold.</dayPeriod>
                                                         <dayPeriod type="pm">pop.</dayPeriod>
                                                         <dayPeriod type="morning1">zjut.</dayPeriod>
                                                         <dayPeriod type="morning2">dop.</dayPeriod>
                                                         <dayPeriod type="afternoon1">pop.</dayPeriod>
                                                         <dayPeriod type="evening1">zveč.</dayPeriod>
-                                                        <dayPeriod type="night1">noč</dayPeriod>
+                                                        <dayPeriod type="night1">ponoči</dayPeriod>
                                                 </dayPeriodWidth>
                                                 <dayPeriodWidth type="narrow">
                                                         <dayPeriod type="midnight">24.00</dayPeriod>
                                                         <dayPeriod type="am">d</dayPeriod>
                                                         <dayPeriod type="noon">12.00</dayPeriod>

@@ -1538,69 +1877,69 @@
                                                         <dayPeriod type="afternoon1">p</dayPeriod>
                                                         <dayPeriod type="evening1">zv</dayPeriod>
                                                         <dayPeriod type="night1">po</dayPeriod>
                                                 </dayPeriodWidth>
                                                 <dayPeriodWidth type="wide">
-                                                        <dayPeriod type="midnight">polnoč</dayPeriod>
+                                                        <dayPeriod type="midnight">opolnoči</dayPeriod>
                                                         <dayPeriod type="am">dop.</dayPeriod>
-                                                        <dayPeriod type="noon">poldne</dayPeriod>
+                                                        <dayPeriod type="noon">opoldne</dayPeriod>
                                                         <dayPeriod type="pm">pop.</dayPeriod>
-                                                        <dayPeriod type="morning1">jutro</dayPeriod>
+                                                        <dayPeriod type="morning1">zjutraj</dayPeriod>
                                                         <dayPeriod type="morning2">dopoldan</dayPeriod>
                                                         <dayPeriod type="afternoon1">popoldan</dayPeriod>
-                                                        <dayPeriod type="evening1">večer</dayPeriod>
-                                                        <dayPeriod type="night1">noč</dayPeriod>
+                                                        <dayPeriod type="evening1">zvečer</dayPeriod>
+                                                        <dayPeriod type="night1">ponoči</dayPeriod>
                                                 </dayPeriodWidth>
                                         </dayPeriodContext>
                                         <dayPeriodContext type="stand-alone">
                                                 <dayPeriodWidth type="abbreviated">
                                                         <dayPeriod type="midnight">poln.</dayPeriod>
                                                         <dayPeriod type="am">dop.</dayPeriod>
                                                         <dayPeriod type="noon">pold.</dayPeriod>
                                                         <dayPeriod type="pm">pop.</dayPeriod>
-                                                        <dayPeriod type="morning1">zjut.</dayPeriod>
+                                                        <dayPeriod type="morning1">jut.</dayPeriod>
                                                         <dayPeriod type="morning2">dop.</dayPeriod>
                                                         <dayPeriod type="afternoon1">pop.</dayPeriod>
                                                         <dayPeriod type="evening1">zveč.</dayPeriod>
-                                                        <dayPeriod type="night1">pon.</dayPeriod>
+                                                        <dayPeriod type="night1">noč</dayPeriod>
                                                 </dayPeriodWidth>
                                                 <dayPeriodWidth type="narrow">
-                                                        <dayPeriod type="midnight">polnoč</dayPeriod>
-                                                        <dayPeriod type="am">dop.</dayPeriod>
-                                                        <dayPeriod type="noon">poldne</dayPeriod>
-                                                        <dayPeriod type="pm">pop.</dayPeriod>
-                                                        <dayPeriod type="morning1">zjutraj</dayPeriod>
-                                                        <dayPeriod type="morning2">dopoldne</dayPeriod>
-                                                        <dayPeriod type="afternoon1">popoldne</dayPeriod>
-                                                        <dayPeriod type="evening1">zvečer</dayPeriod>
-                                                        <dayPeriod type="night1">ponoči</dayPeriod>
+                                                        <dayPeriod type="midnight">24.00</dayPeriod>
+                                                        <dayPeriod type="am">d</dayPeriod>
+                                                        <dayPeriod type="noon">12.00</dayPeriod>
+                                                        <dayPeriod type="pm">p</dayPeriod>
+                                                        <dayPeriod type="morning1">j</dayPeriod>
+                                                        <dayPeriod type="morning2">d</dayPeriod>
+                                                        <dayPeriod type="afternoon1">p</dayPeriod>
+                                                        <dayPeriod type="evening1">v</dayPeriod>
+                                                        <dayPeriod type="night1">n</dayPeriod>
                                                 </dayPeriodWidth>
                                                 <dayPeriodWidth type="wide">
                                                         <dayPeriod type="midnight">polnoč</dayPeriod>
                                                         <dayPeriod type="am">dopoldne</dayPeriod>
                                                         <dayPeriod type="noon">poldne</dayPeriod>
                                                         <dayPeriod type="pm">popoldne</dayPeriod>
-                                                        <dayPeriod type="morning1">zjutraj</dayPeriod>
+                                                        <dayPeriod type="morning1">jutro</dayPeriod>
                                                         <dayPeriod type="morning2">dopoldne</dayPeriod>
                                                         <dayPeriod type="afternoon1">popoldne</dayPeriod>
-                                                        <dayPeriod type="evening1">zvečer</dayPeriod>
-                                                        <dayPeriod type="night1">ponoči</dayPeriod>
+                                                        <dayPeriod type="evening1">večer</dayPeriod>
+                                                        <dayPeriod type="night1">noč</dayPeriod>
                                                 </dayPeriodWidth>
                                         </dayPeriodContext>
                                 </dayPeriods>
                                 <eras>
                                         <eraNames>
                                                 <era type="0">pred Kristusom</era>
                                                 <era type="0" alt="variant">pred našim štetjem</era>
-                                                <era type="1">naše štetje</era>
-                                                <era type="1" alt="variant">po n. št.</era>
+                                                <era type="1">po Kristusu</era>
+                                                <era type="1" alt="variant">po našem štetju</era>
                                         </eraNames>
                                         <eraAbbr>
                                                 <era type="0">pr. Kr.</era>
                                                 <era type="0" alt="variant">pr. n. št.</era>
-                                                <era type="1">po n. št.</era>
-                                                <era type="1" alt="variant">n. št.</era>
+                                                <era type="1">po Kr.</era>
+                                                <era type="1" alt="variant">po n. št.</era>
                                         </eraAbbr>
                                 </eras>
                                 <dateFormats>
                                         <dateFormatLength type="full">
                                                 <dateFormat>

@@ -1665,24 +2004,29 @@
                                                 <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 a</dateFormatItem>
                                                 <dateFormatItem id="EHm">E HH:mm</dateFormatItem>
-                                                <dateFormatItem id="Ehms">E h:mm:ss a</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="GyM">MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
                                                 <dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
                                                 <dateFormatItem id="h">h a</dateFormatItem>
-                                                <dateFormatItem id="H">HH</dateFormatItem>
+                                                <dateFormatItem id="H">HH'h'</dateFormatItem>
                                                 <dateFormatItem id="hm">h:mm a</dateFormatItem>
                                                 <dateFormatItem id="Hm">HH:mm</dateFormatItem>
                                                 <dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
                                                 <dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
                                                 <dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>

@@ -1693,11 +2037,15 @@
                                                 <dateFormatItem id="Md">d. M.</dateFormatItem>
                                                 <dateFormatItem id="MEd">E, d. M.</dateFormatItem>
                                                 <dateFormatItem id="MMM">LLL</dateFormatItem>
                                                 <dateFormatItem id="MMMd">d. MMM</dateFormatItem>
                                                 <dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
-                                                <dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMW" count="one">W. 'teden' 'v' MMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMW" count="two">W. 'teden' 'v' MMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMW" count="few">W. 'teden' 'v' MMM</dateFormatItem>
+                                                <dateFormatItem id="MMMMW" count="other">W. 'teden' 'v' MMM</dateFormatItem>
                                                 <dateFormatItem id="ms">mm:ss</dateFormatItem>
                                                 <dateFormatItem id="y">y</dateFormatItem>
                                                 <dateFormatItem id="yM">M/y</dateFormatItem>
                                                 <dateFormatItem id="yMd">d. M. y</dateFormatItem>
                                                 <dateFormatItem id="yMEd">E, d. M. y</dateFormatItem>

@@ -1705,10 +2053,14 @@
                                                 <dateFormatItem id="yMMMd">d. MMM y</dateFormatItem>
                                                 <dateFormatItem id="yMMMEd">E, d. MMM y</dateFormatItem>
                                                 <dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
                                                 <dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
                                                 <dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+                                                <dateFormatItem id="yw" count="one">w. 'teden' 'v' Y</dateFormatItem>
+                                                <dateFormatItem id="yw" count="two">w. 'teden' 'v' Y</dateFormatItem>
+                                                <dateFormatItem id="yw" count="few">w. 'teden' 'v' Y</dateFormatItem>
+                                                <dateFormatItem id="yw" count="other">w. 'teden' 'v' Y</dateFormatItem>
                                         </availableFormats>
                                         <appendItems>
                                                 <appendItem request="Timezone">{0} {1}</appendItem>
                                         </appendItems>
                                         <intervalFormats>

@@ -1806,15 +2158,461 @@
                                                         <greatestDifference id="y">MMMM y–MMMM y</greatestDifference>
                                                 </intervalFormatItem>
                                         </intervalFormats>
                                 </dateTimeFormats>
                         </calendar>
+                        <calendar type="hebrew">
+                                <months>
+                                        <monthContext type="format">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Tishri</month>
+                                                        <month type="2" draft="contributed">Heshvan</month>
+                                                        <month type="3" draft="contributed">Kislev</month>
+                                                        <month type="4" draft="contributed">Tevet</month>
+                                                        <month type="5" draft="contributed">Shevat</month>
+                                                        <month type="6" draft="contributed">Adar I</month>
+                                                        <month type="7" draft="contributed">Adar</month>
+                                                        <month type="7" yeartype="leap" draft="contributed">Adar II</month>
+                                                        <month type="8" draft="contributed">Nisan</month>
+                                                        <month type="9" draft="contributed">Iyar</month>
+                                                        <month type="10" draft="contributed">Sivan</month>
+                                                        <month type="11" draft="contributed">Tamuz</month>
+                                                        <month type="12" draft="contributed">Av</month>
+                                                        <month type="13" draft="contributed">Elul</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1">1</month>
+                                                        <month type="2">2</month>
+                                                        <month type="3">3</month>
+                                                        <month type="4">4</month>
+                                                        <month type="5">5</month>
+                                                        <month type="6">6</month>
+                                                        <month type="7">7</month>
+                                                        <month type="7" yeartype="leap">7</month>
+                                                        <month type="8">8</month>
+                                                        <month type="9">9</month>
+                                                        <month type="10">10</month>
+                                                        <month type="11">11</month>
+                                                        <month type="12">12</month>
+                                                        <month type="13">13</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Tishri</month>
+                                                        <month type="2" draft="contributed">Heshvan</month>
+                                                        <month type="3" draft="contributed">Kislev</month>
+                                                        <month type="4" draft="contributed">Tevet</month>
+                                                        <month type="5" draft="contributed">Shevat</month>
+                                                        <month type="6" draft="contributed">Adar I</month>
+                                                        <month type="7" draft="contributed">Adar</month>
+                                                        <month type="7" yeartype="leap" draft="contributed">Adar II</month>
+                                                        <month type="8" draft="contributed">Nisan</month>
+                                                        <month type="9" draft="contributed">Iyar</month>
+                                                        <month type="10" draft="contributed">Sivan</month>
+                                                        <month type="11" draft="contributed">Tamuz</month>
+                                                        <month type="12" draft="contributed">Av</month>
+                                                        <month type="13" draft="contributed">Elul</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Tishri</month>
+                                                        <month type="2" draft="contributed">Heshvan</month>
+                                                        <month type="3" draft="contributed">Kislev</month>
+                                                        <month type="4" draft="contributed">Tevet</month>
+                                                        <month type="5" draft="contributed">Shevat</month>
+                                                        <month type="6" draft="contributed">Adar I</month>
+                                                        <month type="7" draft="contributed">Adar</month>
+                                                        <month type="7" yeartype="leap" draft="contributed">Adar II</month>
+                                                        <month type="8" draft="contributed">Nisan</month>
+                                                        <month type="9" draft="contributed">Iyar</month>
+                                                        <month type="10" draft="contributed">Sivan</month>
+                                                        <month type="11" draft="contributed">Tamuz</month>
+                                                        <month type="12" draft="contributed">Av</month>
+                                                        <month type="13" draft="contributed">Elul</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="7" yeartype="leap" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                        <month type="13" draft="contributed">13</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Tishri</month>
+                                                        <month type="2" draft="contributed">Heshvan</month>
+                                                        <month type="3" draft="contributed">Kislev</month>
+                                                        <month type="4" draft="contributed">Tevet</month>
+                                                        <month type="5" draft="contributed">Shevat</month>
+                                                        <month type="6" draft="contributed">Adar I</month>
+                                                        <month type="7" draft="contributed">Adar</month>
+                                                        <month type="7" yeartype="leap" draft="contributed">Adar II</month>
+                                                        <month type="8" draft="contributed">Nisan</month>
+                                                        <month type="9" draft="contributed">Iyar</month>
+                                                        <month type="10" draft="contributed">Sivan</month>
+                                                        <month type="11" draft="contributed">Tamuz</month>
+                                                        <month type="12" draft="contributed">Av</month>
+                                                        <month type="13" draft="contributed">Elul</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">AM</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">AM</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">AM</era>
+                                        </eraNarrow>
+                                </eras>
+                        </calendar>
+                        <calendar type="indian">
+                                <months>
+                                        <monthContext type="format">
+                                                <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="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Chaitra</month>
+                                                        <month type="2" draft="contributed">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>
+                                        </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="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Chaitra</month>
+                                                        <month type="2" draft="contributed">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>
+                                        </monthContext>
+                                </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">Saka</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="abbreviated">
+                                                        <month type="1" draft="contributed">Muh.</month>
+                                                        <month type="2" draft="contributed">Saf.</month>
+                                                        <month type="3" draft="contributed">Rab. I</month>
+                                                        <month type="4" draft="contributed">Rab. II</month>
+                                                        <month type="5" draft="contributed">Jum. I</month>
+                                                        <month type="6" draft="contributed">Jum. II</month>
+                                                        <month type="7" draft="contributed">Raj.</month>
+                                                        <month type="8" draft="contributed">Sha.</month>
+                                                        <month type="9" draft="contributed">Ram.</month>
+                                                        <month type="10" draft="contributed">Shaw.</month>
+                                                        <month type="11" draft="contributed">Dhuʻl-Q.</month>
+                                                        <month type="12" draft="contributed">Dhuʻl-H.</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Muharram</month>
+                                                        <month type="2" draft="contributed">Safar</month>
+                                                        <month type="3" draft="contributed">Rabiʻ I</month>
+                                                        <month type="4" draft="contributed">Rabiʻ II</month>
+                                                        <month type="5" draft="contributed">Jumada I</month>
+                                                        <month type="6" draft="contributed">Jumada II</month>
+                                                        <month type="7" draft="contributed">Rajab</month>
+                                                        <month type="8" draft="contributed">Shaʻban</month>
+                                                        <month type="9" draft="contributed">Ramadan</month>
+                                                        <month type="10" draft="contributed">Shawwal</month>
+                                                        <month type="11" draft="contributed">Dhuʻl-Qiʻdah</month>
+                                                        <month type="12" draft="contributed">Dhuʻl-Hijjah</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Muh.</month>
+                                                        <month type="2" draft="contributed">Saf.</month>
+                                                        <month type="3" draft="contributed">Rab. I</month>
+                                                        <month type="4" draft="contributed">Rab. II</month>
+                                                        <month type="5" draft="contributed">Jum. I</month>
+                                                        <month type="6" draft="contributed">Jum. II</month>
+                                                        <month type="7" draft="contributed">Raj.</month>
+                                                        <month type="8" draft="contributed">Sha.</month>
+                                                        <month type="9" draft="contributed">Ram.</month>
+                                                        <month type="10" draft="contributed">Shaw.</month>
+                                                        <month type="11" draft="contributed">Dhuʻl-Q.</month>
+                                                        <month type="12" draft="contributed">Dhuʻl-H.</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Muharram</month>
+                                                        <month type="2" draft="contributed">Safar</month>
+                                                        <month type="3" draft="contributed">Rabiʻ I</month>
+                                                        <month type="4" draft="contributed">Rabiʻ II</month>
+                                                        <month type="5" draft="contributed">Jumada I</month>
+                                                        <month type="6" draft="contributed">Jumada II</month>
+                                                        <month type="7" draft="contributed">Rajab</month>
+                                                        <month type="8" draft="contributed">Shaʻban</month>
+                                                        <month type="9" draft="contributed">Ramadan</month>
+                                                        <month type="10" draft="contributed">Shawwal</month>
+                                                        <month type="11" draft="contributed">Dhuʻl-Qiʻdah</month>
+                                                        <month type="12" draft="contributed">Dhuʻl-Hijjah</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">AH</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">AH</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">AH</era>
+                                        </eraNarrow>
+                                </eras>
+                        </calendar>
+                        <calendar type="persian">
+                                <months>
+                                        <monthContext type="format">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Farvardin</month>
+                                                        <month type="2" draft="contributed">Ordibehesht</month>
+                                                        <month type="3" draft="contributed">Khordad</month>
+                                                        <month type="4" draft="contributed">Tir</month>
+                                                        <month type="5" draft="contributed">Mordad</month>
+                                                        <month type="6" draft="contributed">Shahrivar</month>
+                                                        <month type="7" draft="contributed">Mehr</month>
+                                                        <month type="8" draft="contributed">Aban</month>
+                                                        <month type="9" draft="contributed">Azar</month>
+                                                        <month type="10" draft="contributed">Dey</month>
+                                                        <month type="11" draft="contributed">Bahman</month>
+                                                        <month type="12" draft="contributed">Esfand</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Farvardin</month>
+                                                        <month type="2" draft="contributed">Ordibehesht</month>
+                                                        <month type="3" draft="contributed">Khordad</month>
+                                                        <month type="4" draft="contributed">Tir</month>
+                                                        <month type="5" draft="contributed">Mordad</month>
+                                                        <month type="6" draft="contributed">Shahrivar</month>
+                                                        <month type="7" draft="contributed">Mehr</month>
+                                                        <month type="8" draft="contributed">Aban</month>
+                                                        <month type="9" draft="contributed">Azar</month>
+                                                        <month type="10" draft="contributed">Dey</month>
+                                                        <month type="11" draft="contributed">Bahman</month>
+                                                        <month type="12" draft="contributed">Esfand</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                        <monthContext type="stand-alone">
+                                                <monthWidth type="abbreviated">
+                                                        <month type="1" draft="contributed">Farvardin</month>
+                                                        <month type="2" draft="contributed">Ordibehesht</month>
+                                                        <month type="3" draft="contributed">Khordad</month>
+                                                        <month type="4" draft="contributed">Tir</month>
+                                                        <month type="5" draft="contributed">Mordad</month>
+                                                        <month type="6" draft="contributed">Shahrivar</month>
+                                                        <month type="7" draft="contributed">Mehr</month>
+                                                        <month type="8" draft="contributed">Aban</month>
+                                                        <month type="9" draft="contributed">Azar</month>
+                                                        <month type="10" draft="contributed">Dey</month>
+                                                        <month type="11" draft="contributed">Bahman</month>
+                                                        <month type="12" draft="contributed">Esfand</month>
+                                                </monthWidth>
+                                                <monthWidth type="narrow">
+                                                        <month type="1" draft="contributed">1</month>
+                                                        <month type="2" draft="contributed">2</month>
+                                                        <month type="3" draft="contributed">3</month>
+                                                        <month type="4" draft="contributed">4</month>
+                                                        <month type="5" draft="contributed">5</month>
+                                                        <month type="6" draft="contributed">6</month>
+                                                        <month type="7" draft="contributed">7</month>
+                                                        <month type="8" draft="contributed">8</month>
+                                                        <month type="9" draft="contributed">9</month>
+                                                        <month type="10" draft="contributed">10</month>
+                                                        <month type="11" draft="contributed">11</month>
+                                                        <month type="12" draft="contributed">12</month>
+                                                </monthWidth>
+                                                <monthWidth type="wide">
+                                                        <month type="1" draft="contributed">Farvardin</month>
+                                                        <month type="2" draft="contributed">Ordibehesht</month>
+                                                        <month type="3" draft="contributed">Khordad</month>
+                                                        <month type="4" draft="contributed">Tir</month>
+                                                        <month type="5" draft="contributed">Mordad</month>
+                                                        <month type="6" draft="contributed">Shahrivar</month>
+                                                        <month type="7" draft="contributed">Mehr</month>
+                                                        <month type="8" draft="contributed">Aban</month>
+                                                        <month type="9" draft="contributed">Azar</month>
+                                                        <month type="10" draft="contributed">Dey</month>
+                                                        <month type="11" draft="contributed">Bahman</month>
+                                                        <month type="12" draft="contributed">Esfand</month>
+                                                </monthWidth>
+                                        </monthContext>
+                                </months>
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">AP</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">AP</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">AP</era>
+                                        </eraNarrow>
+                                </eras>
+                        </calendar>
+                        <calendar type="roc">
+                                <eras>
+                                        <eraNames>
+                                                <era type="0" draft="contributed">pred RK</era>
+                                                <era type="1" draft="contributed">Minguo koledar</era>
+                                        </eraNames>
+                                        <eraAbbr>
+                                                <era type="0" draft="contributed">pred RK</era>
+                                                <era type="1" draft="contributed">Minguo koledar</era>
+                                        </eraAbbr>
+                                        <eraNarrow>
+                                                <era type="0" draft="contributed">pred RK</era>
+                                                <era type="1" draft="contributed">Minguo koledar</era>
+                                        </eraNarrow>
+                                </eras>
+                        </calendar>
                 </calendars>
                 <fields>
                         <field type="era">
                                 <displayName>doba</displayName>
                         </field>
+                        <field type="era-short">
+                                <displayName>doba</displayName>
+                        </field>
+                        <field type="era-narrow">
+                                <displayName>doba</displayName>
+                        </field>
                         <field type="year">
                                 <displayName>leto</displayName>
                                 <relative type="-1">lani</relative>
                                 <relative type="0">letos</relative>
                                 <relative type="1">naslednje leto</relative>

@@ -1936,11 +2734,11 @@
                         <field type="month-short">
                                 <displayName>mes.</displayName>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">čez {0} mes.</relativeTimePattern>
                                         <relativeTimePattern count="two">čez {0} mes.</relativeTimePattern>
-                                        <relativeTimePattern count="few">čez {0} mesece</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} mes.</relativeTimePattern>
                                         <relativeTimePattern count="other">čez {0} mes.</relativeTimePattern>
                                 </relativeTime>
                                 <relativeTime type="past">
                                         <relativeTimePattern count="one">pred {0} mes.</relativeTimePattern>
                                         <relativeTimePattern count="two">pred {0} mes.</relativeTimePattern>

@@ -1978,10 +2776,11 @@
                                         <relativeTimePattern count="one">pred {0} tednom</relativeTimePattern>
                                         <relativeTimePattern count="two">pred {0} tednoma</relativeTimePattern>
                                         <relativeTimePattern count="few">pred {0} tedni</relativeTimePattern>
                                         <relativeTimePattern count="other">pred {0} tedni</relativeTimePattern>
                                 </relativeTime>
+                                <relativePeriod>v tednu {0}</relativePeriod>
                         </field>
                         <field type="week-short">
                                 <displayName>ted.</displayName>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">čez {0} ted.</relativeTimePattern>

@@ -1993,10 +2792,11 @@
                                         <relativeTimePattern count="one">pred {0} ted.</relativeTimePattern>
                                         <relativeTimePattern count="two">pred {0} ted.</relativeTimePattern>
                                         <relativeTimePattern count="few">pred {0} ted.</relativeTimePattern>
                                         <relativeTimePattern count="other">pred {0} ted.</relativeTimePattern>
                                 </relativeTime>
+                                <relativePeriod>v tednu {0}</relativePeriod>
                         </field>
                         <field type="week-narrow">
                                 <displayName>ted.</displayName>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">čez {0} ted.</relativeTimePattern>

@@ -2008,13 +2808,23 @@
                                         <relativeTimePattern count="one">pred {0} ted.</relativeTimePattern>
                                         <relativeTimePattern count="two">pred {0} ted.</relativeTimePattern>
                                         <relativeTimePattern count="few">pred {0} ted.</relativeTimePattern>
                                         <relativeTimePattern count="other">pred {0} ted.</relativeTimePattern>
                                 </relativeTime>
+                                <relativePeriod>v tednu {0}</relativePeriod>
+                        </field>
+                        <field type="weekOfMonth">
+                                <displayName>teden meseca</displayName>
+                        </field>
+                        <field type="weekOfMonth-short">
+                                <displayName>ted. v mes.</displayName>
+                        </field>
+                        <field type="weekOfMonth-narrow">
+                                <displayName>teden meseca</displayName>
                         </field>
                         <field type="day">
-                                <displayName>Dan</displayName>
+                                <displayName>dan</displayName>
                                 <relative type="-2">predvčerajšnjim</relative>
                                 <relative type="-1">včeraj</relative>
                                 <relative type="0">danes</relative>
                                 <relative type="1">jutri</relative>
                                 <relative type="2">pojutrišnjem</relative>

@@ -2059,123 +2869,406 @@
                                         <relativeTimePattern count="two">pred {0} dnevoma</relativeTimePattern>
                                         <relativeTimePattern count="few">pred {0} dnevi</relativeTimePattern>
                                         <relativeTimePattern count="other">pred {0} dnevi</relativeTimePattern>
                                 </relativeTime>
                         </field>
+                        <field type="dayOfYear">
+                                <displayName>dan leta</displayName>
+                        </field>
+                        <field type="dayOfYear-short">
+                                <displayName>dan leta</displayName>
+                        </field>
+                        <field type="dayOfYear-narrow">
+                                <displayName>dan leta</displayName>
+                        </field>
                         <field type="weekday">
                                 <displayName>dan v tednu</displayName>
                         </field>
-                        <field type="sun">
+                        <field type="weekday-short">
+                                <displayName>dan v tednu</displayName>
+                        </field>
+                        <field type="weekday-narrow">
+                                <displayName>dan v tednu</displayName>
+                        </field>
+                        <field type="weekdayOfMonth">
+                                <displayName>dan meseca</displayName>
+                        </field>
+                        <field type="weekdayOfMonth-short">
+                                <displayName>dan meseca</displayName>
+                        </field>
+                        <field type="weekdayOfMonth-narrow">
+                                <displayName>dan v mes.</displayName>
+                        </field>
+                        <field type="sun">
                                 <relative type="-1">prejšnjo nedeljo</relative>
                                 <relative type="0">to nedeljo</relative>
                                 <relative type="1">naslednjo nedeljo</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} nedeljo</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} nedelji</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} nedelj</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} nedelj</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} nedeljo</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} nedeljama</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} nedeljami</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} nedeljami</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sun-short">
                                 <relative type="-1">prejšnjo ned.</relative>
                                 <relative type="0">to ned.</relative>
                                 <relative type="1">naslednjo ned.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} nedeljo</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} nedelji</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} nedelje</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} nedelj</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} nedeljo</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} nedeljama</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} nedeljami</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} nedeljami</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sun-narrow">
                                 <relative type="-1">prejš. ned.</relative>
                                 <relative type="0">to ned.</relative>
                                 <relative type="1">nasl. ned.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} ned.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} ned.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} ned.</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} ned.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} ned.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} ned.</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} ned.</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} ned.</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="mon">
                                 <relative type="-1">prejšnji ponedeljek</relative>
                                 <relative type="0">ta ponedeljek</relative>
                                 <relative type="1">naslednji ponedeljek</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} ponedeljek</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} ponedeljka</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} ponedeljke</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} ponedeljkov</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} ponedeljkom</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} ponedeljkoma</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} ponedeljki</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} ponedeljki</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="mon-short">
                                 <relative type="-1">prejšnji pon.</relative>
                                 <relative type="0">ta pon.</relative>
                                 <relative type="1">naslednji pon.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} pon.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} pon.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} pon.</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} pon.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} pon.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} pon.</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} pon.</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} pon.</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="mon-narrow">
                                 <relative type="-1">prejš. pon.</relative>
                                 <relative type="0">ta pon.</relative>
                                 <relative type="1">nasl. pon.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} ponedeljek</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} ponedeljka</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} ponedeljke</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} ponedeljkov</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} ponedeljkom</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} ponedeljkoma</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} ponedeljki</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} ponedeljki</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="tue">
                                 <relative type="-1">prejšnji torek</relative>
                                 <relative type="0">ta torek</relative>
                                 <relative type="1">naslednji torek</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} torek</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} torka</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} torke</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} torkov</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} torkom</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} torkoma</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} torki</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} torki</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="tue-short">
                                 <relative type="-1">prejšnji tor.</relative>
                                 <relative type="0">ta tor.</relative>
                                 <relative type="1">naslednji tor.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} tor.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} tor.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} tor.</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} tor.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} tor.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} tor.</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} tor.</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} tor.</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="tue-narrow">
                                 <relative type="-1">prejš. tor.</relative>
                                 <relative type="0">ta tor.</relative>
                                 <relative type="1">nasl. tor.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} torek</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} torka</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} torke</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} torkov</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} torkom</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} torkoma</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} torki</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} torki</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="wed">
                                 <relative type="-1">prejšnjo sredo</relative>
                                 <relative type="0">to sredo</relative>
                                 <relative type="1">naslednjo sredo</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} sredo</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} sredi</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} srede</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} sred</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} sredo</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} sredama</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} sredami</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} sredami</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="wed-short">
                                 <relative type="-1">prejšnjo sre.</relative>
                                 <relative type="0">to sre.</relative>
                                 <relative type="1">naslednjo sre.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} sre.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} sre.</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="wed-narrow">
                                 <relative type="-1">prejš. sre.</relative>
                                 <relative type="0">to sre.</relative>
                                 <relative type="1">nasl. sre.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} sre.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} sre.</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} sre.</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="thu">
                                 <relative type="-1">prejšnji četrtek</relative>
                                 <relative type="0">ta četrtek</relative>
                                 <relative type="1">naslednji četrtek</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} četrtek</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} četrtka</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} četrtke</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} četrtkov</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} četrtkom</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} četrtkoma</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} četrtki</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} četrtki</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="thu-short">
                                 <relative type="-1">prejšnji čet.</relative>
                                 <relative type="0">ta čet.</relative>
                                 <relative type="1">naslednji čet.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} čet.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} čet.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} čet.</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} čet.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} čet.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} čet.</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} čet.</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} čet.</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="thu-narrow">
                                 <relative type="-1">prejš. čet.</relative>
                                 <relative type="0">ta čet.</relative>
                                 <relative type="1">nasl. čet.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} čet.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} čet.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} četrtke</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} čet.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} čet.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} četrtkoma</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} četrtki</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} četrtki</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="fri">
                                 <relative type="-1">prejšnji petek</relative>
                                 <relative type="0">ta petek</relative>
                                 <relative type="1">naslednji petek</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} petek</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} petka</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} petke</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} petkov</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} petkom</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} petkoma</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} petki</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} petki</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="fri-short">
                                 <relative type="-1">prejšnji pet.</relative>
                                 <relative type="0">ta pet.</relative>
                                 <relative type="1">naslednji pet.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} pet.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} pet.</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="fri-narrow">
                                 <relative type="-1">prejš. pet.</relative>
                                 <relative type="0">ta pet.</relative>
                                 <relative type="1">nasl. pet.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} pet.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} pet.</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} pet.</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sat">
                                 <relative type="-1">prejšnjo soboto</relative>
                                 <relative type="0">to soboto</relative>
                                 <relative type="1">naslednjo soboto</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} soboto</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} soboti</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} sobote</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} sobot</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} soboto</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} sobotama</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} sobotami</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} sobotami</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sat-short">
                                 <relative type="-1">prejšnjo sob.</relative>
                                 <relative type="0">to sob.</relative>
                                 <relative type="1">naslednjo sob.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} sob.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} sob.</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} sob.</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} sob.</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} sob.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} sob.</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} sob.</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} sob.</relativeTimePattern>
+                                </relativeTime>
                         </field>
                         <field type="sat-narrow">
                                 <relative type="-1">prejš. sob.</relative>
                                 <relative type="0">to sob.</relative>
                                 <relative type="1">nasl. sob.</relative>
+                                <relativeTime type="future">
+                                        <relativeTimePattern count="one">čez {0} sob.</relativeTimePattern>
+                                        <relativeTimePattern count="two">čez {0} soboti</relativeTimePattern>
+                                        <relativeTimePattern count="few">čez {0} sobote</relativeTimePattern>
+                                        <relativeTimePattern count="other">čez {0} sobot</relativeTimePattern>
+                                </relativeTime>
+                                <relativeTime type="past">
+                                        <relativeTimePattern count="one">pred {0} sob.</relativeTimePattern>
+                                        <relativeTimePattern count="two">pred {0} sobotama</relativeTimePattern>
+                                        <relativeTimePattern count="few">pred {0} sobotami</relativeTimePattern>
+                                        <relativeTimePattern count="other">pred {0} sobotami</relativeTimePattern>
+                                </relativeTime>
+                        </field>
+                        <field type="dayperiod-short">
+                                <displayName>dop/pop</displayName>
                         </field>
                         <field type="dayperiod">
-                                <displayName>Čas dneva</displayName>
+                                <displayName>dop/pop</displayName>
+                        </field>
+                        <field type="dayperiod-narrow">
+                                <displayName>dop/pop</displayName>
                         </field>
                         <field type="hour">
                                 <displayName>ura</displayName>
+                                <relative type="0">v tej uri</relative>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">čez {0} uro</relativeTimePattern>
                                         <relativeTimePattern count="two">čez {0} uri</relativeTimePattern>
                                         <relativeTimePattern count="few">čez {0} ure</relativeTimePattern>
                                         <relativeTimePattern count="other">čez {0} ur</relativeTimePattern>

@@ -2217,10 +3310,11 @@
                                         <relativeTimePattern count="other">pred {0} h</relativeTimePattern>
                                 </relativeTime>
                         </field>
                         <field type="minute">
                                 <displayName>minuta</displayName>
+                                <relative type="0">to minuto</relative>
                                 <relativeTime type="future">
                                         <relativeTimePattern count="one">čez {0} minuto</relativeTimePattern>
                                         <relativeTimePattern count="two">čez {0} minuti</relativeTimePattern>
                                         <relativeTimePattern count="few">čez {0} minute</relativeTimePattern>
                                         <relativeTimePattern count="other">čez {0} minut</relativeTimePattern>

@@ -2309,1116 +3403,1160 @@
                                 </relativeTime>
                         </field>
                         <field type="zone">
                                 <displayName>časovni pas</displayName>
                         </field>
+                        <field type="zone-short">
+                                <displayName>časovni pas</displayName>
+                        </field>
+                        <field type="zone-narrow">
+                                <displayName>časovni pas</displayName>
+                        </field>
                 </fields>
                 <timeZoneNames>
                         <hourFormat>+HH.mm;-HH.mm</hourFormat>
                         <gmtFormat>GMT{0}</gmtFormat>
-                        <gmtZeroFormat draft="contributed">GMT</gmtZeroFormat>
-                        <regionFormat draft="contributed">{0} čas</regionFormat>
+                        <gmtZeroFormat>GMT</gmtZeroFormat>
+                        <regionFormat>{0} čas</regionFormat>
                         <regionFormat type="daylight">{0} poletni čas</regionFormat>
                         <regionFormat type="standard">{0} standardni čas</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>Univerzalni koordinirani čas</standard>
+                                </long>
+                        </zone>
                         <zone type="Etc/Unknown">
                                 <exemplarCity>neznano mesto</exemplarCity>
                         </zone>
                         <zone type="Europe/Andorra">
-                                <exemplarCity draft="contributed">Andora</exemplarCity>
+                                <exemplarCity>Andora</exemplarCity>
                         </zone>
                         <zone type="Asia/Dubai">
-                                <exemplarCity draft="contributed">Dubaj</exemplarCity>
+                                <exemplarCity>Dubaj</exemplarCity>
                         </zone>
                         <zone type="Asia/Kabul">
-                                <exemplarCity draft="contributed">Kabul</exemplarCity>
+                                <exemplarCity>Kabul</exemplarCity>
                         </zone>
                         <zone type="America/Antigua">
-                                <exemplarCity draft="contributed">Antigua</exemplarCity>
+                                <exemplarCity>Antigua</exemplarCity>
                         </zone>
                         <zone type="America/Anguilla">
-                                <exemplarCity draft="contributed">Anguilla</exemplarCity>
+                                <exemplarCity>Angvila</exemplarCity>
                         </zone>
                         <zone type="Europe/Tirane">
-                                <exemplarCity draft="contributed">Tirana</exemplarCity>
+                                <exemplarCity>Tirana</exemplarCity>
                         </zone>
                         <zone type="Asia/Yerevan">
-                                <exemplarCity draft="contributed">Erevan</exemplarCity>
+                                <exemplarCity>Erevan</exemplarCity>
                         </zone>
                         <zone type="Africa/Luanda">
-                                <exemplarCity draft="contributed">Luanda</exemplarCity>
+                                <exemplarCity>Luanda</exemplarCity>
                         </zone>
                         <zone type="Antarctica/Rothera">
-                                <exemplarCity draft="contributed">Rothera</exemplarCity>
+                                <exemplarCity>Rothera</exemplarCity>
                         </zone>
                         <zone type="Antarctica/Palmer">
-                                <exemplarCity draft="contributed">Palmer</exemplarCity>
+                                <exemplarCity>Palmer</exemplarCity>
                         </zone>
                         <zone type="Antarctica/Troll">
-                                <exemplarCity draft="contributed">Troll</exemplarCity>
+                                <exemplarCity>Troll</exemplarCity>
                         </zone>
                         <zone type="Antarctica/Syowa">
-                                <exemplarCity draft="contributed">Syowa</exemplarCity>
+                                <exemplarCity>Syowa</exemplarCity>
                         </zone>
                         <zone type="Antarctica/Mawson">
-                                <exemplarCity draft="contributed">Mawson</exemplarCity>
+                                <exemplarCity>Mawson</exemplarCity>
                         </zone>
                         <zone type="Antarctica/Davis">
-                                <exemplarCity draft="contributed">Davis</exemplarCity>
+                                <exemplarCity>Davis</exemplarCity>
                         </zone>
                         <zone type="Antarctica/Vostok">
-                                <exemplarCity draft="contributed">Vostok</exemplarCity>
+                                <exemplarCity>Vostok</exemplarCity>
                         </zone>
                         <zone type="Antarctica/Casey">
-                                <exemplarCity draft="contributed">Casey</exemplarCity>
+                                <exemplarCity>Casey</exemplarCity>
                         </zone>
                         <zone type="Antarctica/DumontDUrville">
-                                <exemplarCity draft="contributed">Dumont d’Urville</exemplarCity>
+                                <exemplarCity>Dumont d’Urville</exemplarCity>
                         </zone>
                         <zone type="Antarctica/McMurdo">
-                                <exemplarCity draft="contributed">McMurdo</exemplarCity>
+                                <exemplarCity>McMurdo</exemplarCity>
                         </zone>
                         <zone type="America/Argentina/Rio_Gallegos">
-                                <exemplarCity draft="contributed">Rio Gallegos</exemplarCity>
+                                <exemplarCity>Rio Gallegos</exemplarCity>
                         </zone>
                         <zone type="America/Mendoza">
-                                <exemplarCity draft="contributed">Mendoza</exemplarCity>
+                                <exemplarCity>Mendoza</exemplarCity>
                         </zone>
                         <zone type="America/Argentina/San_Juan">
-                                <exemplarCity draft="contributed">San Juan</exemplarCity>
+                                <exemplarCity>San Juan</exemplarCity>
                         </zone>
                         <zone type="America/Argentina/Ushuaia">
-                                <exemplarCity draft="contributed">Ushuaia</exemplarCity>
+                                <exemplarCity>Ushuaia</exemplarCity>
                         </zone>
                         <zone type="America/Argentina/La_Rioja">
-                                <exemplarCity draft="contributed">La Rioja</exemplarCity>
+                                <exemplarCity>La Rioja</exemplarCity>
                         </zone>
                         <zone type="America/Argentina/San_Luis">
-                                <exemplarCity draft="contributed">San Luis</exemplarCity>
+                                <exemplarCity>San Luis</exemplarCity>
                         </zone>
                         <zone type="America/Catamarca">
-                                <exemplarCity draft="contributed">Catamarca</exemplarCity>
+                                <exemplarCity>Catamarca</exemplarCity>
                         </zone>
                         <zone type="America/Argentina/Salta">
-                                <exemplarCity draft="contributed">Salta</exemplarCity>
+                                <exemplarCity>Salta</exemplarCity>
                         </zone>
                         <zone type="America/Jujuy">
-                                <exemplarCity draft="contributed">Jujuy</exemplarCity>
+                                <exemplarCity>Jujuy</exemplarCity>
                         </zone>
                         <zone type="America/Argentina/Tucuman">
-                                <exemplarCity draft="contributed">Tucuman</exemplarCity>
+                                <exemplarCity>Tucuman</exemplarCity>
                         </zone>
                         <zone type="America/Cordoba">
-                                <exemplarCity>Kordova</exemplarCity>
+                                <exemplarCity>Cordoba</exemplarCity>
                         </zone>
                         <zone type="America/Buenos_Aires">
-                                <exemplarCity draft="contributed">Buenos Aires</exemplarCity>
+                                <exemplarCity>Buenos Aires</exemplarCity>
                         </zone>
                         <zone type="Pacific/Pago_Pago">
-                                <exemplarCity draft="contributed">Pago Pago</exemplarCity>
+                                <exemplarCity>Pago Pago</exemplarCity>
                         </zone>
                         <zone type="Europe/Vienna">
-                                <exemplarCity draft="contributed">Dunaj</exemplarCity>
+                                <exemplarCity>Dunaj</exemplarCity>
                         </zone>
                         <zone type="Australia/Perth">
-                                <exemplarCity draft="contributed">Perth</exemplarCity>
+                                <exemplarCity>Perth</exemplarCity>
                         </zone>
                         <zone type="Australia/Eucla">
-                                <exemplarCity draft="contributed">Eucla</exemplarCity>
+                                <exemplarCity>Eucla</exemplarCity>
                         </zone>
                         <zone type="Australia/Darwin">
-                                <exemplarCity draft="contributed">Darwin</exemplarCity>
+                                <exemplarCity>Darwin</exemplarCity>
                         </zone>
                         <zone type="Australia/Adelaide">
-                                <exemplarCity draft="contributed">Adelaide</exemplarCity>
+                                <exemplarCity>Adelaide</exemplarCity>
                         </zone>
                         <zone type="Australia/Broken_Hill">
-                                <exemplarCity draft="contributed">Broken Hill</exemplarCity>
+                                <exemplarCity>Broken Hill</exemplarCity>
                         </zone>
                         <zone type="Australia/Currie">
-                                <exemplarCity draft="contributed">Currie</exemplarCity>
+                                <exemplarCity>Currie</exemplarCity>
                         </zone>
                         <zone type="Australia/Melbourne">
-                                <exemplarCity draft="contributed">Melbourne</exemplarCity>
+                                <exemplarCity>Melbourne</exemplarCity>
                         </zone>
                         <zone type="Australia/Hobart">
-                                <exemplarCity draft="contributed">Hobart</exemplarCity>
+                                <exemplarCity>Hobart</exemplarCity>
                         </zone>
                         <zone type="Australia/Lindeman">
-                                <exemplarCity draft="contributed">Lindeman</exemplarCity>
+                                <exemplarCity>Lindeman</exemplarCity>
                         </zone>
                         <zone type="Australia/Sydney">
-                                <exemplarCity draft="contributed">Sydney</exemplarCity>
+                                <exemplarCity>Sydney</exemplarCity>
                         </zone>
                         <zone type="Australia/Brisbane">
-                                <exemplarCity draft="contributed">Brisbane</exemplarCity>
+                                <exemplarCity>Brisbane</exemplarCity>
                         </zone>
                         <zone type="Antarctica/Macquarie">
-                                <exemplarCity draft="contributed">Macquarie</exemplarCity>
+                                <exemplarCity>Macquarie</exemplarCity>
                         </zone>
                         <zone type="Australia/Lord_Howe">
-                                <exemplarCity draft="contributed">Lord Howe</exemplarCity>
+                                <exemplarCity>Lord Howe</exemplarCity>
                         </zone>
                         <zone type="America/Aruba">
-                                <exemplarCity draft="contributed">Aruba</exemplarCity>
+                                <exemplarCity>Aruba</exemplarCity>
                         </zone>
                         <zone type="Europe/Mariehamn">
-                                <exemplarCity draft="contributed">Mariehamn</exemplarCity>
+                                <exemplarCity>Mariehamn</exemplarCity>
                         </zone>
                         <zone type="Asia/Baku">
-                                <exemplarCity draft="contributed">Baku</exemplarCity>
+                                <exemplarCity>Baku</exemplarCity>
                         </zone>
                         <zone type="Europe/Sarajevo">
-                                <exemplarCity draft="contributed">Sarajevo</exemplarCity>
+                                <exemplarCity>Sarajevo</exemplarCity>
                         </zone>
                         <zone type="America/Barbados">
-                                <exemplarCity draft="contributed">Barbados</exemplarCity>
+                                <exemplarCity>Barbados</exemplarCity>
                         </zone>
                         <zone type="Asia/Dhaka">
-                                <exemplarCity draft="contributed">Daka</exemplarCity>
+                                <exemplarCity>Daka</exemplarCity>
                         </zone>
                         <zone type="Europe/Brussels">
-                                <exemplarCity draft="contributed">Bruselj</exemplarCity>
+                                <exemplarCity>Bruselj</exemplarCity>
                         </zone>
                         <zone type="Africa/Ouagadougou">
-                                <exemplarCity draft="contributed">Ouagadougou</exemplarCity>
+                                <exemplarCity>Ouagadougou</exemplarCity>
                         </zone>
                         <zone type="Europe/Sofia">
-                                <exemplarCity draft="contributed">Sofija</exemplarCity>
+                                <exemplarCity>Sofija</exemplarCity>
                         </zone>
                         <zone type="Asia/Bahrain">
-                                <exemplarCity draft="contributed">Bahrajn</exemplarCity>
+                                <exemplarCity>Bahrajn</exemplarCity>
                         </zone>
                         <zone type="Africa/Bujumbura">
-                                <exemplarCity draft="contributed">Bujumbura</exemplarCity>
+                                <exemplarCity>Bujumbura</exemplarCity>
                         </zone>
                         <zone type="Africa/Porto-Novo">
-                                <exemplarCity draft="contributed">Porto-Novo</exemplarCity>
+                                <exemplarCity>Porto-Novo</exemplarCity>
                         </zone>
                         <zone type="America/St_Barthelemy">
-                                <exemplarCity draft="contributed">Saint Barthélemy</exemplarCity>
+                                <exemplarCity>Saint Barthélemy</exemplarCity>
                         </zone>
                         <zone type="Atlantic/Bermuda">
-                                <exemplarCity draft="contributed">Bermudi</exemplarCity>
+                                <exemplarCity>Bermudi</exemplarCity>
                         </zone>
                         <zone type="Asia/Brunei">
-                                <exemplarCity draft="contributed">Brunej</exemplarCity>
+                                <exemplarCity>Brunej</exemplarCity>
                         </zone>
                         <zone type="America/La_Paz">
-                                <exemplarCity draft="contributed">La Paz</exemplarCity>
+                                <exemplarCity>La Paz</exemplarCity>
                         </zone>
                         <zone type="America/Kralendijk">
-                                <exemplarCity draft="contributed">Kralendijk</exemplarCity>
+                                <exemplarCity>Kralendijk</exemplarCity>
                         </zone>
                         <zone type="America/Eirunepe">
-                                <exemplarCity draft="contributed">Eirunepe</exemplarCity>
+                                <exemplarCity>Eirunepe</exemplarCity>
                         </zone>
                         <zone type="America/Rio_Branco">
-                                <exemplarCity draft="contributed">Rio Branco</exemplarCity>
+                                <exemplarCity>Rio Branco</exemplarCity>
                         </zone>
                         <zone type="America/Porto_Velho">
-                                <exemplarCity draft="contributed">Porto Velho</exemplarCity>
+                                <exemplarCity>Porto Velho</exemplarCity>
                         </zone>
                         <zone type="America/Boa_Vista">
-                                <exemplarCity draft="contributed">Boa Vista</exemplarCity>
+                                <exemplarCity>Boa Vista</exemplarCity>
                         </zone>
                         <zone type="America/Manaus">
-                                <exemplarCity draft="contributed">Manaus</exemplarCity>
+                                <exemplarCity>Manaus</exemplarCity>
                         </zone>
                         <zone type="America/Cuiaba">
-                                <exemplarCity draft="contributed">Cuiaba</exemplarCity>
+                                <exemplarCity>Cuiaba</exemplarCity>
                         </zone>
                         <zone type="America/Santarem">
-                                <exemplarCity draft="contributed">Santarem</exemplarCity>
+                                <exemplarCity>Santarem</exemplarCity>
                         </zone>
                         <zone type="America/Campo_Grande">
-                                <exemplarCity draft="contributed">Campo Grande</exemplarCity>
+                                <exemplarCity>Campo Grande</exemplarCity>
                         </zone>
                         <zone type="America/Belem">
-                                <exemplarCity draft="contributed">Belem</exemplarCity>
+                                <exemplarCity>Belem</exemplarCity>
                         </zone>
                         <zone type="America/Araguaina">
-                                <exemplarCity draft="contributed">Araguaina</exemplarCity>
+                                <exemplarCity>Araguaina</exemplarCity>
                         </zone>
                         <zone type="America/Sao_Paulo">
-                                <exemplarCity draft="contributed">Sao Paulo</exemplarCity>
+                                <exemplarCity>Sao Paulo</exemplarCity>
                         </zone>
                         <zone type="America/Bahia">
-                                <exemplarCity draft="contributed">Bahia</exemplarCity>
+                                <exemplarCity>Bahia</exemplarCity>
                         </zone>
                         <zone type="America/Fortaleza">
-                                <exemplarCity draft="contributed">Fortaleza</exemplarCity>
+                                <exemplarCity>Fortaleza</exemplarCity>
                         </zone>
                         <zone type="America/Maceio">
-                                <exemplarCity draft="contributed">Maceio</exemplarCity>
+                                <exemplarCity>Maceio</exemplarCity>
                         </zone>
                         <zone type="America/Recife">
-                                <exemplarCity draft="contributed">Recife</exemplarCity>
+                                <exemplarCity>Recife</exemplarCity>
                         </zone>
                         <zone type="America/Noronha">
-                                <exemplarCity draft="contributed">Noronha</exemplarCity>
+                                <exemplarCity>Noronha</exemplarCity>
                         </zone>
                         <zone type="America/Nassau">
-                                <exemplarCity draft="contributed">Nassau</exemplarCity>
+                                <exemplarCity>Nassau</exemplarCity>
                         </zone>
                         <zone type="Asia/Thimphu">
-                                <exemplarCity draft="contributed">Thimphu</exemplarCity>
+                                <exemplarCity>Timpu</exemplarCity>
                         </zone>
                         <zone type="Africa/Gaborone">
-                                <exemplarCity draft="contributed">Gaborone</exemplarCity>
+                                <exemplarCity>Gaborone</exemplarCity>
                         </zone>
                         <zone type="Europe/Minsk">
-                                <exemplarCity draft="contributed">Minsk</exemplarCity>
+                                <exemplarCity>Minsk</exemplarCity>
                         </zone>
                         <zone type="America/Belize">
-                                <exemplarCity draft="contributed">Belize</exemplarCity>
+                                <exemplarCity>Belize</exemplarCity>
                         </zone>
                         <zone type="America/Dawson">
-                                <exemplarCity draft="contributed">Dawson</exemplarCity>
+                                <exemplarCity>Dawson</exemplarCity>
                         </zone>
                         <zone type="America/Whitehorse">
-                                <exemplarCity draft="contributed">Whitehorse</exemplarCity>
+                                <exemplarCity>Whitehorse</exemplarCity>
                         </zone>
                         <zone type="America/Inuvik">
-                                <exemplarCity draft="contributed">Inuvik</exemplarCity>
+                                <exemplarCity>Inuvik</exemplarCity>
                         </zone>
                         <zone type="America/Vancouver">
-                                <exemplarCity draft="contributed">Vancouver</exemplarCity>
+                                <exemplarCity>Vancouver</exemplarCity>
+                        </zone>
+                        <zone type="America/Fort_Nelson">
+                                <exemplarCity>Fort Nelson</exemplarCity>
                         </zone>
                         <zone type="America/Dawson_Creek">
-                                <exemplarCity draft="contributed">Dawson Creek</exemplarCity>
+                                <exemplarCity>Dawson Creek</exemplarCity>
                         </zone>
                         <zone type="America/Creston">
-                                <exemplarCity draft="contributed">Creston</exemplarCity>
+                                <exemplarCity>Creston</exemplarCity>
                         </zone>
                         <zone type="America/Yellowknife">
-                                <exemplarCity draft="contributed">Yellowknife</exemplarCity>
+                                <exemplarCity>Yellowknife</exemplarCity>
                         </zone>
                         <zone type="America/Edmonton">
-                                <exemplarCity draft="contributed">Edmonton</exemplarCity>
+                                <exemplarCity>Edmonton</exemplarCity>
                         </zone>
                         <zone type="America/Swift_Current">
-                                <exemplarCity draft="contributed">Swift Current</exemplarCity>
+                                <exemplarCity>Swift Current</exemplarCity>
                         </zone>
                         <zone type="America/Cambridge_Bay">
-                                <exemplarCity draft="contributed">Cambridge Bay</exemplarCity>
+                                <exemplarCity>Cambridge Bay</exemplarCity>
                         </zone>
                         <zone type="America/Regina">
-                                <exemplarCity draft="contributed">Regina</exemplarCity>
+                                <exemplarCity>Regina</exemplarCity>
                         </zone>
                         <zone type="America/Winnipeg">
-                                <exemplarCity draft="contributed">Winnipeg</exemplarCity>
+                                <exemplarCity>Winnipeg</exemplarCity>
                         </zone>
                         <zone type="America/Resolute">
-                                <exemplarCity draft="contributed">Resolute</exemplarCity>
+                                <exemplarCity>Resolute</exemplarCity>
                         </zone>
                         <zone type="America/Rainy_River">
-                                <exemplarCity draft="contributed">Rainy River</exemplarCity>
+                                <exemplarCity>Rainy River</exemplarCity>
                         </zone>
                         <zone type="America/Rankin_Inlet">
-                                <exemplarCity draft="contributed">Rankin Inlet</exemplarCity>
+                                <exemplarCity>Rankin Inlet</exemplarCity>
                         </zone>
                         <zone type="America/Coral_Harbour">
-                                <exemplarCity draft="contributed">Atikokan</exemplarCity>
+                                <exemplarCity>Atikokan</exemplarCity>
                         </zone>
                         <zone type="America/Thunder_Bay">
-                                <exemplarCity draft="contributed">Thunder Bay</exemplarCity>
+                                <exemplarCity>Thunder Bay</exemplarCity>
                         </zone>
                         <zone type="America/Nipigon">
-                                <exemplarCity draft="contributed">Nipigon</exemplarCity>
+                                <exemplarCity>Nipigon</exemplarCity>
                         </zone>
                         <zone type="America/Toronto">
-                                <exemplarCity draft="contributed">Toronto</exemplarCity>
+                                <exemplarCity>Toronto</exemplarCity>
                         </zone>
                         <zone type="America/Iqaluit">
-                                <exemplarCity draft="contributed">Iqaluit</exemplarCity>
+                                <exemplarCity>Iqaluit</exemplarCity>
                         </zone>
                         <zone type="America/Pangnirtung">
-                                <exemplarCity draft="contributed">Pangnirtung</exemplarCity>
+                                <exemplarCity>Pangnirtung</exemplarCity>
                         </zone>
                         <zone type="America/Moncton">
-                                <exemplarCity draft="contributed">Moncton</exemplarCity>
+                                <exemplarCity>Moncton</exemplarCity>
                         </zone>
                         <zone type="America/Halifax">
-                                <exemplarCity draft="contributed">Halifax</exemplarCity>
+                                <exemplarCity>Halifax</exemplarCity>
                         </zone>
                         <zone type="America/Goose_Bay">
-                                <exemplarCity draft="contributed">Goose Bay</exemplarCity>
+                                <exemplarCity>Goose Bay</exemplarCity>
                         </zone>
                         <zone type="America/Glace_Bay">
-                                <exemplarCity draft="contributed">Glace Bay</exemplarCity>
+                                <exemplarCity>Glace Bay</exemplarCity>
                         </zone>
                         <zone type="America/Blanc-Sablon">
-                                <exemplarCity draft="contributed">Blanc-Sablon</exemplarCity>
+                                <exemplarCity>Blanc-Sablon</exemplarCity>
                         </zone>
                         <zone type="America/St_Johns">
-                                <exemplarCity draft="contributed">St. John’s</exemplarCity>
+                                <exemplarCity>St. John’s</exemplarCity>
                         </zone>
                         <zone type="Indian/Cocos">
-                                <exemplarCity draft="contributed">Kokosovi otoki</exemplarCity>
+                                <exemplarCity>Kokosovi otoki</exemplarCity>
                         </zone>
                         <zone type="Africa/Kinshasa">
                                 <exemplarCity>Kinšasa</exemplarCity>
                         </zone>
                         <zone type="Africa/Lubumbashi">
                                 <exemplarCity>Lubumbaši</exemplarCity>
                         </zone>
                         <zone type="Africa/Bangui">
-                                <exemplarCity draft="contributed">Bangui</exemplarCity>
+                                <exemplarCity>Bangui</exemplarCity>
                         </zone>
                         <zone type="Africa/Brazzaville">
-                                <exemplarCity draft="contributed">Brazzaville</exemplarCity>
+                                <exemplarCity>Brazzaville</exemplarCity>
                         </zone>
                         <zone type="Europe/Zurich">
-                                <exemplarCity draft="contributed">Zürich</exemplarCity>
+                                <exemplarCity>Zürich</exemplarCity>
                         </zone>
                         <zone type="Africa/Abidjan">
-                                <exemplarCity draft="contributed">Abidžan</exemplarCity>
+                                <exemplarCity>Abidžan</exemplarCity>
                         </zone>
                         <zone type="Pacific/Rarotonga">
-                                <exemplarCity draft="contributed">Rarotonga</exemplarCity>
+                                <exemplarCity>Rarotonga</exemplarCity>
                         </zone>
                         <zone type="Pacific/Easter">
                                 <exemplarCity>Velikonočni otok</exemplarCity>
                         </zone>
+                        <zone type="America/Punta_Arenas">
+                                <exemplarCity>Punta Arenas</exemplarCity>
+                        </zone>
                         <zone type="America/Santiago">
-                                <exemplarCity draft="contributed">Santiago</exemplarCity>
+                                <exemplarCity>Santiago</exemplarCity>
                         </zone>
                         <zone type="Africa/Douala">
-                                <exemplarCity draft="contributed">Douala</exemplarCity>
+                                <exemplarCity>Douala</exemplarCity>
                         </zone>
                         <zone type="Asia/Urumqi">
-                                <exemplarCity draft="contributed">Urumči</exemplarCity>
+                                <exemplarCity>Urumči</exemplarCity>
                         </zone>
                         <zone type="Asia/Shanghai">
-                                <exemplarCity>Šangaj</exemplarCity>
+                                <exemplarCity>Šanghaj</exemplarCity>
                         </zone>
                         <zone type="America/Bogota">
-                                <exemplarCity draft="contributed">Bogota</exemplarCity>
+                                <exemplarCity>Bogota</exemplarCity>
                         </zone>
                         <zone type="America/Costa_Rica">
-                                <exemplarCity draft="contributed">Kostarika</exemplarCity>
+                                <exemplarCity>Kostarika</exemplarCity>
                         </zone>
                         <zone type="America/Havana">
-                                <exemplarCity draft="contributed">Havana</exemplarCity>
+                                <exemplarCity>Havana</exemplarCity>
                         </zone>
                         <zone type="Atlantic/Cape_Verde">
-                                <exemplarCity draft="contributed">Zelenortski otoki</exemplarCity>
+                                <exemplarCity>Zelenortski otoki</exemplarCity>
                         </zone>
                         <zone type="America/Curacao">
-                                <exemplarCity draft="contributed">Curaçao</exemplarCity>
+                                <exemplarCity>Curaçao</exemplarCity>
                         </zone>
                         <zone type="Indian/Christmas">
-                                <exemplarCity draft="contributed">Božični otok</exemplarCity>
+                                <exemplarCity>Božični otok</exemplarCity>
                         </zone>
                         <zone type="Asia/Nicosia">
-                                <exemplarCity draft="contributed">Nikozija</exemplarCity>
+                                <exemplarCity>Nikozija</exemplarCity>
+                        </zone>
+                        <zone type="Asia/Famagusta">
+                                <exemplarCity>Famagusta</exemplarCity>
                         </zone>
                         <zone type="Europe/Prague">
-                                <exemplarCity draft="contributed">Praga</exemplarCity>
+                                <exemplarCity>Praga</exemplarCity>
                         </zone>
                         <zone type="Europe/Busingen">
-                                <exemplarCity draft="contributed">Busingen</exemplarCity>
+                                <exemplarCity>Busingen</exemplarCity>
                         </zone>
                         <zone type="Europe/Berlin">
-                                <exemplarCity draft="contributed">Berlin</exemplarCity>
+                                <exemplarCity>Berlin</exemplarCity>
                         </zone>
                         <zone type="Africa/Djibouti">
-                                <exemplarCity draft="contributed">Džibuti</exemplarCity>
+                                <exemplarCity>Džibuti</exemplarCity>
                         </zone>
                         <zone type="Europe/Copenhagen">
-                                <exemplarCity draft="contributed">Köbenhavn</exemplarCity>
+                                <exemplarCity>Köbenhavn</exemplarCity>
                         </zone>
                         <zone type="America/Dominica">
-                                <exemplarCity draft="contributed">Dominika</exemplarCity>
+                                <exemplarCity>Dominika</exemplarCity>
                         </zone>
                         <zone type="America/Santo_Domingo">
-                                <exemplarCity draft="contributed">Santo Domingo</exemplarCity>
+                                <exemplarCity>Santo Domingo</exemplarCity>
                         </zone>
                         <zone type="Africa/Algiers">
-                                <exemplarCity draft="contributed">Alžir</exemplarCity>
+                                <exemplarCity>Alžir</exemplarCity>
                         </zone>
                         <zone type="Pacific/Galapagos">
-                                <exemplarCity draft="contributed">Galapagos</exemplarCity>
+                                <exemplarCity>Galapagos</exemplarCity>
                         </zone>
                         <zone type="America/Guayaquil">
-                                <exemplarCity draft="contributed">Guayaquil</exemplarCity>
+                                <exemplarCity>Guayaquil</exemplarCity>
                         </zone>
                         <zone type="Europe/Tallinn">
-                                <exemplarCity draft="contributed">Talin</exemplarCity>
+                                <exemplarCity>Talin</exemplarCity>
                         </zone>
                         <zone type="Africa/Cairo">
-                                <exemplarCity draft="contributed">Kairo</exemplarCity>
+                                <exemplarCity>Kairo</exemplarCity>
                         </zone>
                         <zone type="Africa/El_Aaiun">
-                                <exemplarCity draft="contributed">El Aaiun</exemplarCity>
+                                <exemplarCity>El Aaiun</exemplarCity>
                         </zone>
                         <zone type="Africa/Asmera">
-                                <exemplarCity draft="contributed">Asmara</exemplarCity>
+                                <exemplarCity>Asmara</exemplarCity>
                         </zone>
                         <zone type="Atlantic/Canary">
                                 <exemplarCity>Kanarski otoki</exemplarCity>
                         </zone>
                         <zone type="Africa/Ceuta">
-                                <exemplarCity draft="contributed">Ceuta</exemplarCity>
+                                <exemplarCity>Ceuta</exemplarCity>
                         </zone>
                         <zone type="Europe/Madrid">
-                                <exemplarCity draft="contributed">Madrid</exemplarCity>
+                                <exemplarCity>Madrid</exemplarCity>
                         </zone>
                         <zone type="Africa/Addis_Ababa">
-                                <exemplarCity draft="contributed">Adis Abeba</exemplarCity>
+                                <exemplarCity>Adis Abeba</exemplarCity>
                         </zone>
                         <zone type="Europe/Helsinki">
-                                <exemplarCity draft="contributed">Helsinki</exemplarCity>
+                                <exemplarCity>Helsinki</exemplarCity>
                         </zone>
                         <zone type="Pacific/Fiji">
-                                <exemplarCity draft="contributed">Fidži</exemplarCity>
+                                <exemplarCity>Fidži</exemplarCity>
                         </zone>
                         <zone type="Atlantic/Stanley">
-                                <exemplarCity draft="contributed">Stanley</exemplarCity>
+                                <exemplarCity>Stanley</exemplarCity>
                         </zone>
                         <zone type="Pacific/Truk">
-                                <exemplarCity draft="contributed">Chuuk</exemplarCity>
+                                <exemplarCity>Chuuk</exemplarCity>
                         </zone>
                         <zone type="Pacific/Ponape">
-                                <exemplarCity draft="contributed">Pohnpei</exemplarCity>
+                                <exemplarCity>Pohnpei</exemplarCity>
                         </zone>
                         <zone type="Pacific/Kosrae">
-                                <exemplarCity draft="contributed">Kosrae</exemplarCity>
+                                <exemplarCity>Kosrae</exemplarCity>
                         </zone>
                         <zone type="Atlantic/Faeroe">
-                                <exemplarCity draft="contributed">Faroe</exemplarCity>
+                                <exemplarCity>Faroe</exemplarCity>
                         </zone>
                         <zone type="Europe/Paris">
-                                <exemplarCity draft="contributed">Pariz</exemplarCity>
+                                <exemplarCity>Pariz</exemplarCity>
                         </zone>
                         <zone type="Africa/Libreville">
-                                <exemplarCity draft="contributed">Libreville</exemplarCity>
+                                <exemplarCity>Libreville</exemplarCity>
                         </zone>
                         <zone type="Europe/London">
                                 <long>
-                                        <daylight draft="contributed">britanski poletni čas</daylight>
+                                        <daylight>britanski poletni čas</daylight>
                                 </long>
-                                <exemplarCity draft="contributed">London</exemplarCity>
+                                <exemplarCity>London</exemplarCity>
                         </zone>
                         <zone type="America/Grenada">
-                                <exemplarCity draft="contributed">Grenada</exemplarCity>
+                                <exemplarCity>Grenada</exemplarCity>
                         </zone>
                         <zone type="Asia/Tbilisi">
-                                <exemplarCity draft="contributed">Tbilisi</exemplarCity>
+                                <exemplarCity>Tbilisi</exemplarCity>
                         </zone>
                         <zone type="America/Cayenne">
-                                <exemplarCity draft="contributed">Cayenne</exemplarCity>
+                                <exemplarCity>Cayenne</exemplarCity>
                         </zone>
                         <zone type="Europe/Guernsey">
-                                <exemplarCity draft="contributed">Guernsey</exemplarCity>
+                                <exemplarCity>Guernsey</exemplarCity>
                         </zone>
                         <zone type="Africa/Accra">
-                                <exemplarCity draft="contributed">Akra</exemplarCity>
+                                <exemplarCity>Akra</exemplarCity>
                         </zone>
                         <zone type="Europe/Gibraltar">
-                                <exemplarCity draft="contributed">Gibraltar</exemplarCity>
+                                <exemplarCity>Gibraltar</exemplarCity>
                         </zone>
                         <zone type="America/Thule">
-                                <exemplarCity draft="contributed">Thule</exemplarCity>
+                                <exemplarCity>Thule</exemplarCity>
                         </zone>
                         <zone type="America/Godthab">
-                                <exemplarCity draft="contributed">Nuuk</exemplarCity>
+                                <exemplarCity>Nuuk</exemplarCity>
                         </zone>
                         <zone type="America/Scoresbysund">
-                                <exemplarCity draft="contributed">Ittoqqortoormiit</exemplarCity>
+                                <exemplarCity>Ittoqqortoormiit</exemplarCity>
                         </zone>
                         <zone type="America/Danmarkshavn">
-                                <exemplarCity draft="contributed">Danmarkshavn</exemplarCity>
+                                <exemplarCity>Danmarkshavn</exemplarCity>
                         </zone>
                         <zone type="Africa/Banjul">
-                                <exemplarCity draft="contributed">Banjul</exemplarCity>
+                                <exemplarCity>Banjul</exemplarCity>
                         </zone>
                         <zone type="Africa/Conakry">
-                                <exemplarCity draft="contributed">Conakry</exemplarCity>
+                                <exemplarCity>Conakry</exemplarCity>
                         </zone>
                         <zone type="America/Guadeloupe">
-                                <exemplarCity draft="contributed">Gvadelup</exemplarCity>
+                                <exemplarCity>Guadeloupe</exemplarCity>
                         </zone>
                         <zone type="Africa/Malabo">
-                                <exemplarCity draft="contributed">Malabo</exemplarCity>
+                                <exemplarCity>Malabo</exemplarCity>
                         </zone>
                         <zone type="Europe/Athens">
-                                <exemplarCity draft="contributed">Atene</exemplarCity>
+                                <exemplarCity>Atene</exemplarCity>
                         </zone>
                         <zone type="Atlantic/South_Georgia">
-                                <exemplarCity draft="contributed">Južna Georgia</exemplarCity>
+                                <exemplarCity>Južna Georgia</exemplarCity>
                         </zone>
                         <zone type="America/Guatemala">
-                                <exemplarCity draft="contributed">Gvatemala</exemplarCity>
+                                <exemplarCity>Gvatemala</exemplarCity>
                         </zone>
                         <zone type="Pacific/Guam">
-                                <exemplarCity draft="contributed">Guam</exemplarCity>
+                                <exemplarCity>Guam</exemplarCity>
                         </zone>
                         <zone type="Africa/Bissau">
-                                <exemplarCity draft="contributed">Bissau</exemplarCity>
+                                <exemplarCity>Bissau</exemplarCity>
                         </zone>
                         <zone type="America/Guyana">
-                                <exemplarCity draft="contributed">Gvajana</exemplarCity>
+                                <exemplarCity>Gvajana</exemplarCity>
                         </zone>
                         <zone type="Asia/Hong_Kong">
-                                <exemplarCity draft="contributed">Hongkong</exemplarCity>
+                                <exemplarCity>Hongkong</exemplarCity>
                         </zone>
                         <zone type="America/Tegucigalpa">
-                                <exemplarCity draft="contributed">Tegucigalpa</exemplarCity>
+                                <exemplarCity>Tegucigalpa</exemplarCity>
                         </zone>
                         <zone type="Europe/Zagreb">
-                                <exemplarCity draft="contributed">Zagreb</exemplarCity>
+                                <exemplarCity>Zagreb</exemplarCity>
                         </zone>
                         <zone type="America/Port-au-Prince">
-                                <exemplarCity draft="contributed">Port-au-Prince</exemplarCity>
+                                <exemplarCity>Port-au-Prince</exemplarCity>
                         </zone>
                         <zone type="Europe/Budapest">
-                                <exemplarCity draft="contributed">Budimpešta</exemplarCity>
+                                <exemplarCity>Budimpešta</exemplarCity>
                         </zone>
                         <zone type="Asia/Jakarta">
                                 <exemplarCity>Džakarta</exemplarCity>
                         </zone>
                         <zone type="Asia/Pontianak">
-                                <exemplarCity draft="contributed">Pontianak</exemplarCity>
+                                <exemplarCity>Pontianak</exemplarCity>
                         </zone>
                         <zone type="Asia/Makassar">
                                 <exemplarCity>Makasar</exemplarCity>
                         </zone>
                         <zone type="Asia/Jayapura">
-                                <exemplarCity draft="contributed">Jayapura</exemplarCity>
+                                <exemplarCity>Jayapura</exemplarCity>
                         </zone>
                         <zone type="Europe/Dublin">
                                 <long>
                                         <daylight>irski standardni čas</daylight>
                                 </long>
-                                <exemplarCity draft="contributed">Dublin</exemplarCity>
+                                <exemplarCity>Dublin</exemplarCity>
                         </zone>
                         <zone type="Asia/Jerusalem">
-                                <exemplarCity draft="contributed">Jeruzalem</exemplarCity>
+                                <exemplarCity>Jeruzalem</exemplarCity>
                         </zone>
                         <zone type="Europe/Isle_of_Man">
-                                <exemplarCity draft="contributed">Otok Man</exemplarCity>
+                                <exemplarCity>Otok Man</exemplarCity>
                         </zone>
                         <zone type="Asia/Calcutta">
-                                <exemplarCity draft="contributed">Kolkata</exemplarCity>
+                                <exemplarCity>Kolkata</exemplarCity>
                         </zone>
                         <zone type="Indian/Chagos">
-                                <exemplarCity draft="contributed">Chagos</exemplarCity>
+                                <exemplarCity>Chagos</exemplarCity>
                         </zone>
                         <zone type="Asia/Baghdad">
-                                <exemplarCity draft="contributed">Bagdad</exemplarCity>
+                                <exemplarCity>Bagdad</exemplarCity>
                         </zone>
                         <zone type="Asia/Tehran">
-                                <exemplarCity draft="contributed">Teheran</exemplarCity>
+                                <exemplarCity>Teheran</exemplarCity>
                         </zone>
                         <zone type="Atlantic/Reykjavik">
-                                <exemplarCity draft="contributed">Reykjavik</exemplarCity>
+                                <exemplarCity>Reykjavik</exemplarCity>
                         </zone>
                         <zone type="Europe/Rome">
-                                <exemplarCity draft="contributed">Rim</exemplarCity>
+                                <exemplarCity>Rim</exemplarCity>
                         </zone>
                         <zone type="Europe/Jersey">
-                                <exemplarCity draft="contributed">Jersey</exemplarCity>
+                                <exemplarCity>Jersey</exemplarCity>
                         </zone>
                         <zone type="America/Jamaica">
-                                <exemplarCity draft="contributed">Jamajka</exemplarCity>
+                                <exemplarCity>Jamajka</exemplarCity>
                         </zone>
                         <zone type="Asia/Amman">
-                                <exemplarCity draft="contributed">Aman</exemplarCity>
+                                <exemplarCity>Aman</exemplarCity>
                         </zone>
                         <zone type="Asia/Tokyo">
-                                <exemplarCity draft="contributed">Tokio</exemplarCity>
+                                <exemplarCity>Tokio</exemplarCity>
                         </zone>
                         <zone type="Africa/Nairobi">
-                                <exemplarCity draft="contributed">Nairobi</exemplarCity>
+                                <exemplarCity>Nairobi</exemplarCity>
                         </zone>
                         <zone type="Asia/Bishkek">
-                                <exemplarCity draft="contributed">Biškek</exemplarCity>
+                                <exemplarCity>Biškek</exemplarCity>
                         </zone>
                         <zone type="Asia/Phnom_Penh">
-                                <exemplarCity draft="contributed">Phnom Penh</exemplarCity>
+                                <exemplarCity>Phnom Penh</exemplarCity>
                         </zone>
                         <zone type="Pacific/Enderbury">
-                                <exemplarCity draft="contributed">Enderbury</exemplarCity>
+                                <exemplarCity>Enderbury</exemplarCity>
                         </zone>
                         <zone type="Pacific/Kiritimati">
-                                <exemplarCity draft="contributed">Kiritimati</exemplarCity>
+                                <exemplarCity>Kiritimati</exemplarCity>
                         </zone>
                         <zone type="Pacific/Tarawa">
-                                <exemplarCity draft="contributed">Tarawa</exemplarCity>
+                                <exemplarCity>Tarawa</exemplarCity>
                         </zone>
                         <zone type="Indian/Comoro">
-                                <exemplarCity draft="contributed">Komori</exemplarCity>
+                                <exemplarCity>Komori</exemplarCity>
                         </zone>
                         <zone type="America/St_Kitts">
-                                <exemplarCity draft="contributed">St. Kitts</exemplarCity>
+                                <exemplarCity>St. Kitts</exemplarCity>
                         </zone>
                         <zone type="Asia/Pyongyang">
-                                <exemplarCity draft="contributed">Pjongjang</exemplarCity>
+                                <exemplarCity>Pjongjang</exemplarCity>
                         </zone>
                         <zone type="Asia/Seoul">
-                                <exemplarCity draft="contributed">Seul</exemplarCity>
+                                <exemplarCity>Seul</exemplarCity>
                         </zone>
                         <zone type="Asia/Kuwait">
-                                <exemplarCity draft="contributed">Kuvajt</exemplarCity>
+                                <exemplarCity>Kuvajt</exemplarCity>
                         </zone>
                         <zone type="America/Cayman">
-                                <exemplarCity draft="contributed">Kajman</exemplarCity>
+                                <exemplarCity>Kajman</exemplarCity>
                         </zone>
                         <zone type="Asia/Aqtau">
                                 <exemplarCity>Aktau</exemplarCity>
                         </zone>
                         <zone type="Asia/Oral">
                                 <exemplarCity>Uralsk</exemplarCity>
                         </zone>
+                        <zone type="Asia/Atyrau">
+                                <exemplarCity draft="contributed">Atyrau</exemplarCity>
+                        </zone>
                         <zone type="Asia/Aqtobe">
                                 <exemplarCity>Aktobe</exemplarCity>
                         </zone>
                         <zone type="Asia/Qyzylorda">
-                                <exemplarCity draft="contributed">Kizlorda</exemplarCity>
+                                <exemplarCity>Kizlorda</exemplarCity>
                         </zone>
                         <zone type="Asia/Almaty">
                                 <exemplarCity>Almati</exemplarCity>
                         </zone>
                         <zone type="Asia/Vientiane">
-                                <exemplarCity draft="contributed">Vientiane</exemplarCity>
+                                <exemplarCity>Vientiane</exemplarCity>
                         </zone>
                         <zone type="Asia/Beirut">
-                                <exemplarCity draft="contributed">Bejrut</exemplarCity>
+                                <exemplarCity>Bejrut</exemplarCity>
                         </zone>
                         <zone type="America/St_Lucia">
-                                <exemplarCity draft="contributed">St. Lucia</exemplarCity>
+                                <exemplarCity>St. Lucia</exemplarCity>
                         </zone>
                         <zone type="Europe/Vaduz">
-                                <exemplarCity draft="contributed">Vaduz</exemplarCity>
+                                <exemplarCity>Vaduz</exemplarCity>
                         </zone>
                         <zone type="Asia/Colombo">
-                                <exemplarCity draft="contributed">Colombo</exemplarCity>
+                                <exemplarCity>Colombo</exemplarCity>
                         </zone>
                         <zone type="Africa/Monrovia">
-                                <exemplarCity draft="contributed">Monrovia</exemplarCity>
+                                <exemplarCity>Monrovia</exemplarCity>
                         </zone>
                         <zone type="Africa/Maseru">
-                                <exemplarCity draft="contributed">Maseru</exemplarCity>
+                                <exemplarCity>Maseru</exemplarCity>
                         </zone>
                         <zone type="Europe/Vilnius">
-                                <exemplarCity draft="contributed">Vilna</exemplarCity>
+                                <exemplarCity>Vilna</exemplarCity>
                         </zone>
                         <zone type="Europe/Luxembourg">
-                                <exemplarCity draft="contributed">Luksemburg</exemplarCity>
+                                <exemplarCity>Luksemburg</exemplarCity>
                         </zone>
                         <zone type="Europe/Riga">
-                                <exemplarCity draft="contributed">Riga</exemplarCity>
+                                <exemplarCity>Riga</exemplarCity>
                         </zone>
                         <zone type="Africa/Tripoli">
-                                <exemplarCity draft="contributed">Tripoli</exemplarCity>
+                                <exemplarCity>Tripoli</exemplarCity>
                         </zone>
                         <zone type="Africa/Casablanca">
-                                <exemplarCity draft="contributed">Casablanca</exemplarCity>
+                                <exemplarCity>Casablanca</exemplarCity>
                         </zone>
                         <zone type="Europe/Monaco">
-                                <exemplarCity draft="contributed">Monako</exemplarCity>
+                                <exemplarCity>Monako</exemplarCity>
                         </zone>
                         <zone type="Europe/Chisinau">
-                                <exemplarCity draft="contributed">Kišinjev</exemplarCity>
+                                <exemplarCity>Kišinjev</exemplarCity>
                         </zone>
                         <zone type="Europe/Podgorica">
-                                <exemplarCity draft="contributed">Podgorica</exemplarCity>
+                                <exemplarCity>Podgorica</exemplarCity>
                         </zone>
                         <zone type="America/Marigot">
-                                <exemplarCity draft="contributed">Marigot</exemplarCity>
+                                <exemplarCity>Marigot</exemplarCity>
                         </zone>
                         <zone type="Indian/Antananarivo">
-                                <exemplarCity draft="contributed">Antananarivo</exemplarCity>
+                                <exemplarCity>Antananarivo</exemplarCity>
                         </zone>
                         <zone type="Pacific/Kwajalein">
-                                <exemplarCity draft="contributed">Kwajalein</exemplarCity>
+                                <exemplarCity>Kwajalein</exemplarCity>
                         </zone>
                         <zone type="Pacific/Majuro">
-                                <exemplarCity draft="contributed">Majuro</exemplarCity>
+                                <exemplarCity>Majuro</exemplarCity>
                         </zone>
                         <zone type="Europe/Skopje">
-                                <exemplarCity draft="contributed">Skopje</exemplarCity>
+                                <exemplarCity>Skopje</exemplarCity>
                         </zone>
                         <zone type="Africa/Bamako">
-                                <exemplarCity draft="contributed">Bamako</exemplarCity>
+                                <exemplarCity>Bamako</exemplarCity>
                         </zone>
                         <zone type="Asia/Rangoon">
-                                <exemplarCity draft="contributed">Rangun</exemplarCity>
+                                <exemplarCity>Rangun</exemplarCity>
                         </zone>
                         <zone type="Asia/Hovd">
-                                <exemplarCity draft="contributed">Hovd</exemplarCity>
+                                <exemplarCity>Hovd</exemplarCity>
                         </zone>
                         <zone type="Asia/Ulaanbaatar">
                                 <exemplarCity>Ulan Bator</exemplarCity>
                         </zone>
                         <zone type="Asia/Choibalsan">
-                                <exemplarCity draft="contributed">Čojbalsan</exemplarCity>
+                                <exemplarCity>Čojbalsan</exemplarCity>
                         </zone>
                         <zone type="Asia/Macau">
-                                <exemplarCity draft="contributed">Macao</exemplarCity>
+                                <exemplarCity>Macao</exemplarCity>
                         </zone>
                         <zone type="Pacific/Saipan">
-                                <exemplarCity draft="contributed">Saipan</exemplarCity>
+                                <exemplarCity>Saipan</exemplarCity>
                         </zone>
                         <zone type="America/Martinique">
-                                <exemplarCity draft="contributed">Martinik</exemplarCity>
+                                <exemplarCity>Martinik</exemplarCity>
                         </zone>
                         <zone type="Africa/Nouakchott">
-                                <exemplarCity draft="contributed">Nouakchott</exemplarCity>
+                                <exemplarCity>Nouakchott</exemplarCity>
                         </zone>
                         <zone type="America/Montserrat">
-                                <exemplarCity draft="contributed">Montserrat</exemplarCity>
+                                <exemplarCity>Montserrat</exemplarCity>
                         </zone>
                         <zone type="Europe/Malta">
-                                <exemplarCity draft="contributed">Malta</exemplarCity>
+                                <exemplarCity>Malta</exemplarCity>
                         </zone>
                         <zone type="Indian/Mauritius">
-                                <exemplarCity draft="contributed">Mauritius</exemplarCity>
+                                <exemplarCity>Mauritius</exemplarCity>
                         </zone>
                         <zone type="Indian/Maldives">
-                                <exemplarCity draft="contributed">Maldivi</exemplarCity>
+                                <exemplarCity>Maldivi</exemplarCity>
                         </zone>
                         <zone type="Africa/Blantyre">
-                                <exemplarCity draft="contributed">Blantyre</exemplarCity>
+                                <exemplarCity>Blantyre</exemplarCity>
                         </zone>
                         <zone type="America/Tijuana">
-                                <exemplarCity draft="contributed">Tijuana</exemplarCity>
-                        </zone>
-                        <zone type="America/Santa_Isabel">
-                                <exemplarCity draft="contributed">Santa Isabel</exemplarCity>
+                                <exemplarCity>Tijuana</exemplarCity>
                         </zone>
                         <zone type="America/Hermosillo">
-                                <exemplarCity draft="contributed">Hermosillo</exemplarCity>
+                                <exemplarCity>Hermosillo</exemplarCity>
                         </zone>
                         <zone type="America/Mazatlan">
-                                <exemplarCity draft="contributed">Mazatlan</exemplarCity>
+                                <exemplarCity>Mazatlan</exemplarCity>
                         </zone>
                         <zone type="America/Chihuahua">
-                                <exemplarCity draft="contributed">Chihuahua</exemplarCity>
+                                <exemplarCity>Chihuahua</exemplarCity>
                         </zone>
                         <zone type="America/Bahia_Banderas">
-                                <exemplarCity draft="contributed">Bahia Banderas</exemplarCity>
+                                <exemplarCity>Bahia Banderas</exemplarCity>
                         </zone>
                         <zone type="America/Ojinaga">
-                                <exemplarCity draft="contributed">Ojinaga</exemplarCity>
+                                <exemplarCity>Ojinaga</exemplarCity>
                         </zone>
                         <zone type="America/Monterrey">
-                                <exemplarCity draft="contributed">Monterrey</exemplarCity>
+                                <exemplarCity>Monterrey</exemplarCity>
                         </zone>
                         <zone type="America/Mexico_City">
-                                <exemplarCity draft="contributed">Ciudad Mexico</exemplarCity>
+                                <exemplarCity>Ciudad de Mexico</exemplarCity>
                         </zone>
                         <zone type="America/Matamoros">
-                                <exemplarCity draft="contributed">Matamoros</exemplarCity>
+                                <exemplarCity>Matamoros</exemplarCity>
                         </zone>
                         <zone type="America/Merida">
-                                <exemplarCity draft="contributed">Merida</exemplarCity>
+                                <exemplarCity>Merida</exemplarCity>
                         </zone>
                         <zone type="America/Cancun">
-                                <exemplarCity draft="contributed">Cancun</exemplarCity>
+                                <exemplarCity>Cancun</exemplarCity>
                         </zone>
                         <zone type="Asia/Kuala_Lumpur">
-                                <exemplarCity draft="contributed">Kuala Lumpur</exemplarCity>
+                                <exemplarCity>Kuala Lumpur</exemplarCity>
                         </zone>
                         <zone type="Asia/Kuching">
-                                <exemplarCity draft="contributed">Kuching</exemplarCity>
+                                <exemplarCity>Kuching</exemplarCity>
                         </zone>
                         <zone type="Africa/Maputo">
-                                <exemplarCity draft="contributed">Maputo</exemplarCity>
+                                <exemplarCity>Maputo</exemplarCity>
                         </zone>
                         <zone type="Africa/Windhoek">
-                                <exemplarCity draft="contributed">Windhoek</exemplarCity>
+                                <exemplarCity>Windhoek</exemplarCity>
                         </zone>
                         <zone type="Pacific/Noumea">
-                                <exemplarCity draft="contributed">Noumea</exemplarCity>
+                                <exemplarCity>Noumea</exemplarCity>
                         </zone>
                         <zone type="Africa/Niamey">
-                                <exemplarCity draft="contributed">Niamey</exemplarCity>
+                                <exemplarCity>Niamey</exemplarCity>
                         </zone>
                         <zone type="Pacific/Norfolk">
-                                <exemplarCity draft="contributed">Norfolk</exemplarCity>
+                                <exemplarCity>Norfolk</exemplarCity>
                         </zone>
                         <zone type="Africa/Lagos">
-                                <exemplarCity draft="contributed">Lagos</exemplarCity>
+                                <exemplarCity>Lagos</exemplarCity>
                         </zone>
                         <zone type="America/Managua">
-                                <exemplarCity draft="contributed">Managua</exemplarCity>
+                                <exemplarCity>Managua</exemplarCity>
                         </zone>
                         <zone type="Europe/Amsterdam">
-                                <exemplarCity draft="contributed">Amsterdam</exemplarCity>
+                                <exemplarCity>Amsterdam</exemplarCity>
                         </zone>
                         <zone type="Europe/Oslo">
-                                <exemplarCity draft="contributed">Oslo</exemplarCity>
+                                <exemplarCity>Oslo</exemplarCity>
                         </zone>
                         <zone type="Asia/Katmandu">
-                                <exemplarCity draft="contributed">Katmandu</exemplarCity>
+                                <exemplarCity>Katmandu</exemplarCity>
                         </zone>
                         <zone type="Pacific/Nauru">
-                                <exemplarCity draft="contributed">Nauru</exemplarCity>
+                                <exemplarCity>Nauru</exemplarCity>
                         </zone>
                         <zone type="Pacific/Niue">
-                                <exemplarCity draft="contributed">Niue</exemplarCity>
+                                <exemplarCity>Niue</exemplarCity>
                         </zone>
                         <zone type="Pacific/Chatham">
-                                <exemplarCity draft="contributed">Chatham</exemplarCity>
+                                <exemplarCity>Chatham</exemplarCity>
                         </zone>
                         <zone type="Pacific/Auckland">
-                                <exemplarCity draft="contributed">Auckland</exemplarCity>
+                                <exemplarCity>Auckland</exemplarCity>
                         </zone>
                         <zone type="Asia/Muscat">
-                                <exemplarCity draft="contributed">Muškat</exemplarCity>
+                                <exemplarCity>Muškat</exemplarCity>
                         </zone>
                         <zone type="America/Panama">
-                                <exemplarCity draft="contributed">Panama</exemplarCity>
+                                <exemplarCity>Panama</exemplarCity>
                         </zone>
                         <zone type="America/Lima">
-                                <exemplarCity draft="contributed">Lima</exemplarCity>
+                                <exemplarCity>Lima</exemplarCity>
                         </zone>
                         <zone type="Pacific/Tahiti">
-                                <exemplarCity draft="contributed">Tahiti</exemplarCity>
+                                <exemplarCity>Tahiti</exemplarCity>
                         </zone>
                         <zone type="Pacific/Marquesas">
-                                <exemplarCity draft="contributed">Marquesas</exemplarCity>
+                                <exemplarCity>Marquesas</exemplarCity>
                         </zone>
                         <zone type="Pacific/Gambier">
-                                <exemplarCity draft="contributed">Gambier</exemplarCity>
+                                <exemplarCity>Gambier</exemplarCity>
                         </zone>
                         <zone type="Pacific/Port_Moresby">
-                                <exemplarCity draft="contributed">Port Moresby</exemplarCity>
+                                <exemplarCity>Port Moresby</exemplarCity>
                         </zone>
                         <zone type="Pacific/Bougainville">
-                                <exemplarCity draft="contributed">Bougainville</exemplarCity>
+                                <exemplarCity>Bougainville</exemplarCity>
                         </zone>
                         <zone type="Asia/Manila">
-                                <exemplarCity draft="contributed">Manila</exemplarCity>
+                                <exemplarCity>Manila</exemplarCity>
                         </zone>
                         <zone type="Asia/Karachi">
-                                <exemplarCity draft="contributed">Karači</exemplarCity>
+                                <exemplarCity>Karači</exemplarCity>
                         </zone>
                         <zone type="Europe/Warsaw">
-                                <exemplarCity draft="contributed">Varšava</exemplarCity>
+                                <exemplarCity>Varšava</exemplarCity>
                         </zone>
                         <zone type="America/Miquelon">
-                                <exemplarCity draft="contributed">Miquelon</exemplarCity>
+                                <exemplarCity>Miquelon</exemplarCity>
                         </zone>
                         <zone type="Pacific/Pitcairn">
-                                <exemplarCity draft="contributed">Pitcairn</exemplarCity>
+                                <exemplarCity>Pitcairn</exemplarCity>
                         </zone>
                         <zone type="America/Puerto_Rico">
-                                <exemplarCity draft="contributed">Portoriko</exemplarCity>
+                                <exemplarCity>Portoriko</exemplarCity>
                         </zone>
                         <zone type="Asia/Gaza">
-                                <exemplarCity draft="contributed">Gaza</exemplarCity>
+                                <exemplarCity>Gaza</exemplarCity>
                         </zone>
                         <zone type="Asia/Hebron">
-                                <exemplarCity draft="contributed">Hebron</exemplarCity>
+                                <exemplarCity>Hebron</exemplarCity>
                         </zone>
                         <zone type="Atlantic/Azores">
                                 <exemplarCity>Azori</exemplarCity>
                         </zone>
                         <zone type="Atlantic/Madeira">
-                                <exemplarCity draft="contributed">Madeira</exemplarCity>
+                                <exemplarCity>Madeira</exemplarCity>
                         </zone>
                         <zone type="Europe/Lisbon">
-                                <exemplarCity draft="contributed">Lizbona</exemplarCity>
+                                <exemplarCity>Lizbona</exemplarCity>
                         </zone>
                         <zone type="Pacific/Palau">
-                                <exemplarCity draft="contributed">Palau</exemplarCity>
+                                <exemplarCity>Palau</exemplarCity>
                         </zone>
                         <zone type="America/Asuncion">
-                                <exemplarCity draft="contributed">Asunción</exemplarCity>
+                                <exemplarCity>Asunción</exemplarCity>
                         </zone>
                         <zone type="Asia/Qatar">
-                                <exemplarCity draft="contributed">Katar</exemplarCity>
+                                <exemplarCity>Katar</exemplarCity>
                         </zone>
                         <zone type="Indian/Reunion">
-                                <exemplarCity draft="contributed">Reunion</exemplarCity>
+                                <exemplarCity>Reunion</exemplarCity>
                         </zone>
                         <zone type="Europe/Bucharest">
-                                <exemplarCity draft="contributed">Bukarešta</exemplarCity>
+                                <exemplarCity>Bukarešta</exemplarCity>
                         </zone>
                         <zone type="Europe/Belgrade">
-                                <exemplarCity draft="contributed">Beograd</exemplarCity>
+                                <exemplarCity>Beograd</exemplarCity>
                         </zone>
                         <zone type="Europe/Kaliningrad">
-                                <exemplarCity draft="contributed">Kaliningrad</exemplarCity>
+                                <exemplarCity>Kaliningrad</exemplarCity>
                         </zone>
                         <zone type="Europe/Simferopol">
-                                <exemplarCity draft="contributed">Simferopol</exemplarCity>
+                                <exemplarCity>Simferopol</exemplarCity>
                         </zone>
                         <zone type="Europe/Moscow">
                                 <exemplarCity>Moskva</exemplarCity>
                         </zone>
                         <zone type="Europe/Volgograd">
-                                <exemplarCity draft="contributed">Volgograd</exemplarCity>
+                                <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 draft="contributed">Samara</exemplarCity>
+                                <exemplarCity>Samara</exemplarCity>
                         </zone>
                         <zone type="Asia/Yekaterinburg">
                                 <exemplarCity>Jekaterinburg</exemplarCity>
                         </zone>
                         <zone type="Asia/Omsk">
-                                <exemplarCity draft="contributed">Omsk</exemplarCity>
+                                <exemplarCity>Omsk</exemplarCity>
                         </zone>
                         <zone type="Asia/Novosibirsk">
-                                <exemplarCity draft="contributed">Novosibirsk</exemplarCity>
+                                <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 draft="contributed">Novokuznetsk</exemplarCity>
+                                <exemplarCity>Novokuznetsk</exemplarCity>
                         </zone>
                         <zone type="Asia/Krasnoyarsk">
                                 <exemplarCity>Krasnojarsk</exemplarCity>
                         </zone>
                         <zone type="Asia/Irkutsk">
-                                <exemplarCity draft="contributed">Irkutsk</exemplarCity>
+                                <exemplarCity>Irkutsk</exemplarCity>
                         </zone>
                         <zone type="Asia/Chita">
-                                <exemplarCity draft="contributed">Chita</exemplarCity>
+                                <exemplarCity>Čita</exemplarCity>
                         </zone>
                         <zone type="Asia/Yakutsk">
                                 <exemplarCity>Jakutsk</exemplarCity>
                         </zone>
                         <zone type="Asia/Vladivostok">
-                                <exemplarCity draft="contributed">Vladivostok</exemplarCity>
+                                <exemplarCity>Vladivostok</exemplarCity>
                         </zone>
                         <zone type="Asia/Khandyga">
-                                <exemplarCity draft="contributed">Handiga</exemplarCity>
+                                <exemplarCity>Handiga</exemplarCity>
                         </zone>
                         <zone type="Asia/Sakhalin">
                                 <exemplarCity>Sahalin</exemplarCity>
                         </zone>
                         <zone type="Asia/Ust-Nera">
-                                <exemplarCity draft="contributed">Ust-Nera</exemplarCity>
+                                <exemplarCity>Ust-Nera</exemplarCity>
                         </zone>
                         <zone type="Asia/Magadan">
-                                <exemplarCity draft="contributed">Magadan</exemplarCity>
+                                <exemplarCity>Magadan</exemplarCity>
                         </zone>
                         <zone type="Asia/Srednekolymsk">
-                                <exemplarCity draft="contributed">Srednekolymsk</exemplarCity>
+                                <exemplarCity>Srednekolimsk</exemplarCity>
                         </zone>
                         <zone type="Asia/Kamchatka">
                                 <exemplarCity>Kamčatka</exemplarCity>
                         </zone>
                         <zone type="Asia/Anadyr">
                                 <exemplarCity>Anadir</exemplarCity>
                         </zone>
                         <zone type="Africa/Kigali">
-                                <exemplarCity draft="contributed">Kigali</exemplarCity>
+                                <exemplarCity>Kigali</exemplarCity>
                         </zone>
                         <zone type="Asia/Riyadh">
-                                <exemplarCity draft="contributed">Rijad</exemplarCity>
+                                <exemplarCity>Rijad</exemplarCity>
                         </zone>
                         <zone type="Pacific/Guadalcanal">
-                                <exemplarCity draft="contributed">Guadalcanal</exemplarCity>
+                                <exemplarCity>Guadalcanal</exemplarCity>
                         </zone>
                         <zone type="Indian/Mahe">
-                                <exemplarCity draft="contributed">Mahe</exemplarCity>
+                                <exemplarCity>Mahe</exemplarCity>
                         </zone>
                         <zone type="Africa/Khartoum">
-                                <exemplarCity draft="contributed">Kartum</exemplarCity>
+                                <exemplarCity>Kartum</exemplarCity>
                         </zone>
                         <zone type="Europe/Stockholm">
-                                <exemplarCity draft="contributed">Stockholm</exemplarCity>
+                                <exemplarCity>Stockholm</exemplarCity>
                         </zone>
                         <zone type="Asia/Singapore">
-                                <exemplarCity draft="contributed">Singapur</exemplarCity>
+                                <exemplarCity>Singapur</exemplarCity>
                         </zone>
                         <zone type="Atlantic/St_Helena">
-                                <exemplarCity draft="contributed">St. Helena</exemplarCity>
+                                <exemplarCity>St. Helena</exemplarCity>
                         </zone>
                         <zone type="Europe/Ljubljana">
-                                <exemplarCity draft="contributed">Ljubljana</exemplarCity>
+                                <exemplarCity>Ljubljana</exemplarCity>
                         </zone>
                         <zone type="Arctic/Longyearbyen">
-                                <exemplarCity draft="contributed">Longyearbyen</exemplarCity>
+                                <exemplarCity>Longyearbyen</exemplarCity>
                         </zone>
                         <zone type="Europe/Bratislava">
-                                <exemplarCity draft="contributed">Bratislava</exemplarCity>
+                                <exemplarCity>Bratislava</exemplarCity>
                         </zone>
                         <zone type="Africa/Freetown">
-                                <exemplarCity draft="contributed">Freetown</exemplarCity>
+                                <exemplarCity>Freetown</exemplarCity>
                         </zone>
                         <zone type="Europe/San_Marino">
-                                <exemplarCity draft="contributed">San Marino</exemplarCity>
+                                <exemplarCity>San Marino</exemplarCity>
                         </zone>
                         <zone type="Africa/Dakar">
-                                <exemplarCity draft="contributed">Dakar</exemplarCity>
+                                <exemplarCity>Dakar</exemplarCity>
                         </zone>
                         <zone type="Africa/Mogadishu">
-                                <exemplarCity draft="contributed">Mogadišu</exemplarCity>
+                                <exemplarCity>Mogadišu</exemplarCity>
                         </zone>
                         <zone type="America/Paramaribo">
-                                <exemplarCity draft="contributed">Paramaribo</exemplarCity>
+                                <exemplarCity>Paramaribo</exemplarCity>
                         </zone>
                         <zone type="Africa/Juba">
-                                <exemplarCity draft="contributed">Juba</exemplarCity>
+                                <exemplarCity>Juba</exemplarCity>
                         </zone>
                         <zone type="Africa/Sao_Tome">
-                                <exemplarCity draft="contributed">São Tomé</exemplarCity>
+                                <exemplarCity>São Tomé</exemplarCity>
                         </zone>
                         <zone type="America/El_Salvador">
-                                <exemplarCity draft="contributed">Salvador</exemplarCity>
+                                <exemplarCity>Salvador</exemplarCity>
                         </zone>
                         <zone type="America/Lower_Princes">
-                                <exemplarCity draft="contributed">Lower Prince’s Quarter</exemplarCity>
+                                <exemplarCity>Lower Prince’s Quarter</exemplarCity>
                         </zone>
                         <zone type="Asia/Damascus">
-                                <exemplarCity draft="contributed">Damask</exemplarCity>
+                                <exemplarCity>Damask</exemplarCity>
                         </zone>
                         <zone type="Africa/Mbabane">
-                                <exemplarCity draft="contributed">Mbabane</exemplarCity>
+                                <exemplarCity>Mbabane</exemplarCity>
                         </zone>
                         <zone type="America/Grand_Turk">
-                                <exemplarCity draft="contributed">Grand Turk</exemplarCity>
+                                <exemplarCity>Grand Turk</exemplarCity>
                         </zone>
                         <zone type="Africa/Ndjamena">
-                                <exemplarCity draft="contributed">Ndjamena</exemplarCity>
+                                <exemplarCity>Ndjamena</exemplarCity>
                         </zone>
                         <zone type="Indian/Kerguelen">
-                                <exemplarCity draft="contributed">Kerguelen</exemplarCity>
+                                <exemplarCity>Kerguelen</exemplarCity>
                         </zone>
                         <zone type="Africa/Lome">
-                                <exemplarCity draft="contributed">Lome</exemplarCity>
+                                <exemplarCity>Lome</exemplarCity>
                         </zone>
                         <zone type="Asia/Bangkok">
-                                <exemplarCity draft="contributed">Bangkok</exemplarCity>
+                                <exemplarCity>Bangkok</exemplarCity>
                         </zone>
                         <zone type="Asia/Dushanbe">
-                                <exemplarCity draft="contributed">Dušanbe</exemplarCity>
+                                <exemplarCity>Dušanbe</exemplarCity>
                         </zone>
                         <zone type="Pacific/Fakaofo">
-                                <exemplarCity draft="contributed">Fakaofo</exemplarCity>
+                                <exemplarCity>Fakaofo</exemplarCity>
                         </zone>
                         <zone type="Asia/Dili">
-                                <exemplarCity draft="contributed">Dili</exemplarCity>
+                                <exemplarCity>Dili</exemplarCity>
                         </zone>
                         <zone type="Asia/Ashgabat">
-                                <exemplarCity draft="contributed">Ašgabat</exemplarCity>
+                                <exemplarCity>Ašhabad</exemplarCity>
                         </zone>
                         <zone type="Africa/Tunis">
-                                <exemplarCity draft="contributed">Tunis</exemplarCity>
+                                <exemplarCity>Tunis</exemplarCity>
                         </zone>
                         <zone type="Pacific/Tongatapu">
-                                <exemplarCity draft="contributed">Tongatapu</exemplarCity>
+                                <exemplarCity>Tongatapu</exemplarCity>
                         </zone>
                         <zone type="Europe/Istanbul">
-                                <exemplarCity draft="contributed">Istanbul</exemplarCity>
+                                <exemplarCity>Istanbul</exemplarCity>
                         </zone>
                         <zone type="America/Port_of_Spain">
-                                <exemplarCity draft="contributed">Port of Spain</exemplarCity>
+                                <exemplarCity>Port of Spain</exemplarCity>
                         </zone>
                         <zone type="Pacific/Funafuti">
-                                <exemplarCity draft="contributed">Funafuti</exemplarCity>
+                                <exemplarCity>Funafuti</exemplarCity>
                         </zone>
                         <zone type="Asia/Taipei">
-                                <exemplarCity draft="contributed">Tajpej</exemplarCity>
+                                <exemplarCity>Tajpej</exemplarCity>
                         </zone>
                         <zone type="Africa/Dar_es_Salaam">
-                                <exemplarCity draft="contributed">Dar es Salaam</exemplarCity>
+                                <exemplarCity>Dar es Salaam</exemplarCity>
                         </zone>
                         <zone type="Europe/Uzhgorod">
                                 <exemplarCity>Užgorod</exemplarCity>
                         </zone>
                         <zone type="Europe/Kiev">

@@ -3426,162 +4564,159 @@
                         </zone>
                         <zone type="Europe/Zaporozhye">
                                 <exemplarCity>Zaporožje</exemplarCity>
                         </zone>
                         <zone type="Africa/Kampala">
-                                <exemplarCity draft="contributed">Kampala</exemplarCity>
+                                <exemplarCity>Kampala</exemplarCity>
                         </zone>
                         <zone type="Pacific/Midway">
-                                <exemplarCity draft="contributed">Midway</exemplarCity>
-                        </zone>
-                        <zone type="Pacific/Johnston">
-                                <exemplarCity draft="contributed">Johnston</exemplarCity>
+                                <exemplarCity>Midway</exemplarCity>
                         </zone>
                         <zone type="Pacific/Wake">
-                                <exemplarCity draft="contributed">Wake</exemplarCity>
+                                <exemplarCity>Wake</exemplarCity>
                         </zone>
                         <zone type="America/Adak">
-                                <exemplarCity draft="contributed">Adak</exemplarCity>
+                                <exemplarCity>Adak</exemplarCity>
                         </zone>
                         <zone type="America/Nome">
-                                <exemplarCity draft="contributed">Nome</exemplarCity>
+                                <exemplarCity>Nome</exemplarCity>
                         </zone>
-                        <zone type="Pacific/Honolulu">
-                                <exemplarCity draft="contributed">Honolulu</exemplarCity>
+                        <zone type="Pacific/Johnston">
+                                <exemplarCity>Johnston</exemplarCity>
                         </zone>
                         <zone type="America/Anchorage">
-                                <exemplarCity draft="contributed">Anchorage</exemplarCity>
+                                <exemplarCity>Anchorage</exemplarCity>
                         </zone>
                         <zone type="America/Yakutat">
-                                <exemplarCity draft="contributed">Yakutat</exemplarCity>
+                                <exemplarCity>Yakutat</exemplarCity>
                         </zone>
                         <zone type="America/Sitka">
-                                <exemplarCity draft="contributed">Sitka</exemplarCity>
+                                <exemplarCity>Sitka</exemplarCity>
                         </zone>
                         <zone type="America/Juneau">
-                                <exemplarCity draft="contributed">Juneau</exemplarCity>
+                                <exemplarCity>Juneau</exemplarCity>
                         </zone>
                         <zone type="America/Metlakatla">
-                                <exemplarCity draft="contributed">Metlakatla</exemplarCity>
+                                <exemplarCity>Metlakatla</exemplarCity>
                         </zone>
                         <zone type="America/Los_Angeles">
-                                <exemplarCity draft="contributed">Los Angeles</exemplarCity>
+                                <exemplarCity>Los Angeles</exemplarCity>
                         </zone>
                         <zone type="America/Boise">
-                                <exemplarCity draft="contributed">Boise</exemplarCity>
+                                <exemplarCity>Boise</exemplarCity>
                         </zone>
                         <zone type="America/Phoenix">
-                                <exemplarCity draft="contributed">Phoenix</exemplarCity>
+                                <exemplarCity>Phoenix</exemplarCity>
                         </zone>
                         <zone type="America/Denver">
-                                <exemplarCity draft="contributed">Denver</exemplarCity>
+                                <exemplarCity>Denver</exemplarCity>
                         </zone>
                         <zone type="America/North_Dakota/Beulah">
-                                <exemplarCity draft="contributed">Beulah, North Dakota</exemplarCity>
+                                <exemplarCity>Beulah, North Dakota</exemplarCity>
                         </zone>
                         <zone type="America/North_Dakota/New_Salem">
                                 <exemplarCity>New Salem, Severna Dakota</exemplarCity>
                         </zone>
                         <zone type="America/North_Dakota/Center">
                                 <exemplarCity>Center, Severna Dakota</exemplarCity>
                         </zone>
                         <zone type="America/Chicago">
-                                <exemplarCity draft="contributed">Chicago</exemplarCity>
+                                <exemplarCity>Chicago</exemplarCity>
                         </zone>
                         <zone type="America/Menominee">
-                                <exemplarCity draft="contributed">Menominee</exemplarCity>
+                                <exemplarCity>Menominee</exemplarCity>
                         </zone>
                         <zone type="America/Indiana/Vincennes">
-                                <exemplarCity draft="contributed">Vincennes, Indiana</exemplarCity>
+                                <exemplarCity>Vincennes, Indiana</exemplarCity>
                         </zone>
                         <zone type="America/Indiana/Petersburg">
-                                <exemplarCity draft="contributed">Petersburg, Indiana</exemplarCity>
+                                <exemplarCity>Petersburg, Indiana</exemplarCity>
                         </zone>
                         <zone type="America/Indiana/Tell_City">
-                                <exemplarCity draft="contributed">Tell City, Indiana</exemplarCity>
+                                <exemplarCity>Tell City, Indiana</exemplarCity>
                         </zone>
                         <zone type="America/Indiana/Knox">
-                                <exemplarCity draft="contributed">Knox, Indiana</exemplarCity>
+                                <exemplarCity>Knox, Indiana</exemplarCity>
                         </zone>
                         <zone type="America/Indiana/Winamac">
-                                <exemplarCity draft="contributed">Winamac, Indiana</exemplarCity>
+                                <exemplarCity>Winamac, Indiana</exemplarCity>
                         </zone>
                         <zone type="America/Indiana/Marengo">
-                                <exemplarCity draft="contributed">Marengo, Indiana</exemplarCity>
+                                <exemplarCity>Marengo, Indiana</exemplarCity>
                         </zone>
                         <zone type="America/Indianapolis">
-                                <exemplarCity draft="contributed">Indianapolis</exemplarCity>
+                                <exemplarCity>Indianapolis</exemplarCity>
                         </zone>
                         <zone type="America/Louisville">
-                                <exemplarCity draft="contributed">Louisville</exemplarCity>
+                                <exemplarCity>Louisville</exemplarCity>
                         </zone>
                         <zone type="America/Indiana/Vevay">
-                                <exemplarCity draft="contributed">Vevay, Indiana</exemplarCity>
+                                <exemplarCity>Vevay, Indiana</exemplarCity>
                         </zone>
                         <zone type="America/Kentucky/Monticello">
-                                <exemplarCity draft="contributed">Monticello, Kentucky</exemplarCity>
+                                <exemplarCity>Monticello, Kentucky</exemplarCity>
                         </zone>
                         <zone type="America/Detroit">
-                                <exemplarCity draft="contributed">Detroit</exemplarCity>
+                                <exemplarCity>Detroit</exemplarCity>
                         </zone>
                         <zone type="America/New_York">
-                                <exemplarCity draft="contributed">New York</exemplarCity>
+                                <exemplarCity>New York</exemplarCity>
                         </zone>
                         <zone type="America/Montevideo">
-                                <exemplarCity draft="contributed">Montevideo</exemplarCity>
+                                <exemplarCity>Montevideo</exemplarCity>
                         </zone>
                         <zone type="Asia/Samarkand">
-                                <exemplarCity draft="contributed">Samarkand</exemplarCity>
+                                <exemplarCity>Samarkand</exemplarCity>
                         </zone>
                         <zone type="Asia/Tashkent">
                                 <exemplarCity>Taškent</exemplarCity>
                         </zone>
                         <zone type="Europe/Vatican">
-                                <exemplarCity draft="contributed">Vatikan</exemplarCity>
+                                <exemplarCity>Vatikan</exemplarCity>
                         </zone>
                         <zone type="America/St_Vincent">
-                                <exemplarCity draft="contributed">St. Vincent</exemplarCity>
+                                <exemplarCity>St. Vincent</exemplarCity>
                         </zone>
                         <zone type="America/Caracas">
-                                <exemplarCity draft="contributed">Caracas</exemplarCity>
+                                <exemplarCity>Caracas</exemplarCity>
                         </zone>
                         <zone type="America/Tortola">
-                                <exemplarCity draft="contributed">Tortola</exemplarCity>
+                                <exemplarCity>Tortola</exemplarCity>
                         </zone>
                         <zone type="America/St_Thomas">
-                                <exemplarCity draft="contributed">St. Thomas</exemplarCity>
+                                <exemplarCity>St. Thomas</exemplarCity>
                         </zone>
                         <zone type="Asia/Saigon">
-                                <exemplarCity draft="contributed">Hošiminh</exemplarCity>
+                                <exemplarCity>Hošiminh</exemplarCity>
                         </zone>
                         <zone type="Pacific/Efate">
-                                <exemplarCity draft="contributed">Efate</exemplarCity>
+                                <exemplarCity>Efate</exemplarCity>
                         </zone>
                         <zone type="Pacific/Wallis">
-                                <exemplarCity draft="contributed">Wallis</exemplarCity>
+                                <exemplarCity>Wallis</exemplarCity>
                         </zone>
                         <zone type="Pacific/Apia">
-                                <exemplarCity draft="contributed">Apia</exemplarCity>
+                                <exemplarCity>Apia</exemplarCity>
                         </zone>
                         <zone type="Asia/Aden">
-                                <exemplarCity draft="contributed">Aden</exemplarCity>
+                                <exemplarCity>Aden</exemplarCity>
                         </zone>
                         <zone type="Indian/Mayotte">
-                                <exemplarCity draft="contributed">Mayotte</exemplarCity>
+                                <exemplarCity>Mayotte</exemplarCity>
                         </zone>
                         <zone type="Africa/Johannesburg">
-                                <exemplarCity draft="contributed">Johannesburg</exemplarCity>
+                                <exemplarCity>Johannesburg</exemplarCity>
                         </zone>
                         <zone type="Africa/Lusaka">
-                                <exemplarCity draft="contributed">Lusaka</exemplarCity>
+                                <exemplarCity>Lusaka</exemplarCity>
                         </zone>
                         <zone type="Africa/Harare">
-                                <exemplarCity draft="contributed">Harare</exemplarCity>
+                                <exemplarCity>Harare</exemplarCity>
                         </zone>
                         <metazone type="Afghanistan">
                                 <long>
-                                        <standard draft="contributed">Afganistanski čas</standard>
+                                        <standard>Afganistanski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Africa_Central">
                                 <long>
                                         <standard>Centralnoafriški čas</standard>

@@ -3604,20 +4739,20 @@
                                         <daylight>Zahodnoafriški poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Alaska">
                                 <long>
-                                        <generic draft="contributed">Aljaški čas</generic>
-                                        <standard draft="contributed">Aljaški standardni čas</standard>
-                                        <daylight draft="contributed">Aljaški poletni čas</daylight>
+                                        <generic>Aljaški čas</generic>
+                                        <standard>Aljaški standardni čas</standard>
+                                        <daylight>Aljaški poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Amazon">
                                 <long>
-                                        <generic draft="contributed">Amazonski čas</generic>
-                                        <standard draft="contributed">Amazonski standardni čas</standard>
-                                        <daylight draft="contributed">Amazonski poletni čas</daylight>
+                                        <generic>Amazonski čas</generic>
+                                        <standard>Amazonski standardni čas</standard>
+                                        <daylight>Amazonski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="America_Central">
                                 <long>
                                         <generic>Centralni čas</generic>

@@ -3653,13 +4788,13 @@
                                         <daylight draft="contributed">Anadirski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Apia">
                                 <long>
-                                        <generic draft="contributed">Čas: Apia</generic>
-                                        <standard draft="contributed">Standardni čas: Apia</standard>
-                                        <daylight draft="contributed">Poletni čas: Apia</daylight>
+                                        <generic>Čas: Apia</generic>
+                                        <standard>Standardni čas: Apia</standard>
+                                        <daylight>Poletni čas: Apia</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Arabian">
                                 <long>
                                         <generic>Arabski čas</generic>

@@ -3667,27 +4802,27 @@
                                         <daylight>Arabski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Argentina">
                                 <long>
-                                        <generic draft="contributed">Argentinski čas</generic>
-                                        <standard draft="contributed">Argentinski standardni čas</standard>
-                                        <daylight draft="contributed">Argentinski poletni čas</daylight>
+                                        <generic>Argentinski čas</generic>
+                                        <standard>Argentinski standardni čas</standard>
+                                        <daylight>Argentinski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Argentina_Western">
                                 <long>
-                                        <generic draft="contributed">Argentinski zahodni čas</generic>
-                                        <standard draft="contributed">Argentinski zahodni standardni čas</standard>
-                                        <daylight draft="contributed">Argentinski zahodni poletni čas</daylight>
+                                        <generic>Argentinski zahodni čas</generic>
+                                        <standard>Argentinski zahodni standardni čas</standard>
+                                        <daylight>Argentinski zahodni poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Armenia">
                                 <long>
-                                        <generic draft="contributed">Armenski čas</generic>
-                                        <standard draft="contributed">Armenski standardni čas</standard>
-                                        <daylight draft="contributed">Armenski poletni čas</daylight>
+                                        <generic>Armenski čas</generic>
+                                        <standard>Armenski standardni čas</standard>
+                                        <daylight>Armenski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Atlantic">
                                 <long>
                                         <generic>Atlantski čas</generic>

@@ -3723,13 +4858,13 @@
                                         <daylight>Avstralski zahodni poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Azerbaijan">
                                 <long>
-                                        <generic draft="contributed">Azerbajdžanski čas</generic>
-                                        <standard draft="contributed">Azerbajdžanski standardni čas</standard>
-                                        <daylight draft="contributed">Azerbajdžanski poletni čas</daylight>
+                                        <generic>Azerbajdžanski čas</generic>
+                                        <standard>Azerbajdžanski standardni čas</standard>
+                                        <daylight>Azerbajdžanski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Azores">
                                 <long>
                                         <generic>Azorski čas</generic>

@@ -3737,35 +4872,35 @@
                                         <daylight>Azorski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Bangladesh">
                                 <long>
-                                        <generic draft="contributed">Bangladeški čas</generic>
-                                        <standard draft="contributed">Bangladeški standardni čas</standard>
-                                        <daylight draft="contributed">Bangladeški poletni čas</daylight>
+                                        <generic>Bangladeški čas</generic>
+                                        <standard>Bangladeški standardni čas</standard>
+                                        <daylight>Bangladeški poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Bhutan">
                                 <long>
-                                        <standard draft="contributed">Butanski čas</standard>
+                                        <standard>Butanski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Bolivia">
                                 <long>
-                                        <standard draft="contributed">Bolivijski čas</standard>
+                                        <standard>Bolivijski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Brasilia">
                                 <long>
-                                        <generic draft="contributed">Brasilski čas</generic>
-                                        <standard draft="contributed">Brasilski standardni čas</standard>
-                                        <daylight draft="contributed">Brasilski poletni čas</daylight>
+                                        <generic>Brasilski čas</generic>
+                                        <standard>Brasilski standardni čas</standard>
+                                        <daylight>Brasilski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Brunei">
                                 <long>
-                                        <standard draft="contributed">Brunejski čas</standard>
+                                        <standard>Brunejski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Cape_Verde">
                                 <long>
                                         <generic>Kapverdski čas</generic>

@@ -3773,18 +4908,18 @@
                                         <daylight>Kapverdski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Chamorro">
                                 <long>
-                                        <standard draft="contributed">Čamorski standardni čas</standard>
+                                        <standard>Čamorski standardni čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Chatham">
                                 <long>
-                                        <generic draft="contributed">Čatamski čas</generic>
-                                        <standard draft="contributed">Čatamski standardni čas</standard>
-                                        <daylight draft="contributed">Čatamski poletni čas</daylight>
+                                        <generic>Čatamski čas</generic>
+                                        <standard>Čatamski standardni čas</standard>
+                                        <daylight>Čatamski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Chile">
                                 <long>
                                         <generic>Čilski čas</generic>

@@ -3799,23 +4934,23 @@
                                         <daylight>Kitajski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Choibalsan">
                                 <long>
-                                        <generic draft="contributed">Čojbalsanski čas</generic>
-                                        <standard draft="contributed">Čojbalsanski standardni čas</standard>
-                                        <daylight draft="contributed">Čojbalsanski poletni čas</daylight>
+                                        <generic>Čojbalsanski čas</generic>
+                                        <standard>Čojbalsanski standardni čas</standard>
+                                        <daylight>Čojbalsanski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Christmas">
                                 <long>
-                                        <standard draft="contributed">Božičnootoški čas</standard>
+                                        <standard>Božičnootoški čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Cocos">
                                 <long>
-                                        <standard draft="contributed">Čas: Kokosovi otoki</standard>
+                                        <standard>Čas: Kokosovi otoki</standard>
                                 </long>
                         </metazone>
                         <metazone type="Colombia">
                                 <long>
                                         <generic>Kolumbijski čas</generic>

@@ -3823,13 +4958,13 @@
                                         <daylight>Kolumbijski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Cook">
                                 <long>
-                                        <generic draft="contributed">Cookovootoški čas</generic>
-                                        <standard draft="contributed">Cookovootoški standardni čas</standard>
-                                        <daylight draft="contributed">Cookovootoški srednjepoletni čas</daylight>
+                                        <generic>Cookovootoški čas</generic>
+                                        <standard>Cookovootoški standardni čas</standard>
+                                        <daylight>Cookovootoški srednjepoletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Cuba">
                                 <long>
                                         <generic>Kubanski čas</generic>

@@ -3837,33 +4972,33 @@
                                         <daylight>Kubanski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Davis">
                                 <long>
-                                        <standard draft="contributed">Čas: Davis</standard>
+                                        <standard>Čas: Davis</standard>
                                 </long>
                         </metazone>
                         <metazone type="DumontDUrville">
                                 <long>
-                                        <standard draft="contributed">Čas: Dumont-d’Urville</standard>
+                                        <standard>Čas: Dumont-d’Urville</standard>
                                 </long>
                         </metazone>
                         <metazone type="East_Timor">
                                 <long>
-                                        <standard draft="contributed">Vzhodnotimorski čas</standard>
+                                        <standard>Vzhodnotimorski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Easter">
                                 <long>
-                                        <generic draft="contributed">Čas: Velikonočni otok</generic>
-                                        <standard draft="contributed">Standardni čas: Velikonočni otok</standard>
-                                        <daylight draft="contributed">Poletni čas: Velikonočni otok</daylight>
+                                        <generic>Čas: Velikonočni otok</generic>
+                                        <standard>Standardni čas: Velikonočni otok</standard>
+                                        <daylight>Poletni čas: Velikonočni otok</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Ecuador">
                                 <long>
-                                        <standard draft="contributed">Ekvadorski čas</standard>
+                                        <standard>Ekvadorski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Europe_Central">
                                 <long>
                                         <generic>Srednjeevropski čas</generic>

@@ -3878,11 +5013,11 @@
                                         <daylight>Vzhodnoevropski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Europe_Further_Eastern">
                                 <long>
-                                        <standard draft="contributed">Dodatni vzhodnoevropski čas</standard>
+                                        <standard>Dodatni vzhodnoevropski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Europe_Western">
                                 <long>
                                         <generic>Zahodnoevropski čas</generic>

@@ -3890,146 +5025,146 @@
                                         <daylight>Zahodnoevropski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Falkland">
                                 <long>
-                                        <generic draft="contributed">Čas: Falklandsko otočje</generic>
-                                        <standard draft="contributed">Standardni čas: Falklandsko otočje</standard>
-                                        <daylight draft="contributed">Poletni čas: Falklandsko otočje</daylight>
+                                        <generic>Čas: Falklandsko otočje</generic>
+                                        <standard>Standardni čas: Falklandsko otočje</standard>
+                                        <daylight>Poletni čas: Falklandsko otočje</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Fiji">
                                 <long>
-                                        <generic draft="contributed">Fidžijski čas</generic>
-                                        <standard draft="contributed">Fidžijski standardni čas</standard>
-                                        <daylight draft="contributed">Fidžijski poletni čas</daylight>
+                                        <generic>Fidžijski čas</generic>
+                                        <standard>Fidžijski standardni čas</standard>
+                                        <daylight>Fidžijski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="French_Guiana">
                                 <long>
-                                        <standard draft="contributed">Čas: Francoska Gvajana</standard>
+                                        <standard>Čas: Francoska Gvajana</standard>
                                 </long>
                         </metazone>
                         <metazone type="French_Southern">
                                 <long>
-                                        <standard draft="contributed">Francoski južni in antarktični čas</standard>
+                                        <standard>Francoski južni in antarktični čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Galapagos">
                                 <long>
-                                        <standard draft="contributed">Galapaški čas</standard>
+                                        <standard>Galapaški čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Gambier">
                                 <long>
-                                        <standard draft="contributed">Gambierski čas</standard>
+                                        <standard>Gambierski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Georgia">
                                 <long>
-                                        <generic draft="contributed">Gruzijski čas</generic>
-                                        <standard draft="contributed">Gruzijski standardni čas</standard>
-                                        <daylight draft="contributed">Gruzijski poletni čas</daylight>
+                                        <generic>Gruzijski čas</generic>
+                                        <standard>Gruzijski standardni čas</standard>
+                                        <daylight>Gruzijski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Gilbert_Islands">
                                 <long>
-                                        <standard draft="contributed">Čas: Gilbertovi otoki</standard>
+                                        <standard>Čas: Gilbertovi otoki</standard>
                                 </long>
                         </metazone>
                         <metazone type="GMT">
                                 <long>
                                         <standard>Greenwiški srednji čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Greenland_Eastern">
                                 <long>
-                                        <generic draft="contributed">Vzhodnogrenlandski čas</generic>
-                                        <standard draft="contributed">Vzhodnogrenlandski standardni čas</standard>
-                                        <daylight draft="contributed">Vzhodnogrenlandski poletni čas</daylight>
+                                        <generic>Vzhodnogrenlandski čas</generic>
+                                        <standard>Vzhodnogrenlandski standardni čas</standard>
+                                        <daylight>Vzhodnogrenlandski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Greenland_Western">
                                 <long>
-                                        <generic draft="contributed">Zahodnogrenlandski čas</generic>
-                                        <standard draft="contributed">Zahodnogrenlandski standardni čas</standard>
-                                        <daylight draft="contributed">Zahodnogrenlandski poletni čas</daylight>
+                                        <generic>Zahodnogrenlandski čas</generic>
+                                        <standard>Zahodnogrenlandski standardni čas</standard>
+                                        <daylight>Zahodnogrenlandski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Gulf">
                                 <long>
-                                        <standard draft="contributed">Zalivski standardni čas</standard>
+                                        <standard>Zalivski standardni čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Guyana">
                                 <long>
-                                        <standard draft="contributed">Gvajanski čas</standard>
+                                        <standard>Gvajanski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Hawaii_Aleutian">
                                 <long>
-                                        <generic draft="contributed">Havajski aleutski čas</generic>
-                                        <standard draft="contributed">Havajski aleutski standardni čas</standard>
-                                        <daylight draft="contributed">Havajski aleutski poletni čas</daylight>
+                                        <generic>Havajski aleutski čas</generic>
+                                        <standard>Havajski aleutski standardni čas</standard>
+                                        <daylight>Havajski aleutski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Hong_Kong">
                                 <long>
-                                        <generic draft="contributed">Hongkonški čas</generic>
-                                        <standard draft="contributed">Hongkonški standardni čas</standard>
-                                        <daylight draft="contributed">Hongkonški poletni čas</daylight>
+                                        <generic>Hongkonški čas</generic>
+                                        <standard>Hongkonški standardni čas</standard>
+                                        <daylight>Hongkonški poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Hovd">
                                 <long>
-                                        <generic draft="contributed">Hovdski čas</generic>
-                                        <standard draft="contributed">Hovdski standardni čas</standard>
-                                        <daylight draft="contributed">Hovdski poletni čas</daylight>
+                                        <generic>Hovdski čas</generic>
+                                        <standard>Hovdski standardni čas</standard>
+                                        <daylight>Hovdski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="India">
                                 <long>
                                         <standard>Indijski standardni čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Indian_Ocean">
                                 <long>
-                                        <standard draft="contributed">Indijskooceanski čas</standard>
+                                        <standard>Indijskooceanski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Indochina">
                                 <long>
-                                        <standard draft="contributed">Indokitajski čas</standard>
+                                        <standard>Indokitajski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Indonesia_Central">
                                 <long>
-                                        <standard draft="contributed">Indonezijski osrednji čas</standard>
+                                        <standard>Indonezijski osrednji čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Indonesia_Eastern">
                                 <long>
-                                        <standard draft="contributed">Indonezijski vzhodni čas</standard>
+                                        <standard>Indonezijski vzhodni čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Indonesia_Western">
                                 <long>
-                                        <standard draft="contributed">Indonezijski zahodni čas</standard>
+                                        <standard>Indonezijski zahodni čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Iran">
                                 <long>
-                                        <generic draft="contributed">Iranski čas</generic>
-                                        <standard draft="contributed">Iranski standardni čas</standard>
-                                        <daylight draft="contributed">Iranski poletni čas</daylight>
+                                        <generic>Iranski čas</generic>
+                                        <standard>Iranski standardni čas</standard>
+                                        <daylight>Iranski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Irkutsk">
                                 <long>
-                                        <generic draft="contributed">Irkutški čas</generic>
-                                        <standard draft="contributed">Irkutški standardni čas</standard>
-                                        <daylight draft="contributed">Irkutški poletni čas</daylight>
+                                        <generic>Irkutski čas</generic>
+                                        <standard>Irkutski standardni čas</standard>
+                                        <daylight>Irkutski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Israel">
                                 <long>
                                         <generic>Izraelski čas</generic>

@@ -4051,16 +5186,16 @@
                                         <daylight draft="contributed">Petropavlovsk-Kamčatski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Kazakhstan_Eastern">
                                 <long>
-                                        <standard draft="contributed">Vzhodni kazahstanski čas</standard>
+                                        <standard>Vzhodni kazahstanski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Kazakhstan_Western">
                                 <long>
-                                        <standard draft="contributed">Zahodni kazahstanski čas</standard>
+                                        <standard>Zahodni kazahstanski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Korea">
                                 <long>
                                         <generic>Korejski čas</generic>

@@ -4068,28 +5203,28 @@
                                         <daylight>Korejski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Kosrae">
                                 <long>
-                                        <standard draft="contributed">Kosrajški čas</standard>
+                                        <standard>Kosrajški čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Krasnoyarsk">
                                 <long>
-                                        <generic draft="contributed">Krasnojarški čas</generic>
-                                        <standard draft="contributed">Krasnojarški standardni čas</standard>
-                                        <daylight draft="contributed">Krasnojarški poletni čas</daylight>
+                                        <generic>Krasnojarski čas</generic>
+                                        <standard>Krasnojarski standardni čas</standard>
+                                        <daylight>Krasnojarski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Kyrgystan">
                                 <long>
-                                        <standard draft="contributed">Kirgizistanski čas</standard>
+                                        <standard>Kirgizistanski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Line_Islands">
                                 <long>
-                                        <standard draft="contributed">Ekvatorski otoki: Čas</standard>
+                                        <standard>Ekvatorski otoki: Čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Lord_Howe">
                                 <long>
                                         <generic>Čas otoka Lord Howe</generic>

@@ -4097,71 +5232,71 @@
                                         <daylight>Poletni čas otoka Lord Howe</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Macquarie">
                                 <long>
-                                        <standard draft="contributed">Macquarieski čas</standard>
+                                        <standard>Macquarieski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Magadan">
                                 <long>
-                                        <generic draft="contributed">Magadanski čas</generic>
-                                        <standard draft="contributed">Magadanski standardni čas</standard>
-                                        <daylight draft="contributed">Magadanski poletni čas</daylight>
+                                        <generic>Magadanski čas</generic>
+                                        <standard>Magadanski standardni čas</standard>
+                                        <daylight>Magadanski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Malaysia">
                                 <long>
-                                        <standard draft="contributed">Malezijski čas</standard>
+                                        <standard>Malezijski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Maldives">
                                 <long>
-                                        <standard draft="contributed">Maldivski čas</standard>
+                                        <standard>Maldivski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Marquesas">
                                 <long>
-                                        <standard draft="contributed">Čas: Markizni otoki</standard>
+                                        <standard>Čas: Markizni otoki</standard>
                                 </long>
                         </metazone>
                         <metazone type="Marshall_Islands">
                                 <long>
-                                        <standard draft="contributed">Čas: Marshallovi otoki</standard>
+                                        <standard>Čas: Marshallovi otoki</standard>
                                 </long>
                         </metazone>
                         <metazone type="Mauritius">
                                 <long>
-                                        <generic draft="contributed">Mauricijski čas</generic>
-                                        <standard draft="contributed">Mauricijski standardni čas</standard>
-                                        <daylight draft="contributed">Mauricijski poletni čas</daylight>
+                                        <generic>Mauricijski čas</generic>
+                                        <standard>Mauricijski standardni čas</standard>
+                                        <daylight>Mauricijski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Mawson">
                                 <long>
-                                        <standard draft="contributed">Mawsonski čas</standard>
+                                        <standard>Mawsonski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Mexico_Northwest">
                                 <long>
-                                        <generic draft="contributed">Čas: severozahod Mehike</generic>
-                                        <standard draft="contributed">Standardni čas: severozahod Mehike</standard>
-                                        <daylight draft="contributed">Poletni čas: severozahod Mehike</daylight>
+                                        <generic>Mehiški severozahodni čas</generic>
+                                        <standard>Mehiški severozahodni standardni čas</standard>
+                                        <daylight>Mehiški severozahodni poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Mexico_Pacific">
                                 <long>
-                                        <generic draft="contributed">Čas: pacifiška obala Mehike</generic>
-                                        <standard draft="contributed">Standardni čas: pacifiška obala Mehike</standard>
-                                        <daylight draft="contributed">Poletni čas: pacifiška obala Mehike</daylight>
+                                        <generic>Mehiški pacifiški čas</generic>
+                                        <standard>Mehiški pacifiški standardni čas</standard>
+                                        <daylight>Mehiški pacifiški poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Mongolia">
                                 <long>
-                                        <generic draft="contributed">Ulanbatorski čas</generic>
-                                        <standard draft="contributed">Ulanbatorski standardni čas</standard>
-                                        <daylight draft="contributed">Ulanbatorski poletni čas</daylight>
+                                        <generic>Ulanbatorski čas</generic>
+                                        <standard>Ulanbatorski standardni čas</standard>
+                                        <daylight>Ulanbatorski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Moscow">
                                 <long>
                                         <generic>Moskovski čas</generic>

@@ -4169,150 +5304,155 @@
                                         <daylight>Moskovski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Myanmar">
                                 <long>
-                                        <standard draft="contributed">Mjanmarski čas</standard>
+                                        <standard>Mjanmarski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Nauru">
                                 <long>
-                                        <standard draft="contributed">Naurujski čas</standard>
+                                        <standard>Naurujski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Nepal">
                                 <long>
-                                        <standard draft="contributed">Nepalski čas</standard>
+                                        <standard>Nepalski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="New_Caledonia">
                                 <long>
-                                        <generic draft="contributed">Novokaledonijski čas</generic>
-                                        <standard draft="contributed">Novokaledonijski standardni čas</standard>
-                                        <daylight draft="contributed">Novokaledonijski poletni čas</daylight>
+                                        <generic>Novokaledonijski čas</generic>
+                                        <standard>Novokaledonijski standardni čas</standard>
+                                        <daylight>Novokaledonijski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="New_Zealand">
                                 <long>
-                                        <generic draft="contributed">Novozelandski čas</generic>
-                                        <standard draft="contributed">Novozelandski standardni čas</standard>
-                                        <daylight draft="contributed">Novozelandski poletni čas</daylight>
+                                        <generic>Novozelandski čas</generic>
+                                        <standard>Novozelandski standardni čas</standard>
+                                        <daylight>Novozelandski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Newfoundland">
                                 <long>
-                                        <generic draft="contributed">Novofundlandski čas</generic>
-                                        <standard draft="contributed">Novofundlandski standardni čas</standard>
-                                        <daylight draft="contributed">Novofundlandski poletni čas</daylight>
+                                        <generic>Novofundlandski čas</generic>
+                                        <standard>Novofundlandski standardni čas</standard>
+                                        <daylight>Novofundlandski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Niue">
                                 <long>
-                                        <standard draft="contributed">Niuejski čas</standard>
+                                        <standard>Niuejski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Norfolk">
                                 <long>
-                                        <standard draft="contributed">Čas: Norfolški otoki</standard>
+                                        <standard>Čas: Norfolški otoki</standard>
                                 </long>
                         </metazone>
                         <metazone type="Noronha">
                                 <long>
-                                        <generic draft="contributed">Fernando de Noronški čas</generic>
-                                        <standard draft="contributed">Fernando de Noronški standardni čas</standard>
-                                        <daylight draft="contributed">Fernando de Noronški poletni čas</daylight>
+                                        <generic>Fernando de Noronški čas</generic>
+                                        <standard>Fernando de Noronški standardni čas</standard>
+                                        <daylight>Fernando de Noronški poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Novosibirsk">
                                 <long>
-                                        <generic draft="contributed">Novosibirški čas</generic>
-                                        <standard draft="contributed">Novosibirški standardni čas</standard>
-                                        <daylight draft="contributed">Novosibirški poletni čas</daylight>
+                                        <generic>Novosibirski čas</generic>
+                                        <standard>Novosibirski standardni čas</standard>
+                                        <daylight>Novosibirski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Omsk">
                                 <long>
-                                        <generic draft="contributed">Omški čas</generic>
-                                        <standard draft="contributed">Omški standardni čas</standard>
-                                        <daylight draft="contributed">Omški poletni čas</daylight>
+                                        <generic>Omski čas</generic>
+                                        <standard>Omski standardni čas</standard>
+                                        <daylight>Omski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Pakistan">
                                 <long>
-                                        <generic draft="contributed">Pakistanski čas</generic>
-                                        <standard draft="contributed">Pakistanski standardni čas</standard>
-                                        <daylight draft="contributed">Pakistanski poletni čas</daylight>
+                                        <generic>Pakistanski čas</generic>
+                                        <standard>Pakistanski standardni čas</standard>
+                                        <daylight>Pakistanski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Palau">
                                 <long>
-                                        <standard draft="contributed">Palavski čas</standard>
+                                        <standard>Palavski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Papua_New_Guinea">
                                 <long>
-                                        <standard draft="contributed">Papuanski čas</standard>
+                                        <standard>Papuanski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Paraguay">
                                 <long>
-                                        <generic draft="contributed">Paragvajski čas</generic>
-                                        <standard draft="contributed">Paragvajski standardni čas</standard>
-                                        <daylight draft="contributed">Paragvajski poletni čas</daylight>
+                                        <generic>Paragvajski čas</generic>
+                                        <standard>Paragvajski standardni čas</standard>
+                                        <daylight>Paragvajski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Peru">
                                 <long>
-                                        <generic draft="contributed">Perujski čas</generic>
-                                        <standard draft="contributed">Perujski standardni čas</standard>
-                                        <daylight draft="contributed">Perujski poletni čas</daylight>
+                                        <generic>Perujski čas</generic>
+                                        <standard>Perujski standardni čas</standard>
+                                        <daylight>Perujski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Philippines">
                                 <long>
-                                        <generic draft="contributed">Filipinski čas</generic>
-                                        <standard draft="contributed">Filipinski standardni čas</standard>
-                                        <daylight draft="contributed">Filipinski poletni čas</daylight>
+                                        <generic>Filipinski čas</generic>
+                                        <standard>Filipinski standardni čas</standard>
+                                        <daylight>Filipinski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Phoenix_Islands">
                                 <long>
-                                        <standard draft="contributed">Čas: Otočje Feniks</standard>
+                                        <standard>Čas: Otočje Feniks</standard>
                                 </long>
                         </metazone>
                         <metazone type="Pierre_Miquelon">
                                 <long>
-                                        <generic draft="contributed">Čas: Saint Pierre in Miquelon</generic>
-                                        <standard draft="contributed">Standardni čas: Saint Pierre in Miquelon</standard>
-                                        <daylight draft="contributed">Poletni čas: Saint Pierre in Miquelon</daylight>
+                                        <generic>Čas: Saint Pierre in Miquelon</generic>
+                                        <standard>Standardni čas: Saint Pierre in Miquelon</standard>
+                                        <daylight>Poletni čas: Saint Pierre in Miquelon</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Pitcairn">
                                 <long>
-                                        <standard draft="contributed">Pitcairnski čas</standard>
+                                        <standard>Pitcairnski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Ponape">
                                 <long>
-                                        <standard draft="contributed">Ponapski čas</standard>
+                                        <standard>Ponapski čas</standard>
+                                </long>
+                        </metazone>
+                        <metazone type="Pyongyang">
+                                <long>
+                                        <standard>Pjongjanški čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Reunion">
                                 <long>
-                                        <standard draft="contributed">Reunionski čas</standard>
+                                        <standard>Reunionski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Rothera">
                                 <long>
-                                        <standard draft="contributed">Rotherski čas</standard>
+                                        <standard>Rotherski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Sakhalin">
                                 <long>
-                                        <generic draft="contributed">Sahalinski čas</generic>
-                                        <standard draft="contributed">Sahalinski standardni čas</standard>
-                                        <daylight draft="contributed">Sahalinski poletni čas</daylight>
+                                        <generic>Sahalinski čas</generic>
+                                        <standard>Sahalinski standardni čas</standard>
+                                        <daylight>Sahalinski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Samara">
                                 <long>
                                         <generic>Samarski čas</generic>

@@ -4320,122 +5460,122 @@
                                         <daylight>Samarski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Samoa">
                                 <long>
-                                        <generic draft="contributed">Samoanski čas</generic>
-                                        <standard draft="contributed">Samoanski standardni čas</standard>
-                                        <daylight draft="contributed">Samoanski poletni čas</daylight>
+                                        <generic>Samoanski čas</generic>
+                                        <standard>Samoanski standardni čas</standard>
+                                        <daylight>Samoanski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Seychelles">
                                 <long>
-                                        <standard draft="contributed">Sejšelski čas</standard>
+                                        <standard>Sejšelski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Singapore">
                                 <long>
-                                        <standard draft="contributed">Singapurski standardni čas</standard>
+                                        <standard>Singapurski standardni čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Solomon">
                                 <long>
-                                        <standard draft="contributed">Salomonovootoški čas</standard>
+                                        <standard>Salomonovootoški čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="South_Georgia">
                                 <long>
-                                        <standard draft="contributed">Južnogeorgijski čas</standard>
+                                        <standard>Južnogeorgijski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Suriname">
                                 <long>
-                                        <standard draft="contributed">Surinamski čas</standard>
+                                        <standard>Surinamski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Syowa">
                                 <long>
-                                        <standard draft="contributed">Čas: Syowa</standard>
+                                        <standard>Čas: Syowa</standard>
                                 </long>
                         </metazone>
                         <metazone type="Tahiti">
                                 <long>
-                                        <standard draft="contributed">Tahitijski čas</standard>
+                                        <standard>Tahitijski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Taipei">
                                 <long>
-                                        <generic draft="contributed">Tajpejski čas</generic>
-                                        <standard draft="contributed">Tajpejski standardni čas</standard>
-                                        <daylight draft="contributed">Tajpejski poletni čas</daylight>
+                                        <generic>Tajpejski čas</generic>
+                                        <standard>Tajpejski standardni čas</standard>
+                                        <daylight>Tajpejski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Tajikistan">
                                 <long>
-                                        <standard draft="contributed">Tadžikistanski čas</standard>
+                                        <standard>Tadžikistanski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Tokelau">
                                 <long>
-                                        <standard draft="contributed">Tokelavski čas</standard>
+                                        <standard>Tokelavski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Tonga">
                                 <long>
-                                        <generic draft="contributed">Tongovski čas</generic>
-                                        <standard draft="contributed">Tongovski standardni čas</standard>
-                                        <daylight draft="contributed">Tongovski poletni čas</daylight>
+                                        <generic>Tongovski čas</generic>
+                                        <standard>Tongovski standardni čas</standard>
+                                        <daylight>Tongovski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Truk">
                                 <long>
-                                        <standard draft="contributed">Čas: Otok Chuuk</standard>
+                                        <standard>Čas: Otok Chuuk</standard>
                                 </long>
                         </metazone>
                         <metazone type="Turkmenistan">
                                 <long>
-                                        <generic draft="contributed">Turkmenistanski čas</generic>
-                                        <standard draft="contributed">Turkmenistanski standardni čas</standard>
-                                        <daylight draft="contributed">Turkmenistanski poletni čas</daylight>
+                                        <generic>Turkmenistanski čas</generic>
+                                        <standard>Turkmenistanski standardni čas</standard>
+                                        <daylight>Turkmenistanski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Tuvalu">
                                 <long>
-                                        <standard draft="contributed">Tuvalujski čas</standard>
+                                        <standard>Tuvalujski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Uruguay">
                                 <long>
-                                        <generic draft="contributed">Urugvajski čas</generic>
-                                        <standard draft="contributed">Urugvajski standardni čas</standard>
-                                        <daylight draft="contributed">Urugvajski poletni čas</daylight>
+                                        <generic>Urugvajski čas</generic>
+                                        <standard>Urugvajski standardni čas</standard>
+                                        <daylight>Urugvajski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Uzbekistan">
                                 <long>
-                                        <generic draft="contributed">Uzbekistanski čas</generic>
-                                        <standard draft="contributed">Uzbekistanski standardni čas</standard>
-                                        <daylight draft="contributed">Uzbekistanski poletni čas</daylight>
+                                        <generic>Uzbekistanski čas</generic>
+                                        <standard>Uzbekistanski standardni čas</standard>
+                                        <daylight>Uzbekistanski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Vanuatu">
                                 <long>
-                                        <generic draft="contributed">Vanuatujski čas</generic>
-                                        <standard draft="contributed">Vanuatujski standardni čas</standard>
-                                        <daylight draft="contributed">Vanuatujski poletni čas</daylight>
+                                        <generic>Vanuatujski čas</generic>
+                                        <standard>Vanuatujski standardni čas</standard>
+                                        <daylight>Vanuatujski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Venezuela">
                                 <long>
-                                        <standard draft="contributed">Venezuelski čas</standard>
+                                        <standard>Venezuelski čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Vladivostok">
                                 <long>
-                                        <generic draft="contributed">Vladivostoški čas</generic>
-                                        <standard draft="contributed">Vladivostoški standardni čas</standard>
-                                        <daylight draft="contributed">Vladivostoški poletni čas</daylight>
+                                        <generic>Vladivostoški čas</generic>
+                                        <standard>Vladivostoški standardni čas</standard>
+                                        <daylight>Vladivostoški poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Volgograd">
                                 <long>
                                         <generic>Volgograjski čas</generic>

@@ -4443,35 +5583,35 @@
                                         <daylight>Volgograjski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Vostok">
                                 <long>
-                                        <standard draft="contributed">Čas: Vostok</standard>
+                                        <standard>Vostoški čas</standard>
                                 </long>
                         </metazone>
                         <metazone type="Wake">
                                 <long>
-                                        <standard draft="contributed">Čas: Otok Wake</standard>
+                                        <standard>Čas: Otok Wake</standard>
                                 </long>
                         </metazone>
                         <metazone type="Wallis">
                                 <long>
-                                        <standard draft="contributed">Čas: Wallis in Futuna</standard>
+                                        <standard>Čas: Wallis in Futuna</standard>
                                 </long>
                         </metazone>
                         <metazone type="Yakutsk">
                                 <long>
-                                        <generic draft="contributed">Jakutski čas</generic>
-                                        <standard draft="contributed">Jakutski standardni čas</standard>
-                                        <daylight draft="contributed">Jakutski poletni čas</daylight>
+                                        <generic>Jakutski čas</generic>
+                                        <standard>Jakutski standardni čas</standard>
+                                        <daylight>Jakutski poletni čas</daylight>
                                 </long>
                         </metazone>
                         <metazone type="Yekaterinburg">
                                 <long>
-                                        <generic draft="contributed">Jekaterinburški čas</generic>
-                                        <standard draft="contributed">Jekaterinburški standardni čas</standard>
-                                        <daylight draft="contributed">Jekaterinburški poletni čas</daylight>
+                                        <generic>Jekaterinburški čas</generic>
+                                        <standard>Jekaterinburški standardni čas</standard>
+                                        <daylight>Jekaterinburški poletni čas</daylight>
                                 </long>
                         </metazone>
                 </timeZoneNames>
         </dates>
         <numbers>

@@ -4484,62 +5624,62 @@
                         <decimal>,</decimal>
                         <group>.</group>
                         <list>;</list>
                         <percentSign>%</percentSign>
                         <plusSign>+</plusSign>
-                        <minusSign>-</minusSign>
+                        <minusSign>−</minusSign>
                         <exponential>e</exponential>
                         <superscriptingExponent>×</superscriptingExponent>
                         <perMille>‰</perMille>
                         <infinity>∞</infinity>
                         <nan>NaN</nan>
-                        <timeSeparator draft="contributed">:</timeSeparator>
+                        <timeSeparator>:</timeSeparator>
                 </symbols>
                 <decimalFormats numberSystem="latn">
                         <decimalFormatLength>
                                 <decimalFormat>
                                         <pattern>#,##0.###</pattern>
                                 </decimalFormat>
                         </decimalFormatLength>
                         <decimalFormatLength type="long">
                                 <decimalFormat>
-                                        <pattern type="1000" count="one" draft="contributed">0 tisoč</pattern>
-                                        <pattern type="1000" count="two" draft="contributed">0 tisoč</pattern>
-                                        <pattern type="1000" count="few" draft="contributed">0 tisoč</pattern>
-                                        <pattern type="1000" count="other" draft="contributed">0 tisoč</pattern>
-                                        <pattern type="10000" count="one" draft="contributed">00 tisoč</pattern>
-                                        <pattern type="10000" count="two" draft="contributed">00 tisoč</pattern>
-                                        <pattern type="10000" count="few" draft="contributed">00 tisoč</pattern>
-                                        <pattern type="10000" count="other" draft="contributed">00 tisoč</pattern>
-                                        <pattern type="100000" count="one" draft="contributed">000 tisoč</pattern>
-                                        <pattern type="100000" count="two" draft="contributed">000 tisoč</pattern>
-                                        <pattern type="100000" count="few" draft="contributed">000 tisoč</pattern>
-                                        <pattern type="100000" count="other" draft="contributed">000 tisoč</pattern>
-                                        <pattern type="1000000" count="one" draft="contributed">0 milijon</pattern>
-                                        <pattern type="1000000" count="two" draft="contributed">0 milijona</pattern>
-                                        <pattern type="1000000" count="few" draft="contributed">0 milijone</pattern>
-                                        <pattern type="1000000" count="other" draft="contributed">0 milijonov</pattern>
-                                        <pattern type="10000000" count="one" draft="contributed">00 milijon</pattern>
-                                        <pattern type="10000000" count="two" draft="contributed">00 milijona</pattern>
-                                        <pattern type="10000000" count="few" draft="contributed">00 milijoni</pattern>
-                                        <pattern type="10000000" count="other" draft="contributed">00 milijonov</pattern>
-                                        <pattern type="100000000" count="one" draft="contributed">000 milijon</pattern>
-                                        <pattern type="100000000" count="two" draft="contributed">000 milijona</pattern>
-                                        <pattern type="100000000" count="few" draft="contributed">000 milijoni</pattern>
-                                        <pattern type="100000000" count="other" draft="contributed">000 milijonov</pattern>
-                                        <pattern type="1000000000" count="one" draft="contributed">0 milijarda</pattern>
-                                        <pattern type="1000000000" count="two" draft="contributed">0 milijardi</pattern>
-                                        <pattern type="1000000000" count="few" draft="contributed">0 milijarde</pattern>
-                                        <pattern type="1000000000" count="other" draft="contributed">0 milijard</pattern>
-                                        <pattern type="10000000000" count="one" draft="contributed">00 milijarda</pattern>
-                                        <pattern type="10000000000" count="two" draft="contributed">00 milijardi</pattern>
-                                        <pattern type="10000000000" count="few" draft="contributed">00 milijarde</pattern>
-                                        <pattern type="10000000000" count="other" draft="contributed">00 milijard</pattern>
-                                        <pattern type="100000000000" count="one" draft="contributed">000 milijarda</pattern>
-                                        <pattern type="100000000000" count="two" draft="contributed">000 milijardi</pattern>
-                                        <pattern type="100000000000" count="few" draft="contributed">000 milijarde</pattern>
-                                        <pattern type="100000000000" count="other" draft="contributed">000 milijard</pattern>
+                                        <pattern type="1000" count="one">0 tisoč</pattern>
+                                        <pattern type="1000" count="two">0 tisoč</pattern>
+                                        <pattern type="1000" count="few">0 tisoč</pattern>
+                                        <pattern type="1000" count="other">0 tisoč</pattern>
+                                        <pattern type="10000" count="one">00 tisoč</pattern>
+                                        <pattern type="10000" count="two">00 tisoč</pattern>
+                                        <pattern type="10000" count="few">00 tisoč</pattern>
+                                        <pattern type="10000" count="other">00 tisoč</pattern>
+                                        <pattern type="100000" count="one">000 tisoč</pattern>
+                                        <pattern type="100000" count="two">000 tisoč</pattern>
+                                        <pattern type="100000" count="few">000 tisoč</pattern>
+                                        <pattern type="100000" count="other">000 tisoč</pattern>
+                                        <pattern type="1000000" count="one">0 milijon</pattern>
+                                        <pattern type="1000000" count="two">0 milijona</pattern>
+                                        <pattern type="1000000" count="few">0 milijone</pattern>
+                                        <pattern type="1000000" count="other">0 milijonov</pattern>
+                                        <pattern type="10000000" count="one">00 milijon</pattern>
+                                        <pattern type="10000000" count="two">00 milijona</pattern>
+                                        <pattern type="10000000" count="few">00 milijoni</pattern>
+                                        <pattern type="10000000" count="other">00 milijonov</pattern>
+                                        <pattern type="100000000" count="one">000 milijon</pattern>
+                                        <pattern type="100000000" count="two">000 milijona</pattern>
+                                        <pattern type="100000000" count="few">000 milijoni</pattern>
+                                        <pattern type="100000000" count="other">000 milijonov</pattern>
+                                        <pattern type="1000000000" count="one">0 milijarda</pattern>
+                                        <pattern type="1000000000" count="two">0 milijardi</pattern>
+                                        <pattern type="1000000000" count="few">0 milijarde</pattern>
+                                        <pattern type="1000000000" count="other">0 milijard</pattern>
+                                        <pattern type="10000000000" count="one">00 milijarda</pattern>
+                                        <pattern type="10000000000" count="two">00 milijardi</pattern>
+                                        <pattern type="10000000000" count="few">00 milijarde</pattern>
+                                        <pattern type="10000000000" count="other">00 milijard</pattern>
+                                        <pattern type="100000000000" count="one">000 milijarda</pattern>
+                                        <pattern type="100000000000" count="two">000 milijardi</pattern>
+                                        <pattern type="100000000000" count="few">000 milijarde</pattern>
+                                        <pattern type="100000000000" count="other">000 milijard</pattern>
                                         <pattern type="1000000000000" count="one">0 bilijon</pattern>
                                         <pattern type="1000000000000" count="two">0 bilijona</pattern>
                                         <pattern type="1000000000000" count="few">0 bilijoni</pattern>
                                         <pattern type="1000000000000" count="other">0 bilijonov</pattern>
                                         <pattern type="10000000000000" count="one">00 bilijon</pattern>

@@ -4552,22 +5692,22 @@
                                         <pattern type="100000000000000" count="other">000 bilijonov</pattern>
                                 </decimalFormat>
                         </decimalFormatLength>
                         <decimalFormatLength type="short">
                                 <decimalFormat>
-                                        <pattern type="1000" count="one" draft="contributed">0 tis'.'</pattern>
-                                        <pattern type="1000" count="two" draft="contributed">0 tis'.'</pattern>
-                                        <pattern type="1000" count="few" draft="contributed">0 tis'.'</pattern>
-                                        <pattern type="1000" count="other" draft="contributed">0 tis'.'</pattern>
-                                        <pattern type="10000" count="one" draft="contributed">00 tis'.'</pattern>
-                                        <pattern type="10000" count="two" draft="contributed">00 tis'.'</pattern>
-                                        <pattern type="10000" count="few" draft="contributed">00 tis'.'</pattern>
-                                        <pattern type="10000" count="other" draft="contributed">00 tis'.'</pattern>
-                                        <pattern type="100000" count="one" draft="contributed">000 tis'.'</pattern>
-                                        <pattern type="100000" count="two" draft="contributed">000 tis'.'</pattern>
-                                        <pattern type="100000" count="few" draft="contributed">000 tis'.'</pattern>
-                                        <pattern type="100000" count="other" draft="contributed">000 tis'.'</pattern>
+                                        <pattern type="1000" count="one">0 tis'.'</pattern>
+                                        <pattern type="1000" count="two">0 tis'.'</pattern>
+                                        <pattern type="1000" count="few">0 tis'.'</pattern>
+                                        <pattern type="1000" count="other">0 tis'.'</pattern>
+                                        <pattern type="10000" count="one">00 tis'.'</pattern>
+                                        <pattern type="10000" count="two">00 tis'.'</pattern>
+                                        <pattern type="10000" count="few">00 tis'.'</pattern>
+                                        <pattern type="10000" count="other">00 tis'.'</pattern>
+                                        <pattern type="100000" count="one">000 tis'.'</pattern>
+                                        <pattern type="100000" count="two">000 tis'.'</pattern>
+                                        <pattern type="100000" count="few">000 tis'.'</pattern>
+                                        <pattern type="100000" count="other">000 tis'.'</pattern>
                                         <pattern type="1000000" count="one">0 mio'.'</pattern>
                                         <pattern type="1000000" count="two">0 mio'.'</pattern>
                                         <pattern type="1000000" count="few">0 mio'.'</pattern>
                                         <pattern type="1000000" count="other">0 mio'.'</pattern>
                                         <pattern type="10000000" count="one">00 mio'.'</pattern>

@@ -4588,22 +5728,22 @@
                                         <pattern type="10000000000" count="other">00 mrd'.'</pattern>
                                         <pattern type="100000000000" count="one">000 mrd'.'</pattern>
                                         <pattern type="100000000000" count="two">000 mrd'.'</pattern>
                                         <pattern type="100000000000" count="few">000 mrd'.'</pattern>
                                         <pattern type="100000000000" count="other">000 mrd'.'</pattern>
-                                        <pattern type="1000000000000" count="one" draft="contributed">0 bil'.'</pattern>
-                                        <pattern type="1000000000000" count="two" draft="contributed">0 bil'.'</pattern>
-                                        <pattern type="1000000000000" count="few" draft="contributed">0 bil'.'</pattern>
-                                        <pattern type="1000000000000" count="other" draft="contributed">0 bil'.'</pattern>
-                                        <pattern type="10000000000000" count="one" draft="contributed">00 bil'.'</pattern>
-                                        <pattern type="10000000000000" count="two" draft="contributed">00 bil'.'</pattern>
-                                        <pattern type="10000000000000" count="few" draft="contributed">00 bil'.'</pattern>
-                                        <pattern type="10000000000000" count="other" draft="contributed">00 bil'.'</pattern>
-                                        <pattern type="100000000000000" count="one" draft="contributed">000 bil'.'</pattern>
-                                        <pattern type="100000000000000" count="two" draft="contributed">000 bil'.'</pattern>
-                                        <pattern type="100000000000000" count="few" draft="contributed">000 bil'.'</pattern>
-                                        <pattern type="100000000000000" count="other" draft="contributed">000 bil'.'</pattern>
+                                        <pattern type="1000000000000" count="one">0 bil'.'</pattern>
+                                        <pattern type="1000000000000" count="two">0 bil'.'</pattern>
+                                        <pattern type="1000000000000" count="few">0 bil'.'</pattern>
+                                        <pattern type="1000000000000" count="other">0 bil'.'</pattern>
+                                        <pattern type="10000000000000" count="one">00 bil'.'</pattern>
+                                        <pattern type="10000000000000" count="two">00 bil'.'</pattern>
+                                        <pattern type="10000000000000" count="few">00 bil'.'</pattern>
+                                        <pattern type="10000000000000" count="other">00 bil'.'</pattern>
+                                        <pattern type="100000000000000" count="one">000 bil'.'</pattern>
+                                        <pattern type="100000000000000" count="two">000 bil'.'</pattern>
+                                        <pattern type="100000000000000" count="few">000 bil'.'</pattern>
+                                        <pattern type="100000000000000" count="other">000 bil'.'</pattern>
                                 </decimalFormat>
                         </decimalFormatLength>
                 </decimalFormats>
                 <scientificFormats numberSystem="latn">
                         <scientificFormatLength>

@@ -4613,11 +5753,11 @@
                         </scientificFormatLength>
                 </scientificFormats>
                 <percentFormats numberSystem="latn">
                         <percentFormatLength>
                                 <percentFormat>
-                                        <pattern>#,##0%</pattern>
+                                        <pattern>#,##0 %</pattern>
                                 </percentFormat>
                         </percentFormatLength>
                 </percentFormats>
                 <currencyFormats numberSystem="latn">
                         <currencyFormatLength>

@@ -4628,58 +5768,58 @@
                                         <pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
                         <currencyFormatLength type="short">
                                 <currencyFormat type="standard">
-                                        <pattern type="1000" count="one" draft="contributed">0 tis'.' ¤</pattern>
-                                        <pattern type="1000" count="two" draft="contributed">0 tis'.' ¤</pattern>
-                                        <pattern type="1000" count="few" draft="contributed">0 tis'.' ¤</pattern>
-                                        <pattern type="1000" count="other" draft="contributed">0 tis'.' ¤</pattern>
-                                        <pattern type="10000" count="one" draft="contributed">00 tis'.' ¤</pattern>
-                                        <pattern type="10000" count="two" draft="contributed">00 tis'.' ¤</pattern>
-                                        <pattern type="10000" count="few" draft="contributed">00 tis'.' ¤</pattern>
-                                        <pattern type="10000" count="other" draft="contributed">00 tis'.' ¤</pattern>
-                                        <pattern type="100000" count="one" draft="contributed">000 tis'.' ¤</pattern>
-                                        <pattern type="100000" count="two" draft="contributed">000 tis'.' ¤</pattern>
-                                        <pattern type="100000" count="few" draft="contributed">000 tis'.' ¤</pattern>
-                                        <pattern type="100000" count="other" draft="contributed">000 tis'.' ¤</pattern>
-                                        <pattern type="1000000" count="one" draft="contributed">0 mio'.' ¤</pattern>
-                                        <pattern type="1000000" count="two" draft="contributed">0 mio'.' ¤</pattern>
-                                        <pattern type="1000000" count="few" draft="contributed">0 mio'.' ¤</pattern>
-                                        <pattern type="1000000" count="other" draft="contributed">0 mio'.' ¤</pattern>
-                                        <pattern type="10000000" count="one" draft="contributed">00 mio'.' ¤</pattern>
-                                        <pattern type="10000000" count="two" draft="contributed">00 mio'.' ¤</pattern>
-                                        <pattern type="10000000" count="few" draft="contributed">00 mio'.' ¤</pattern>
-                                        <pattern type="10000000" count="other" draft="contributed">00 mio'.' ¤</pattern>
-                                        <pattern type="100000000" count="one" draft="contributed">000 mio'.' ¤</pattern>
-                                        <pattern type="100000000" count="two" draft="contributed">000 mio'.' ¤</pattern>
-                                        <pattern type="100000000" count="few" draft="contributed">000 mio'.' ¤</pattern>
-                                        <pattern type="100000000" count="other" draft="contributed">000 mio'.' ¤</pattern>
-                                        <pattern type="1000000000" count="one" draft="contributed">0 mrd'.' ¤</pattern>
-                                        <pattern type="1000000000" count="two" draft="contributed">0 mrd'.' ¤</pattern>
-                                        <pattern type="1000000000" count="few" draft="contributed">0 mrd'.' ¤</pattern>
-                                        <pattern type="1000000000" count="other" draft="contributed">0 mrd'.' ¤</pattern>
-                                        <pattern type="10000000000" count="one" draft="contributed">00 mrd'.' ¤</pattern>
-                                        <pattern type="10000000000" count="two" draft="contributed">00 mrd'.' ¤</pattern>
-                                        <pattern type="10000000000" count="few" draft="contributed">00 mrd'.' ¤</pattern>
-                                        <pattern type="10000000000" count="other" draft="contributed">00 mrd'.' ¤</pattern>
-                                        <pattern type="100000000000" count="one" draft="contributed">000 mrd'.' ¤</pattern>
-                                        <pattern type="100000000000" count="two" draft="contributed">000 mrd'.' ¤</pattern>
-                                        <pattern type="100000000000" count="few" draft="contributed">000 mrd'.' ¤</pattern>
-                                        <pattern type="100000000000" count="other" draft="contributed">000 mrd'.' ¤</pattern>
-                                        <pattern type="1000000000000" count="one" draft="contributed">0 bil'.' ¤</pattern>
-                                        <pattern type="1000000000000" count="two" draft="contributed">0 bil'.' ¤</pattern>
-                                        <pattern type="1000000000000" count="few" draft="contributed">0 bil'.' ¤</pattern>
-                                        <pattern type="1000000000000" count="other" draft="contributed">0 bil'.' ¤</pattern>
-                                        <pattern type="10000000000000" count="one" draft="contributed">00 bil'.' ¤</pattern>
-                                        <pattern type="10000000000000" count="two" draft="contributed">00 bil'.' ¤</pattern>
-                                        <pattern type="10000000000000" count="few" draft="contributed">00 bil'.' ¤</pattern>
-                                        <pattern type="10000000000000" count="other" draft="contributed">00 bil'.' ¤</pattern>
-                                        <pattern type="100000000000000" count="one" draft="contributed">000 bil'.' ¤</pattern>
-                                        <pattern type="100000000000000" count="two" draft="contributed">000 bil'.' ¤</pattern>
-                                        <pattern type="100000000000000" count="few" draft="contributed">000 bil'.' ¤</pattern>
-                                        <pattern type="100000000000000" count="other" draft="contributed">000 bil'.' ¤</pattern>
+                                        <pattern type="1000" count="one">0 tis'.' ¤</pattern>
+                                        <pattern type="1000" count="two">0 tis'.' ¤</pattern>
+                                        <pattern type="1000" count="few">0 tis'.' ¤</pattern>
+                                        <pattern type="1000" count="other">0 tis'.' ¤</pattern>
+                                        <pattern type="10000" count="one">00 tis'.' ¤</pattern>
+                                        <pattern type="10000" count="two">00 tis'.' ¤</pattern>
+                                        <pattern type="10000" count="few">00 tis'.' ¤</pattern>
+                                        <pattern type="10000" count="other">00 tis'.' ¤</pattern>
+                                        <pattern type="100000" count="one">000 tis'.' ¤</pattern>
+                                        <pattern type="100000" count="two">000 tis'.' ¤</pattern>
+                                        <pattern type="100000" count="few">000 tis'.' ¤</pattern>
+                                        <pattern type="100000" count="other">000 tis'.' ¤</pattern>
+                                        <pattern type="1000000" count="one">0 mio'.' ¤</pattern>
+                                        <pattern type="1000000" count="two">0 mio'.' ¤</pattern>
+                                        <pattern type="1000000" count="few">0 mio'.' ¤</pattern>
+                                        <pattern type="1000000" count="other">0 mio'.' ¤</pattern>
+                                        <pattern type="10000000" count="one">00 mio'.' ¤</pattern>
+                                        <pattern type="10000000" count="two">00 mio'.' ¤</pattern>
+                                        <pattern type="10000000" count="few">00 mio'.' ¤</pattern>
+                                        <pattern type="10000000" count="other">00 mio'.' ¤</pattern>
+                                        <pattern type="100000000" count="one">000 mio'.' ¤</pattern>
+                                        <pattern type="100000000" count="two">000 mio'.' ¤</pattern>
+                                        <pattern type="100000000" count="few">000 mio'.' ¤</pattern>
+                                        <pattern type="100000000" count="other">000 mio'.' ¤</pattern>
+                                        <pattern type="1000000000" count="one">0 mrd'.' ¤</pattern>
+                                        <pattern type="1000000000" count="two">0 mrd'.' ¤</pattern>
+                                        <pattern type="1000000000" count="few">0 mrd'.' ¤</pattern>
+                                        <pattern type="1000000000" count="other">0 mrd'.' ¤</pattern>
+                                        <pattern type="10000000000" count="one">00 mrd'.' ¤</pattern>
+                                        <pattern type="10000000000" count="two">00 mrd'.' ¤</pattern>
+                                        <pattern type="10000000000" count="few">00 mrd'.' ¤</pattern>
+                                        <pattern type="10000000000" count="other">00 mrd'.' ¤</pattern>
+                                        <pattern type="100000000000" count="one">000 mrd'.' ¤</pattern>
+                                        <pattern type="100000000000" count="two">000 mrd'.' ¤</pattern>
+                                        <pattern type="100000000000" count="few">000 mrd'.' ¤</pattern>
+                                        <pattern type="100000000000" count="other">000 mrd'.' ¤</pattern>
+                                        <pattern type="1000000000000" count="one">0 bil'.' ¤</pattern>
+                                        <pattern type="1000000000000" count="two">0 bil'.' ¤</pattern>
+                                        <pattern type="1000000000000" count="few">0 bil'.' ¤</pattern>
+                                        <pattern type="1000000000000" count="other">0 bil'.' ¤</pattern>
+                                        <pattern type="10000000000000" count="one">00 bil'.' ¤</pattern>
+                                        <pattern type="10000000000000" count="two">00 bil'.' ¤</pattern>
+                                        <pattern type="10000000000000" count="few">00 bil'.' ¤</pattern>
+                                        <pattern type="10000000000000" count="other">00 bil'.' ¤</pattern>
+                                        <pattern type="100000000000000" count="one">000 bil'.' ¤</pattern>
+                                        <pattern type="100000000000000" count="two">000 bil'.' ¤</pattern>
+                                        <pattern type="100000000000000" count="few">000 bil'.' ¤</pattern>
+                                        <pattern type="100000000000000" count="other">000 bil'.' ¤</pattern>
                                 </currencyFormat>
                         </currencyFormatLength>
                         <unitPattern count="one">{0} {1}</unitPattern>
                         <unitPattern count="two">{0} {1}</unitPattern>
                         <unitPattern count="few">{0} {1}</unitPattern>

@@ -4701,27 +5841,27 @@
                                 <displayName>stari afganistanski afgani (1927–2002)</displayName>
                         </currency>
                         <currency type="AFN">
                                 <displayName>afgani</displayName>
                                 <displayName count="one">afgani</displayName>
-                                <displayName count="two">afgani</displayName>
-                                <displayName count="few">afgani</displayName>
-                                <displayName count="other">afgani</displayName>
+                                <displayName count="two">afganija</displayName>
+                                <displayName count="few">afganiji</displayName>
+                                <displayName count="other">afganijev</displayName>
                                 <symbol draft="contributed">AFN</symbol>
                         </currency>
                         <currency type="ALL">
                                 <displayName>albanski lek</displayName>
                                 <displayName count="one">albanski lek</displayName>
                                 <displayName count="two">albanska leka</displayName>
                                 <displayName count="few">albanski leki</displayName>
-                                <displayName count="other">albanski lek</displayName>
+                                <displayName count="other">albanskih lekov</displayName>
                                 <symbol draft="contributed">ALL</symbol>
                         </currency>
                         <currency type="AMD">
                                 <displayName>armenski dram</displayName>
                                 <displayName count="one">armenski dram</displayName>
-                                <displayName count="two">armenski dram</displayName>
+                                <displayName count="two">armenska drama</displayName>
                                 <displayName count="few">armenski drami</displayName>
                                 <displayName count="other">armenskih dramov</displayName>
                                 <symbol draft="contributed">AMD</symbol>
                         </currency>
                         <currency type="ANG">

@@ -4759,32 +5899,32 @@
                         <currency type="ARS">
                                 <displayName>argentinski peso</displayName>
                                 <displayName count="one">argentinski peso</displayName>
                                 <displayName count="two">argentinska pesa</displayName>
                                 <displayName count="few">argentinski pesi</displayName>
-                                <displayName count="other">argentinski peso</displayName>
+                                <displayName count="other">argentinskih pesov</displayName>
                                 <symbol draft="contributed">ARS</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="ATS">
                                 <displayName>avstrijski šiling</displayName>
                         </currency>
                         <currency type="AUD">
                                 <displayName>avstralski dolar</displayName>
-                                <displayName count="one" draft="contributed">avstralski dolar</displayName>
-                                <displayName count="two" draft="contributed">avstralska dolarja</displayName>
-                                <displayName count="few" draft="contributed">avstralski dolarji</displayName>
-                                <displayName count="other" draft="contributed">avstralskih dolarjev</displayName>
-                                <symbol draft="contributed">A$</symbol>
+                                <displayName count="one">avstralski dolar</displayName>
+                                <displayName count="two">avstralska dolarja</displayName>
+                                <displayName count="few">avstralski dolarji</displayName>
+                                <displayName count="other">avstralskih dolarjev</displayName>
+                                <symbol draft="contributed">AUD</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="AWG">
                                 <displayName>arubski florin</displayName>
                                 <displayName count="one">arubski florin</displayName>
-                                <displayName count="two">arubski florin</displayName>
+                                <displayName count="two">arubska florina</displayName>
                                 <displayName count="few">arubski florin</displayName>
-                                <displayName count="other">arubski florin</displayName>
+                                <displayName count="other">arubskih florinov</displayName>
                                 <symbol draft="contributed">AWG</symbol>
                         </currency>
                         <currency type="AZM">
                                 <displayName>stari azerbajdžanski manat (1993–2006)</displayName>
                         </currency>

@@ -4799,14 +5939,14 @@
                         <currency type="BAD">
                                 <displayName>bosansko-hercegovski dinar</displayName>
                         </currency>
                         <currency type="BAM">
                                 <displayName>bosansko-hercegovska konvertibilna marka</displayName>
-                                <displayName count="one" draft="contributed">bosansko-hercegovska konvertibilna marka</displayName>
-                                <displayName count="two" draft="contributed">bosansko-hercegovski konvertibilni marki</displayName>
-                                <displayName count="few" draft="contributed">bosansko-hercegovske konvertibilne marke</displayName>
-                                <displayName count="other" draft="contributed">bosansko-hercegovskih konvertibilnih mark</displayName>
+                                <displayName count="one">bosansko-hercegovska konvertibilna marka</displayName>
+                                <displayName count="two">bosansko-hercegovski konvertibilni marki</displayName>
+                                <displayName count="few">bosansko-hercegovske konvertibilne marke</displayName>
+                                <displayName count="other">bosansko-hercegovskih konvertibilnih mark</displayName>
                                 <symbol draft="contributed">BAM</symbol>
                                 <symbol alt="narrow" draft="contributed">KM</symbol>
                         </currency>
                         <currency type="BBD">
                                 <displayName>barbadoški dolar</displayName>

@@ -4851,13 +5991,13 @@
                                 <symbol draft="contributed">BGN</symbol>
                         </currency>
                         <currency type="BHD">
                                 <displayName>bahranski dinar</displayName>
                                 <displayName count="one">bahranski dinar</displayName>
-                                <displayName count="two">bahranski dinar</displayName>
-                                <displayName count="few">bahranski dinar</displayName>
-                                <displayName count="other">bahranski dinar</displayName>
+                                <displayName count="two">bahranska dinarja</displayName>
+                                <displayName count="few">bahranski dinarji</displayName>
+                                <displayName count="other">bahranskih dinarjev</displayName>
                                 <symbol draft="contributed">BHD</symbol>
                         </currency>
                         <currency type="BIF">
                                 <displayName>burundski frank</displayName>
                                 <displayName count="one">burundski frank</displayName>

@@ -4912,11 +6052,11 @@
                                 <displayName>brazilski real</displayName>
                                 <displayName count="one">brazilski real</displayName>
                                 <displayName count="two">brazilska reala</displayName>
                                 <displayName count="few">brazilski reali</displayName>
                                 <displayName count="other">brazilskih realov</displayName>
-                                <symbol draft="contributed">R$</symbol>
+                                <symbol draft="contributed">BRL</symbol>
                                 <symbol alt="narrow" draft="contributed">R$</symbol>
                         </currency>
                         <currency type="BRN">
                                 <displayName>novi brazilski kruzado</displayName>
                         </currency>

@@ -4953,19 +6093,27 @@
                                 <symbol alt="narrow" draft="contributed">P</symbol>
                         </currency>
                         <currency type="BYB">
                                 <displayName>beloruski novi rubelj (1994–1999)</displayName>
                         </currency>
-                        <currency type="BYR">
+                        <currency type="BYN">
                                 <displayName>beloruski rubelj</displayName>
                                 <displayName count="one">beloruski rubelj</displayName>
                                 <displayName count="two">beloruska rublja</displayName>
                                 <displayName count="few">beloruski rublji</displayName>
                                 <displayName count="other">beloruskih rubljev</displayName>
-                                <symbol draft="contributed">BYR</symbol>
+                                <symbol draft="contributed">BYN</symbol>
                                 <symbol alt="narrow" draft="contributed">р.</symbol>
                         </currency>
+                        <currency type="BYR">
+                                <displayName>beloruski rubelj (2000–2016)</displayName>
+                                <displayName count="one">beloruski rubelj (2000–2016)</displayName>
+                                <displayName count="two">beloruska rublja (2000–2016)</displayName>
+                                <displayName count="few">beloruski rublji (2000–2016)</displayName>
+                                <displayName count="other">beloruskih rubljev (2000–2016)</displayName>
+                                <symbol draft="contributed">BYR</symbol>
+                        </currency>
                         <currency type="BZD">
                                 <displayName>belizejski dolar</displayName>
                                 <displayName count="one">belizejski dolar</displayName>
                                 <displayName count="two">belizejska dolarja</displayName>
                                 <displayName count="few">belizejski dolarji</displayName>

@@ -4985,11 +6133,11 @@
                         <currency type="CDF">
                                 <displayName>kongoški frank</displayName>
                                 <displayName count="one">kongoški frank</displayName>
                                 <displayName count="two">kongoška franka</displayName>
                                 <displayName count="few">kongoški frank</displayName>
-                                <displayName count="other">kongoški frank</displayName>
+                                <displayName count="other">kongoških frankov</displayName>
                                 <symbol draft="contributed">CDF</symbol>
                         </currency>
                         <currency type="CHE">
                                 <displayName>evro WIR</displayName>
                         </currency>

@@ -5014,16 +6162,24 @@
                                 <displayName count="few">čilski pesi</displayName>
                                 <displayName count="other">čilskih pesov</displayName>
                                 <symbol draft="contributed">CLP</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
+                        <currency type="CNH">
+                                <displayName draft="contributed">kitajski juan (offshore)</displayName>
+                                <displayName count="one" draft="contributed">kitajski juan renminbi (offshore)</displayName>
+                                <displayName count="two" draft="contributed">kitajska juana renminbi (offshore)</displayName>
+                                <displayName count="few" draft="contributed">kitajski juani renminbi (offshore)</displayName>
+                                <displayName count="other" draft="contributed">kitajskih juanov renminbi (offshore)</displayName>
+                                <symbol draft="contributed">CNH</symbol>
+                        </currency>
                         <currency type="CNY">
                                 <displayName>kitajski juan</displayName>
                                 <displayName count="one">kitajski juan renminbi</displayName>
-                                <displayName count="two">kitajski juan renminbi</displayName>
-                                <displayName count="few">kitajski juan renminbi</displayName>
-                                <displayName count="other">kitajski juan renminbi</displayName>
+                                <displayName count="two">kitajska juana renmibi</displayName>
+                                <displayName count="few">kitajski juani renminbi</displayName>
+                                <displayName count="other">kitajskih juanov renminbi</displayName>
                                 <symbol draft="contributed">CN¥</symbol>
                                 <symbol alt="narrow" draft="contributed">¥</symbol>
                         </currency>
                         <currency type="COP">
                                 <displayName>kolumbijski peso</displayName>

@@ -5108,14 +6264,14 @@
                                 <displayName count="other">džibutskih frankov</displayName>
                                 <symbol draft="contributed">DJF</symbol>
                         </currency>
                         <currency type="DKK">
                                 <displayName>danska krona</displayName>
-                                <displayName count="one" draft="contributed">danska krona</displayName>
-                                <displayName count="two" draft="contributed">danski kroni</displayName>
-                                <displayName count="few" draft="contributed">danske krone</displayName>
-                                <displayName count="other" draft="contributed">danskih kron</displayName>
+                                <displayName count="one">danska krona</displayName>
+                                <displayName count="two">danski kroni</displayName>
+                                <displayName count="few">danske krone</displayName>
+                                <displayName count="other">danskih kron</displayName>
                                 <symbol draft="contributed">DKK</symbol>
                                 <symbol alt="narrow" draft="contributed">kr</symbol>
                         </currency>
                         <currency type="DOP">
                                 <displayName>dominikanski peso</displayName>

@@ -5177,16 +6333,16 @@
                                 <displayName count="other">etiopskih birov</displayName>
                                 <symbol draft="contributed">ETB</symbol>
                         </currency>
                         <currency type="EUR">
                                 <displayName>evro</displayName>
-                                <displayName count="one" draft="contributed">evro</displayName>
-                                <displayName count="two" draft="contributed">evra</displayName>
-                                <displayName count="few" draft="contributed">evri</displayName>
-                                <displayName count="other" draft="contributed">evrov</displayName>
-                                <symbol draft="contributed">€</symbol>
-                                <symbol alt="narrow" draft="contributed">€</symbol>
+                                <displayName count="one">evro</displayName>
+                                <displayName count="two">evra</displayName>
+                                <displayName count="few">evri</displayName>
+                                <displayName count="other">evrov</displayName>
+                                <symbol>€</symbol>
+                                <symbol alt="narrow">€</symbol>
                         </currency>
                         <currency type="FIM">
                                 <displayName>finska marka</displayName>
                         </currency>
                         <currency type="FJD">

@@ -5214,34 +6370,35 @@
                                 <displayName>britanski funt</displayName>
                                 <displayName count="one">britanski funt</displayName>
                                 <displayName count="two">britanska funta</displayName>
                                 <displayName count="few">britanski funti</displayName>
                                 <displayName count="other">britanskih funtov</displayName>
-                                <symbol draft="contributed">£</symbol>
+                                <symbol draft="contributed">GBP</symbol>
                                 <symbol alt="narrow" draft="contributed">£</symbol>
                         </currency>
                         <currency type="GEK">
                                 <displayName>gruzijski bon lari</displayName>
                         </currency>
                         <currency type="GEL">
                                 <displayName>gruzijski lari</displayName>
                                 <displayName count="one">gruzijski lari</displayName>
-                                <displayName count="two">gruzijska lara</displayName>
+                                <displayName count="two">gruzijska larija</displayName>
                                 <displayName count="few">gruzijski lari</displayName>
-                                <displayName count="other">gruzijskih larov</displayName>
+                                <displayName count="other">gruzijskih larijev</displayName>
                                 <symbol draft="contributed">GEL</symbol>
+                                <symbol alt="narrow" draft="contributed">₾</symbol>
                                 <symbol alt="variant" draft="contributed">₾</symbol>
                         </currency>
                         <currency type="GHC">
                                 <displayName>stari ganski cedi (1979–2007)</displayName>
                         </currency>
                         <currency type="GHS">
                                 <displayName>ganski cedi</displayName>
                                 <displayName count="one">ganski cedi</displayName>
-                                <displayName count="two">ganski cedi</displayName>
+                                <displayName count="two">ganska ceda</displayName>
                                 <displayName count="few">ganski cedi</displayName>
-                                <displayName count="other">ganski cedi</displayName>
+                                <displayName count="other">ganskih cedov</displayName>
                                 <symbol draft="contributed">GHS</symbol>
                         </currency>
                         <currency type="GIP">
                                 <displayName>gibraltarski funt</displayName>
                                 <displayName count="one">gibraltarski funt</displayName>

@@ -5392,11 +6549,11 @@
                         <currency type="IRR">
                                 <displayName>iranski rial</displayName>
                                 <displayName count="one">iranski rial</displayName>
                                 <displayName count="two">iranska riala</displayName>
                                 <displayName count="few">iranski riali</displayName>
-                                <displayName count="other">iranski rial</displayName>
+                                <displayName count="other">iranskih rialov</displayName>
                                 <symbol draft="contributed">IRR</symbol>
                         </currency>
                         <currency type="ISK">
                                 <displayName>islandska krona</displayName>
                                 <displayName count="one">islandska krona</displayName>

@@ -5505,13 +6662,13 @@
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="KZT">
                                 <displayName>kazahstanski tenge</displayName>
                                 <displayName count="one">kazahstanski tenge</displayName>
-                                <displayName count="two">kazahstanski tenge</displayName>
+                                <displayName count="two">kazahstanska tenga</displayName>
                                 <displayName count="few">kazahstanski tenge</displayName>
-                                <displayName count="other">kazahstanski tenge</displayName>
+                                <displayName count="other">kazahstanskih tengov</displayName>
                                 <symbol draft="contributed">KZT</symbol>
                                 <symbol alt="narrow" draft="contributed">₸</symbol>
                         </currency>
                         <currency type="LAK">
                                 <displayName>laoški kip</displayName>

@@ -5603,13 +6760,13 @@
                                 <displayName>maroški frank</displayName>
                         </currency>
                         <currency type="MDL">
                                 <displayName>moldavijski leu</displayName>
                                 <displayName count="one">moldavijski leu</displayName>
-                                <displayName count="two">moldavijski leu</displayName>
+                                <displayName count="two">moldavijska leua</displayName>
                                 <displayName count="few">moldavijski leu</displayName>
-                                <displayName count="other">moldavijski leu</displayName>
+                                <displayName count="other">moldavijskih leuov</displayName>
                                 <symbol draft="contributed">MDL</symbol>
                         </currency>
                         <currency type="MGA">
                                 <displayName>malgaški ariarij</displayName>
                                 <displayName count="one">malgaški ariarij</displayName>

@@ -5658,16 +6815,23 @@
                                 <displayName count="few">makavske patake</displayName>
                                 <displayName count="other">makavskih patak</displayName>
                                 <symbol draft="contributed">MOP</symbol>
                         </currency>
                         <currency type="MRO">
+                                <displayName>mavretanska uguija (1973–2017)</displayName>
+                                <displayName count="one">mavretanska uguija (1973–2017)</displayName>
+                                <displayName count="two">mavretanski uguiji (1973–2017)</displayName>
+                                <displayName count="few">mavretanske uguije (1973–2017)</displayName>
+                                <displayName count="other">mavretanskih uguij (1973–2017)</displayName>
+                                <symbol draft="contributed">MRO</symbol>
+                        </currency>
+                        <currency type="MRU">
                                 <displayName>mavretanska uguija</displayName>
                                 <displayName count="one">mavretanska uguija</displayName>
                                 <displayName count="two">mavretanski uguiji</displayName>
                                 <displayName count="few">mavretanske uguije</displayName>
                                 <displayName count="other">mavretanskih uguij</displayName>
-                                <symbol draft="contributed">MRO</symbol>
                         </currency>
                         <currency type="MTL">
                                 <displayName>malteška lira</displayName>
                         </currency>
                         <currency type="MTP">

@@ -5702,11 +6866,11 @@
                                 <displayName>mehiški peso</displayName>
                                 <displayName count="one">mehiški peso</displayName>
                                 <displayName count="two">mehiška pesa</displayName>
                                 <displayName count="few">mehiški pesi</displayName>
                                 <displayName count="other">mehiških pesov</displayName>
-                                <symbol draft="contributed">MX$</symbol>
+                                <symbol draft="contributed">MXN</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="MXP">
                                 <displayName>mehiški srebrni peso (1861–1992)</displayName>
                         </currency>

@@ -5791,11 +6955,11 @@
                                 <displayName>novozelandski dolar</displayName>
                                 <displayName count="one">novozelandski dolar</displayName>
                                 <displayName count="two">novozelandska dolarja</displayName>
                                 <displayName count="few">novozelandski dolarji</displayName>
                                 <displayName count="other">novozelandskih dolarjev</displayName>
-                                <symbol draft="contributed">NZ$</symbol>
+                                <symbol draft="contributed">NZD</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="OMR">
                                 <displayName>omanski rial</displayName>
                                 <displayName count="one">omanski rial</displayName>

@@ -5814,26 +6978,31 @@
                         </currency>
                         <currency type="PEI">
                                 <displayName>perujski inti</displayName>
                         </currency>
                         <currency type="PEN">
-                                <displayName>perujski novi sol</displayName>
-                                <displayName count="one">perujski novi sol</displayName>
-                                <displayName count="two">perujska nova sola</displayName>
-                                <displayName count="few">perujski novi soli</displayName>
-                                <displayName count="other">perujskih novih solov</displayName>
+                                <displayName>perujski sol</displayName>
+                                <displayName count="one">perujski sol</displayName>
+                                <displayName count="two">perujska sola</displayName>
+                                <displayName count="few">perujski soli</displayName>
+                                <displayName count="other">perujskih solov</displayName>
                                 <symbol draft="contributed">PEN</symbol>
                         </currency>
                         <currency type="PES">
-                                <displayName>perujski sol</displayName>
+                                <displayName>perujski sol (1863–1965)</displayName>
+                                <displayName count="one">perujski sol (1863–1965)</displayName>
+                                <displayName count="two">perujska sola (1863–1965)</displayName>
+                                <displayName count="few">perujski soli (1863–1965)</displayName>
+                                <displayName count="other">perujskih solov (1863–1965)</displayName>
+                                <symbol draft="contributed">PES</symbol>
                         </currency>
                         <currency type="PGK">
                                 <displayName>kina Papue Nove Gvineje</displayName>
                                 <displayName count="one">kina Papue Nove Gvineje</displayName>
-                                <displayName count="two">kina Papue Nove Gvineje</displayName>
-                                <displayName count="few">kina Papue Nove Gvineje</displayName>
-                                <displayName count="other">kina Papue Nove Gvineje</displayName>
+                                <displayName count="two">kini Papue Nove Gvineje</displayName>
+                                <displayName count="few">kine Papue Nove Gvineje</displayName>
+                                <displayName count="other">kin Papue Nove Gvineje</displayName>
                                 <symbol draft="contributed">PGK</symbol>
                         </currency>
                         <currency type="PHP">
                                 <displayName>filipinski peso</displayName>
                                 <displayName count="one">filipinski peso</displayName>

@@ -5868,13 +7037,13 @@
                                 <displayName>portugalski eskudo</displayName>
                         </currency>
                         <currency type="PYG">
                                 <displayName>paragvajski gvarani</displayName>
                                 <displayName count="one">paragvajski gvarani</displayName>
-                                <displayName count="two">paragvajski gvarani</displayName>
+                                <displayName count="two">paragvajska gvaranija</displayName>
                                 <displayName count="few">paragvajski gvarani</displayName>
-                                <displayName count="other">paragvajski gvarani</displayName>
+                                <displayName count="other">paragvajskih gvaranijev</displayName>
                                 <symbol draft="contributed">PYG</symbol>
                                 <symbol alt="narrow" draft="contributed">₲</symbol>
                         </currency>
                         <currency type="QAR">
                                 <displayName>katarski rial</displayName>

@@ -5891,14 +7060,15 @@
                                 <displayName>stari romunski leu</displayName>
                         </currency>
                         <currency type="RON">
                                 <displayName>romunski leu</displayName>
                                 <displayName count="one">romunski leu</displayName>
-                                <displayName count="two">romunski leu</displayName>
+                                <displayName count="two">romunska leua</displayName>
                                 <displayName count="few">romunski leu</displayName>
-                                <displayName count="other">romunski leu</displayName>
+                                <displayName count="other">romunskih leuov</displayName>
                                 <symbol draft="contributed">RON</symbol>
+                                <symbol alt="narrow" draft="contributed">lei</symbol>
                         </currency>
                         <currency type="RSD">
                                 <displayName>srbski dinar</displayName>
                                 <displayName count="one">srbski dinar</displayName>
                                 <displayName count="two">srbska dinarja</displayName>

@@ -6034,25 +7204,33 @@
                         </currency>
                         <currency type="SRG">
                                 <displayName>surinamski gulden</displayName>
                         </currency>
                         <currency type="SSP">
-                                <displayName draft="contributed">južnosudanski funt</displayName>
-                                <displayName count="one" draft="contributed">južnosudanski funt</displayName>
-                                <displayName count="two" draft="contributed">južnosudanska funta</displayName>
-                                <displayName count="few" draft="contributed">južnosudanski funti</displayName>
-                                <displayName count="other" draft="contributed">južnosudanskih funtov</displayName>
+                                <displayName>južnosudanski funt</displayName>
+                                <displayName count="one">južnosudanski funt</displayName>
+                                <displayName count="two">južnosudanska funta</displayName>
+                                <displayName count="few">južnosudanski funti</displayName>
+                                <displayName count="other">južnosudanskih funtov</displayName>
                                 <symbol draft="contributed">SSP</symbol>
                                 <symbol alt="narrow" draft="contributed">£</symbol>
                         </currency>
                         <currency type="STD">
+                                <displayName>saotomejska dobra (1977–2017)</displayName>
+                                <displayName count="one">saotomejska dobra (1977–2017)</displayName>
+                                <displayName count="two">saotomejski dobri (1977–2017)</displayName>
+                                <displayName count="few">saotomejske dobre (1977–2017)</displayName>
+                                <displayName count="other">saotomejskih dober (1977–2017)</displayName>
+                                <symbol draft="contributed">STD</symbol>
+                        </currency>
+                        <currency type="STN">
                                 <displayName>saotomejska dobra</displayName>
                                 <displayName count="one">saotomejska dobra</displayName>
                                 <displayName count="two">saotomejski dobri</displayName>
                                 <displayName count="few">saotomejske dobre</displayName>
                                 <displayName count="other">saotomejskih dober</displayName>
-                                <symbol draft="contributed">STD</symbol>
+                                <symbol draft="contributed">STN</symbol>
                                 <symbol alt="narrow" draft="contributed">Db</symbol>
                         </currency>
                         <currency type="SUR">
                                 <displayName>sovjetski rubelj</displayName>
                         </currency>

@@ -6069,33 +7247,33 @@
                                 <symbol alt="narrow" draft="contributed">£</symbol>
                         </currency>
                         <currency type="SZL">
                                 <displayName>svazijski lilangeni</displayName>
                                 <displayName count="one">svazijski lilangeni</displayName>
-                                <displayName count="two">svazijski lilangeni</displayName>
+                                <displayName count="two">svazijska lilangenija</displayName>
                                 <displayName count="few">svazijski lilangeni</displayName>
-                                <displayName count="other">svazijski lilangeni</displayName>
+                                <displayName count="other">svazijskih lilangenijev</displayName>
                                 <symbol draft="contributed">SZL</symbol>
                         </currency>
                         <currency type="THB">
                                 <displayName>tajski baht</displayName>
                                 <displayName count="one">tajski baht</displayName>
                                 <displayName count="two">tajska bahta</displayName>
                                 <displayName count="few">tajski bahti</displayName>
                                 <displayName count="other">tajskih bahtov</displayName>
-                                <symbol draft="contributed">฿</symbol>
+                                <symbol draft="contributed">THB</symbol>
                                 <symbol alt="narrow" draft="contributed">฿</symbol>
                         </currency>
                         <currency type="TJR">
                                 <displayName>tadžikistanski rubelj</displayName>
                         </currency>
                         <currency type="TJS">
                                 <displayName>tadžikistanski somoni</displayName>
                                 <displayName count="one">tadžikistanski somoni</displayName>
-                                <displayName count="two">tadžikistanski somoni</displayName>
+                                <displayName count="two">tadžikistanska somona</displayName>
                                 <displayName count="few">tadžikistanski somoni</displayName>
-                                <displayName count="other">tadžikistanski somoni</displayName>
+                                <displayName count="other">tadžikistanskih somonov</displayName>
                                 <symbol draft="contributed">TJS</symbol>
                         </currency>
                         <currency type="TMM">
                                 <displayName>turkmenski manat</displayName>
                         </currency>

@@ -6110,19 +7288,19 @@
                         <currency type="TND">
                                 <displayName>tunizijski dinar</displayName>
                                 <displayName count="one">tunizijski dinar</displayName>
                                 <displayName count="two">tunizijska dinarja</displayName>
                                 <displayName count="few">tunizijski dinarji</displayName>
-                                <displayName count="other">tunizijski dinar</displayName>
+                                <displayName count="other">tunizijskih dinarjev</displayName>
                                 <symbol draft="contributed">TND</symbol>
                         </currency>
                         <currency type="TOP">
                                 <displayName>tongovska paanga</displayName>
                                 <displayName count="one">tongovska paanga</displayName>
                                 <displayName count="two">tongovski paangi</displayName>
                                 <displayName count="few">tongovske paange</displayName>
-                                <displayName count="other">tongovska paanga</displayName>
+                                <displayName count="other">tongovskih paang</displayName>
                                 <symbol draft="contributed">TOP</symbol>
                                 <symbol alt="narrow" draft="contributed">T$</symbol>
                         </currency>
                         <currency type="TPE">
                                 <displayName>timorski eskudo</displayName>

@@ -6153,11 +7331,11 @@
                                 <displayName>novi tajvanski dolar</displayName>
                                 <displayName count="one">novi tajvanski dolar</displayName>
                                 <displayName count="two">nova tajvanska dolarja</displayName>
                                 <displayName count="few">novi tajvanski dolarji</displayName>
                                 <displayName count="other">novih tajvanskih dolarjev</displayName>
-                                <symbol draft="contributed">NT$</symbol>
+                                <symbol draft="contributed">TWD</symbol>
                                 <symbol alt="narrow" draft="contributed">NT$</symbol>
                         </currency>
                         <currency type="TZS">
                                 <displayName>tanzanijski šiling</displayName>
                                 <displayName count="one">tanzanijski šiling</displayName>

@@ -6237,22 +7415,22 @@
                                 <symbol alt="narrow" draft="contributed">Bs</symbol>
                         </currency>
                         <currency type="VND">
                                 <displayName>vientnamski dong</displayName>
                                 <displayName count="one">vientnamski dong</displayName>
-                                <displayName count="two">vientnamski dong</displayName>
-                                <displayName count="few">vientnamski dong</displayName>
-                                <displayName count="other">vientnamski dong</displayName>
+                                <displayName count="two">vietnamska donga</displayName>
+                                <displayName count="few">vietnamski dongi</displayName>
+                                <displayName count="other">vietnamskih dongov</displayName>
                                 <symbol draft="contributed">₫</symbol>
                                 <symbol alt="narrow" draft="contributed">₫</symbol>
                         </currency>
                         <currency type="VUV">
                                 <displayName>vanuatujski vatu</displayName>
                                 <displayName count="one">vanuatujski vatu</displayName>
-                                <displayName count="two">vanuatujska vata</displayName>
+                                <displayName count="two">vanuatujska vatuja</displayName>
                                 <displayName count="few">vanuatujski vati</displayName>
-                                <displayName count="other">vanuatujskih vatov</displayName>
+                                <displayName count="other">vanuatujskih vatujev</displayName>
                                 <symbol draft="contributed">VUV</symbol>
                         </currency>
                         <currency type="WST">
                                 <displayName>samoanska tala</displayName>
                                 <displayName count="one">samoanska tala</displayName>

@@ -6291,11 +7469,11 @@
                                 <displayName>vzhodnokaribski dolar</displayName>
                                 <displayName count="one">vzhodnokaribski dolar</displayName>
                                 <displayName count="two">vzhodnokaribska dolarja</displayName>
                                 <displayName count="few">vzhodnokaribski dolarji</displayName>
                                 <displayName count="other">vzhodnokaribskih dolarjev</displayName>
-                                <symbol draft="contributed">EC$</symbol>
+                                <symbol draft="contributed">XCD</symbol>
                                 <symbol alt="narrow" draft="contributed">$</symbol>
                         </currency>
                         <currency type="XDR">
                                 <displayName>posebne pravice črpanja</displayName>
                         </currency>

@@ -6333,14 +7511,14 @@
                         <currency type="XTS">
                                 <displayName>koda za potrebe testiranja</displayName>
                         </currency>
                         <currency type="XXX">
                                 <displayName>neznana valuta</displayName>
-                                <displayName count="one">neznana ali neveljavna valuta</displayName>
-                                <displayName count="two">neznana ali neveljavna valuta</displayName>
-                                <displayName count="few">neznana ali neveljavna valuta</displayName>
-                                <displayName count="other">neznana ali neveljavna valuta</displayName>
+                                <displayName count="one">(neznana enota valute)</displayName>
+                                <displayName count="two">(neznana valuta)</displayName>
+                                <displayName count="few">(neznana valuta)</displayName>
+                                <displayName count="other">(neznana valuta)</displayName>
                         </currency>
                         <currency type="YDD">
                                 <displayName>jemenski dinar</displayName>
                         </currency>
                         <currency type="YER">

@@ -6396,231 +7574,268 @@
                         <currency type="ZWL">
                                 <displayName>zimbabvejski dolar (2009)</displayName>
                         </currency>
                 </currencies>
                 <miscPatterns numberSystem="latn">
-                        <pattern type="atLeast" draft="contributed">⩾{0}</pattern>
+                        <pattern type="atLeast">⩾{0}</pattern>
                         <pattern type="range">{0}–{1}</pattern>
                 </miscPatterns>
+                <minimalPairs>
+                        <pluralMinimalPairs count="one">{0} ura</pluralMinimalPairs>
+                        <pluralMinimalPairs count="two">{0} uri</pluralMinimalPairs>
+                        <pluralMinimalPairs count="few">{0} ure</pluralMinimalPairs>
+                        <pluralMinimalPairs count="other">{0} ur</pluralMinimalPairs>
+                        <ordinalMinimalPairs ordinal="other">V {0}. križišču zavijte desno.</ordinalMinimalPairs>
+                </minimalPairs>
         </numbers>
         <units>
                 <unitLength type="long">
                         <compoundUnit type="per">
                                 <compoundUnitPattern>{0} na {1}</compoundUnitPattern>
                         </compoundUnit>
                         <unit type="acceleration-g-force">
-                                <displayName draft="contributed">G</displayName>
-                                <unitPattern count="one" draft="contributed">{0} G</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} G</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} G</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} G</unitPattern>
+                                <displayName>G</displayName>
+                                <unitPattern count="one">{0} G</unitPattern>
+                                <unitPattern count="two">{0} G</unitPattern>
+                                <unitPattern count="few">{0} G</unitPattern>
+                                <unitPattern count="other">{0} G</unitPattern>
                         </unit>
                         <unit type="acceleration-meter-per-second-squared">
-                                <displayName draft="contributed">metri na sekundo kvadrat</displayName>
-                                <unitPattern count="one" draft="contributed">{0} meter na sekundo kvadrat</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} metra na sekundo kvadrat</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} metri na sekundo kvadrat</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} metrov na sekundo kvadrat</unitPattern>
+                                <displayName>meter na kvadratno sekundo</displayName>
+                                <unitPattern count="one">{0} meter na kvadratno sekundo</unitPattern>
+                                <unitPattern count="two">{0} metra na kvadratno sekundo</unitPattern>
+                                <unitPattern count="few">{0} metri na kvadratno sekundo</unitPattern>
+                                <unitPattern count="other">{0} metrov na kvadratno sekundo</unitPattern>
                         </unit>
                         <unit type="angle-revolution">
                                 <displayName>vrtljaj</displayName>
                                 <unitPattern count="one">{0} vrtljaj</unitPattern>
                                 <unitPattern count="two">{0} vrtljaja</unitPattern>
                                 <unitPattern count="few">{0} vrtljaji</unitPattern>
                                 <unitPattern count="other">{0} vrtljajev</unitPattern>
                         </unit>
                         <unit type="angle-radian">
-                                <displayName draft="contributed">radian</displayName>
-                                <unitPattern count="one" draft="contributed">{0} radian</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} radiana</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} radianov</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} radianov</unitPattern>
+                                <displayName>radian</displayName>
+                                <unitPattern count="one">{0} radian</unitPattern>
+                                <unitPattern count="two">{0} radiana</unitPattern>
+                                <unitPattern count="few">{0} radianov</unitPattern>
+                                <unitPattern count="other">{0} radianov</unitPattern>
                         </unit>
                         <unit type="angle-degree">
-                                <displayName draft="contributed">stopinja</displayName>
+                                <displayName>stopinja</displayName>
                                 <unitPattern count="one">{0} stopinja</unitPattern>
                                 <unitPattern count="two">{0} stopinji</unitPattern>
                                 <unitPattern count="few">{0} stopinje</unitPattern>
                                 <unitPattern count="other">{0} stopinj</unitPattern>
                         </unit>
                         <unit type="angle-arc-minute">
-                                <displayName draft="contributed">kotna minuta</displayName>
+                                <displayName>kotna minuta</displayName>
                                 <unitPattern count="one">{0} kotna minuta</unitPattern>
                                 <unitPattern count="two">{0} kotni minuti</unitPattern>
                                 <unitPattern count="few">{0} kotne minute</unitPattern>
                                 <unitPattern count="other">{0} kotnih minut</unitPattern>
                         </unit>
                         <unit type="angle-arc-second">
-                                <displayName draft="contributed">kotna sekunda</displayName>
+                                <displayName>kotna sekunda</displayName>
                                 <unitPattern count="one">{0} kotna sekunda</unitPattern>
                                 <unitPattern count="two">{0} kotni sekundi</unitPattern>
                                 <unitPattern count="few">{0} kotne sekunde</unitPattern>
                                 <unitPattern count="other">{0} kotnih sekund</unitPattern>
                         </unit>
                         <unit type="area-square-kilometer">
-                                <displayName draft="contributed">kvadratni kilometri</displayName>
+                                <displayName>kvadratni kilometri</displayName>
                                 <unitPattern count="one">{0} kvadratni kilometer</unitPattern>
                                 <unitPattern count="two">{0} kvadratna kilometra</unitPattern>
                                 <unitPattern count="few">{0} kvadratni kilometri</unitPattern>
                                 <unitPattern count="other">{0} kvadratnih kilometrov</unitPattern>
+                                <perUnitPattern draft="contributed">{0} na kvadratni kilometer</perUnitPattern>
                         </unit>
                         <unit type="area-hectare">
-                                <displayName draft="contributed">ha</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ha</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ha</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ha</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ha</unitPattern>
+                                <displayName>hektari</displayName>
+                                <unitPattern count="one">{0} hektar</unitPattern>
+                                <unitPattern count="two">{0} hektara</unitPattern>
+                                <unitPattern count="few">{0} hektari</unitPattern>
+                                <unitPattern count="other">{0} hektarov</unitPattern>
                         </unit>
                         <unit type="area-square-meter">
-                                <displayName draft="contributed">kvadratni metri</displayName>
+                                <displayName>kvadratni metri</displayName>
                                 <unitPattern count="one">{0} kvadratni meter</unitPattern>
                                 <unitPattern count="two">{0} kvadratna metra</unitPattern>
                                 <unitPattern count="few">{0} kvadratni metri</unitPattern>
                                 <unitPattern count="other">{0} kvadratnih metrov</unitPattern>
                                 <perUnitPattern>{0} na kvadratni meter</perUnitPattern>
                         </unit>
                         <unit type="area-square-centimeter">
-                                <displayName draft="contributed">kvadratni centimetri</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kvadratni centimeter</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kvadratna centimetra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kvadratni centimetri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kvadratnih centimetrov</unitPattern>
+                                <displayName>kvadratni centimetri</displayName>
+                                <unitPattern count="one">{0} kvadratni centimeter</unitPattern>
+                                <unitPattern count="two">{0} kvadratna centimetra</unitPattern>
+                                <unitPattern count="few">{0} kvadratni centimetri</unitPattern>
+                                <unitPattern count="other">{0} kvadratnih centimetrov</unitPattern>
                                 <perUnitPattern>{0} na kvadratni centimeter</perUnitPattern>
                         </unit>
                         <unit type="area-square-mile">
-                                <displayName draft="contributed">mi²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mi²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
+                                <displayName>kvadratna milja</displayName>
+                                <unitPattern count="one">{0} kvadratna milja</unitPattern>
+                                <unitPattern count="two">{0} kvadratni milji</unitPattern>
+                                <unitPattern count="few">{0} kvadratne milje</unitPattern>
+                                <unitPattern count="other">{0} kvadratnih milj</unitPattern>
+                                <perUnitPattern draft="contributed">{0} na kvadratno miljo</perUnitPattern>
                         </unit>
                         <unit type="area-acre">
-                                <displayName draft="contributed">juter</displayName>
-                                <unitPattern count="one" draft="contributed">{0} jutro</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} jutri</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} jutra</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} juter</unitPattern>
+                                <displayName>aker</displayName>
+                                <unitPattern count="one">{0} aker</unitPattern>
+                                <unitPattern count="two">{0} akra</unitPattern>
+                                <unitPattern count="few">{0} akri</unitPattern>
+                                <unitPattern count="other">{0} akrov</unitPattern>
                         </unit>
                         <unit type="area-square-yard">
-                                <displayName draft="contributed">yd²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} yd²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+                                <displayName>kvadratni yard</displayName>
+                                <unitPattern count="one">{0} kvadratni jard</unitPattern>
+                                <unitPattern count="two">{0} kvadratna jarda</unitPattern>
+                                <unitPattern count="few">{0} kvadratni jardi</unitPattern>
+                                <unitPattern count="other">{0} kvadratnih jardov</unitPattern>
                         </unit>
                         <unit type="area-square-foot">
-                                <displayName draft="contributed">ft²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ft²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
+                                <displayName>kvadratni čevelj</displayName>
+                                <unitPattern count="one">{0} kvadratni čevelj</unitPattern>
+                                <unitPattern count="two">{0} kvadratna čevlja</unitPattern>
+                                <unitPattern count="few">{0} kvadratni čevlji</unitPattern>
+                                <unitPattern count="other">{0} kvadratnih čevljev</unitPattern>
                         </unit>
                         <unit type="area-square-inch">
-                                <displayName draft="contributed">in²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} in²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} in²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} in²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} in²</unitPattern>
+                                <displayName>kvadratni palec</displayName>
+                                <unitPattern count="one">{0} kvadratni palec</unitPattern>
+                                <unitPattern count="two">{0} kvadratna palca</unitPattern>
+                                <unitPattern count="few">{0} kvadratnih palcev</unitPattern>
+                                <unitPattern count="other">{0} kvadratnih palcev</unitPattern>
                                 <perUnitPattern>{0} na kvadratni palec</perUnitPattern>
                         </unit>
                         <unit type="concentr-karat">
                                 <displayName draft="contributed">karat</displayName>
                                 <unitPattern count="one" draft="contributed">{0} karat</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} karata</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} karati</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} karatov</unitPattern>
                         </unit>
+                        <unit type="concentr-milligram-per-deciliter">
+                                <displayName>miligrami na deciliter</displayName>
+                                <unitPattern count="one">{0} miligram na deciliter</unitPattern>
+                                <unitPattern count="two">{0} miligrama na deciliter</unitPattern>
+                                <unitPattern count="few">{0} miligrami na deciliter</unitPattern>
+                                <unitPattern count="other">{0} miligramov na deciliter</unitPattern>
+                        </unit>
+                        <unit type="concentr-millimole-per-liter">
+                                <displayName>milimol na liter</displayName>
+                                <unitPattern count="one">{0} milimol na liter</unitPattern>
+                                <unitPattern count="two">{0} milimola na liter</unitPattern>
+                                <unitPattern count="few">{0} milimoli na liter</unitPattern>
+                                <unitPattern count="other">{0} milimolov na liter</unitPattern>
+                        </unit>
+                        <unit type="concentr-part-per-million">
+                                <displayName>delci na milijon</displayName>
+                                <unitPattern count="one">{0} delec na milijon</unitPattern>
+                                <unitPattern count="two">{0} delca na milijon</unitPattern>
+                                <unitPattern count="few">{0} delcev na milijon</unitPattern>
+                                <unitPattern count="other">{0} delcev na milijon</unitPattern>
+                        </unit>
                         <unit type="consumption-liter-per-kilometer">
-                                <displayName draft="contributed">litrov na kilometer</displayName>
-                                <unitPattern count="one" draft="contributed">{0} liter na kilometer</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} litra na kilometer</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} litrov na kilometer</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} litrov na kilometer</unitPattern>
+                                <displayName>litrov na kilometer</displayName>
+                                <unitPattern count="one">{0} liter na kilometer</unitPattern>
+                                <unitPattern count="two">{0} litra na kilometer</unitPattern>
+                                <unitPattern count="few">{0} litrov na kilometer</unitPattern>
+                                <unitPattern count="other">{0} litrov na kilometer</unitPattern>
                         </unit>
                         <unit type="consumption-liter-per-100kilometers">
                                 <displayName>L/100km</displayName>
                                 <unitPattern count="one">{0} liter na 100 kilometrov</unitPattern>
                                 <unitPattern count="two">{0} litra na 100 kilometrov</unitPattern>
                                 <unitPattern count="few">{0} litri na 100 kilometrov</unitPattern>
                                 <unitPattern count="other">{0} litrov na 100 kilometrov</unitPattern>
                         </unit>
                         <unit type="consumption-mile-per-gallon">
-                                <displayName draft="contributed">milj na galono</displayName>
-                                <unitPattern count="one" draft="contributed">{0} milja na galono</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} milji na galono</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} milj na galono</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} milj na galono</unitPattern>
+                                <displayName>milje na galono</displayName>
+                                <unitPattern count="one">{0} milja na galono</unitPattern>
+                                <unitPattern count="two">{0} milji na galono</unitPattern>
+                                <unitPattern count="few">{0} milj na galono</unitPattern>
+                                <unitPattern count="other">{0} milj na galono</unitPattern>
+                        </unit>
+                        <unit type="consumption-mile-per-gallon-imperial">
+                                <displayName>milje na imperialno galono</displayName>
+                                <unitPattern count="one">{0} milja na imperialno galono</unitPattern>
+                                <unitPattern count="two">{0} milji na imperialno galono</unitPattern>
+                                <unitPattern count="few">{0} milje na imperialno galono</unitPattern>
+                                <unitPattern count="other">{0} milj na imperialno galono</unitPattern>
                         </unit>
                         <unit type="digital-terabyte">
-                                <displayName draft="contributed">terabajti</displayName>
-                                <unitPattern count="one" draft="contributed">{0} terabajt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} terabajta</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} terabajti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} terabajtov</unitPattern>
+                                <displayName>terabajti</displayName>
+                                <unitPattern count="one">{0} terabajt</unitPattern>
+                                <unitPattern count="two">{0} terabajta</unitPattern>
+                                <unitPattern count="few">{0} terabajti</unitPattern>
+                                <unitPattern count="other">{0} terabajtov</unitPattern>
                         </unit>
                         <unit type="digital-terabit">
-                                <displayName draft="contributed">terabiti</displayName>
-                                <unitPattern count="one" draft="contributed">{0} terabit</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} terabita</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} terabiti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} terabitov</unitPattern>
+                                <displayName>terabiti</displayName>
+                                <unitPattern count="one">{0} terabit</unitPattern>
+                                <unitPattern count="two">{0} terabita</unitPattern>
+                                <unitPattern count="few">{0} terabiti</unitPattern>
+                                <unitPattern count="other">{0} terabitov</unitPattern>
                         </unit>
                         <unit type="digital-gigabyte">
-                                <displayName draft="contributed">gigabajti</displayName>
-                                <unitPattern count="one" draft="contributed">{0} gigabajt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} gigabajta</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} gigabajti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} gigabajtov</unitPattern>
+                                <displayName>gigabajti</displayName>
+                                <unitPattern count="one">{0} gigabajt</unitPattern>
+                                <unitPattern count="two">{0} gigabajta</unitPattern>
+                                <unitPattern count="few">{0} gigabajti</unitPattern>
+                                <unitPattern count="other">{0} gigabajtov</unitPattern>
                         </unit>
                         <unit type="digital-gigabit">
-                                <displayName draft="contributed">gigabiti</displayName>
-                                <unitPattern count="one" draft="contributed">{0} gigabit</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} gigabita</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} gigabiti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} gigabitov</unitPattern>
+                                <displayName>gigabiti</displayName>
+                                <unitPattern count="one">{0} gigabit</unitPattern>
+                                <unitPattern count="two">{0} gigabita</unitPattern>
+                                <unitPattern count="few">{0} gigabiti</unitPattern>
+                                <unitPattern count="other">{0} gigabitov</unitPattern>
                         </unit>
                         <unit type="digital-megabyte">
-                                <displayName draft="contributed">megabajti</displayName>
-                                <unitPattern count="one" draft="contributed">{0} megabajt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} megabajta</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} megabajti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} megabajtov</unitPattern>
+                                <displayName>megabajti</displayName>
+                                <unitPattern count="one">{0} megabajt</unitPattern>
+                                <unitPattern count="two">{0} megabajta</unitPattern>
+                                <unitPattern count="few">{0} megabajti</unitPattern>
+                                <unitPattern count="other">{0} megabajtov</unitPattern>
                         </unit>
                         <unit type="digital-megabit">
-                                <displayName draft="contributed">megabiti</displayName>
-                                <unitPattern count="one" draft="contributed">{0} megabit</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} megabita</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} megabiti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} megabitov</unitPattern>
+                                <displayName>megabiti</displayName>
+                                <unitPattern count="one">{0} megabit</unitPattern>
+                                <unitPattern count="two">{0} megabita</unitPattern>
+                                <unitPattern count="few">{0} megabiti</unitPattern>
+                                <unitPattern count="other">{0} megabitov</unitPattern>
                         </unit>
                         <unit type="digital-kilobyte">
-                                <displayName draft="contributed">kilobajti</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kilobajt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kilobajta</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kilobajti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kilobajtov</unitPattern>
+                                <displayName>kilobajti</displayName>
+                                <unitPattern count="one">{0} kilobajt</unitPattern>
+                                <unitPattern count="two">{0} kilobajta</unitPattern>
+                                <unitPattern count="few">{0} kilobajti</unitPattern>
+                                <unitPattern count="other">{0} kilobajtov</unitPattern>
                         </unit>
                         <unit type="digital-kilobit">
-                                <displayName draft="contributed">kilobiti</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kilobit</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kilobita</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kilobiti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kilobitov</unitPattern>
+                                <displayName>kilobiti</displayName>
+                                <unitPattern count="one">{0} kilobit</unitPattern>
+                                <unitPattern count="two">{0} kilobita</unitPattern>
+                                <unitPattern count="few">{0} kilobiti</unitPattern>
+                                <unitPattern count="other">{0} kilobitov</unitPattern>
                         </unit>
                         <unit type="digital-byte">
-                                <displayName draft="contributed">bajt</displayName>
-                                <unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} bajta</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} bajti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} bajtov</unitPattern>
+                                <displayName>bajt</displayName>
+                                <unitPattern count="one">{0} bajt</unitPattern>
+                                <unitPattern count="two">{0} bajta</unitPattern>
+                                <unitPattern count="few">{0} bajti</unitPattern>
+                                <unitPattern count="other">{0} bajtov</unitPattern>
                         </unit>
                         <unit type="digital-bit">
-                                <displayName draft="contributed">bit</displayName>
-                                <unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} bita</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} bite</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} bitov</unitPattern>
+                                <displayName>bit</displayName>
+                                <unitPattern count="one">{0} bit</unitPattern>
+                                <unitPattern count="two">{0} bita</unitPattern>
+                                <unitPattern count="few">{0} bite</unitPattern>
+                                <unitPattern count="other">{0} bitov</unitPattern>
                         </unit>
                         <unit type="duration-century">
                                 <displayName>stoletja</displayName>
                                 <unitPattern count="one">{0} stoletje</unitPattern>
                                 <unitPattern count="two">{0} stoletji</unitPattern>

@@ -6629,45 +7844,45 @@
                         </unit>
                         <unit type="duration-year">
                                 <displayName>let</displayName>
                                 <unitPattern count="one">{0} leto</unitPattern>
                                 <unitPattern count="two">{0} leti</unitPattern>
-                                <unitPattern count="few">{0} leta</unitPattern>
+                                <unitPattern count="few">{0} let</unitPattern>
                                 <unitPattern count="other">{0} let</unitPattern>
                                 <perUnitPattern>{0} na leto</perUnitPattern>
                         </unit>
                         <unit type="duration-month">
                                 <displayName>mesecev</displayName>
                                 <unitPattern count="one">{0} mesec</unitPattern>
                                 <unitPattern count="two">{0} meseca</unitPattern>
-                                <unitPattern count="few">{0} meseci</unitPattern>
+                                <unitPattern count="few">{0} mesecev</unitPattern>
                                 <unitPattern count="other">{0} mesecev</unitPattern>
                                 <perUnitPattern>{0} na mesec</perUnitPattern>
                         </unit>
                         <unit type="duration-week">
                                 <displayName>tednov</displayName>
                                 <unitPattern count="one">{0} teden</unitPattern>
                                 <unitPattern count="two">{0} tedna</unitPattern>
-                                <unitPattern count="few">{0} tedni</unitPattern>
+                                <unitPattern count="few">{0} tednov</unitPattern>
                                 <unitPattern count="other">{0} tednov</unitPattern>
                                 <perUnitPattern>{0} na teden</perUnitPattern>
                         </unit>
                         <unit type="duration-day">
                                 <displayName>dni</displayName>
                                 <unitPattern count="one">{0} dan</unitPattern>
                                 <unitPattern count="two">{0} dneva</unitPattern>
-                                <unitPattern count="few">{0} dnevi</unitPattern>
+                                <unitPattern count="few">{0} dni</unitPattern>
                                 <unitPattern count="other">{0} dni</unitPattern>
                                 <perUnitPattern>{0} na dan</perUnitPattern>
                         </unit>
                         <unit type="duration-hour">
                                 <displayName>ur</displayName>
                                 <unitPattern count="one">{0} ura</unitPattern>
                                 <unitPattern count="two">{0} uri</unitPattern>
                                 <unitPattern count="few">{0} ure</unitPattern>
                                 <unitPattern count="other">{0} ur</unitPattern>
-                                <perUnitPattern>{0}/h</perUnitPattern>
+                                <perUnitPattern>{0} na uro</perUnitPattern>
                         </unit>
                         <unit type="duration-minute">
                                 <displayName>minut</displayName>
                                 <unitPattern count="one">{0} minuta</unitPattern>
                                 <unitPattern count="two">{0} minuti</unitPattern>

@@ -6679,429 +7894,457 @@
                                 <displayName>sekund</displayName>
                                 <unitPattern count="one">{0} sekunda</unitPattern>
                                 <unitPattern count="two">{0} sekundi</unitPattern>
                                 <unitPattern count="few">{0} sekunde</unitPattern>
                                 <unitPattern count="other">{0} sekund</unitPattern>
-                                <perUnitPattern>{0}/s</perUnitPattern>
+                                <perUnitPattern>{0} na sekundo</perUnitPattern>
                         </unit>
                         <unit type="duration-millisecond">
-                                <displayName>ms</displayName>
-                                <unitPattern count="one">{0} ms</unitPattern>
+                                <displayName>milisekunde</displayName>
+                                <unitPattern count="one">{0} milisekunda</unitPattern>
                                 <unitPattern count="two">{0} millisekundi</unitPattern>
                                 <unitPattern count="few">{0} millisekunde</unitPattern>
                                 <unitPattern count="other">{0} millisekund</unitPattern>
                         </unit>
                         <unit type="duration-microsecond">
-                                <displayName>μs</displayName>
-                                <unitPattern count="one">{0} μs</unitPattern>
-                                <unitPattern count="two">{0} μs</unitPattern>
-                                <unitPattern count="few">{0} μs</unitPattern>
-                                <unitPattern count="other">{0} μs</unitPattern>
+                                <displayName>mikrosekunde</displayName>
+                                <unitPattern count="one">{0} mikrosekunda</unitPattern>
+                                <unitPattern count="two">{0} mikrosekundi</unitPattern>
+                                <unitPattern count="few">{0} mikrosekunde</unitPattern>
+                                <unitPattern count="other">{0} mikrosekund</unitPattern>
                         </unit>
                         <unit type="duration-nanosecond">
-                                <displayName>ns</displayName>
+                                <displayName>nanosekunde</displayName>
                                 <unitPattern count="one">{0} ns</unitPattern>
-                                <unitPattern count="two">{0} ns</unitPattern>
-                                <unitPattern count="few">{0} ns</unitPattern>
-                                <unitPattern count="other">{0} ns</unitPattern>
+                                <unitPattern count="two">{0} nanosekundi</unitPattern>
+                                <unitPattern count="few">{0} nanosekunde</unitPattern>
+                                <unitPattern count="other">{0} nanosekund</unitPattern>
                         </unit>
                         <unit type="electric-ampere">
-                                <displayName draft="contributed">amperi</displayName>
-                                <unitPattern count="one" draft="contributed">{0} amper</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ampera</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} amperov</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} amperov</unitPattern>
+                                <displayName>amperi</displayName>
+                                <unitPattern count="one">{0} amper</unitPattern>
+                                <unitPattern count="two">{0} ampera</unitPattern>
+                                <unitPattern count="few">{0} amperi</unitPattern>
+                                <unitPattern count="other">{0} amperov</unitPattern>
                         </unit>
                         <unit type="electric-milliampere">
-                                <displayName draft="contributed">miliamperi</displayName>
-                                <unitPattern count="one" draft="contributed">{0} miliamper</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} miliampera</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} miliamperov</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} miliamperov</unitPattern>
+                                <displayName>miliamperi</displayName>
+                                <unitPattern count="one">{0} miliamper</unitPattern>
+                                <unitPattern count="two">{0} miliampera</unitPattern>
+                                <unitPattern count="few">{0} milliamperi</unitPattern>
+                                <unitPattern count="other">{0} miliamperov</unitPattern>
                         </unit>
                         <unit type="electric-ohm">
-                                <displayName draft="contributed">ohm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ohm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ohma</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ohmov</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ohmov</unitPattern>
+                                <displayName>ohm</displayName>
+                                <unitPattern count="one">{0} ohm</unitPattern>
+                                <unitPattern count="two">{0} ohma</unitPattern>
+                                <unitPattern count="few">{0} ohmi</unitPattern>
+                                <unitPattern count="other">{0} ohmov</unitPattern>
                         </unit>
                         <unit type="electric-volt">
-                                <displayName draft="contributed">volt</displayName>
-                                <unitPattern count="one" draft="contributed">{0} volt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} volta</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} voltov</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} voltov</unitPattern>
+                                <displayName>volt</displayName>
+                                <unitPattern count="one">{0} volt</unitPattern>
+                                <unitPattern count="two">{0} volta</unitPattern>
+                                <unitPattern count="few">{0} volti</unitPattern>
+                                <unitPattern count="other">{0} voltov</unitPattern>
                         </unit>
                         <unit type="energy-kilocalorie">
-                                <displayName draft="contributed">kcal</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kcal</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+                                <displayName>kilokalorije</displayName>
+                                <unitPattern count="one">{0} kilokalorija</unitPattern>
+                                <unitPattern count="two">{0} kilokaloriji</unitPattern>
+                                <unitPattern count="few">{0} kilokalorije</unitPattern>
+                                <unitPattern count="other">{0} kilokalorij</unitPattern>
                         </unit>
                         <unit type="energy-calorie">
-                                <displayName draft="contributed">cal</displayName>
-                                <unitPattern count="one" draft="contributed">{0} cal</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} cal</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} cal</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} cal</unitPattern>
+                                <displayName>kalorije</displayName>
+                                <unitPattern count="one">{0} kalorija</unitPattern>
+                                <unitPattern count="two">{0} kaloriji</unitPattern>
+                                <unitPattern count="few">{0} kalorije</unitPattern>
+                                <unitPattern count="other">{0} kalorij</unitPattern>
                         </unit>
                         <unit type="energy-foodcalorie">
-                                <displayName draft="contributed">kalorije</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kalorija</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kaloriji</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kalorij</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kalorij</unitPattern>
+                                <displayName>kalorije</displayName>
+                                <unitPattern count="one">{0} kalorija</unitPattern>
+                                <unitPattern count="two">{0} kaloriji</unitPattern>
+                                <unitPattern count="few">{0} kalorij</unitPattern>
+                                <unitPattern count="other">{0} kalorij</unitPattern>
                         </unit>
                         <unit type="energy-kilojoule">
-                                <displayName draft="contributed">kJ</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kJ</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kJ</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
+                                <displayName>kilojouli</displayName>
+                                <unitPattern count="one">{0} kilojoule</unitPattern>
+                                <unitPattern count="two">{0} kilojoula</unitPattern>
+                                <unitPattern count="few">{0} kilojouli</unitPattern>
+                                <unitPattern count="other">{0} kilojoulov</unitPattern>
                         </unit>
                         <unit type="energy-joule">
-                                <displayName draft="contributed">joule</displayName>
-                                <unitPattern count="one" draft="contributed">{0} J</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} J</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} J</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} J</unitPattern>
+                                <displayName>joule</displayName>
+                                <unitPattern count="one">{0} joule</unitPattern>
+                                <unitPattern count="two">{0} joula</unitPattern>
+                                <unitPattern count="few">{0} jouli</unitPattern>
+                                <unitPattern count="other">{0} joulov</unitPattern>
                         </unit>
                         <unit type="energy-kilowatt-hour">
-                                <displayName draft="contributed">kWh</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kWh</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kWh</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kWh</unitPattern>
+                                <displayName>kilovatne ure</displayName>
+                                <unitPattern count="one">{0} kilovatna ura</unitPattern>
+                                <unitPattern count="two">{0} kilovatni uri</unitPattern>
+                                <unitPattern count="few">{0} kilovatne ure</unitPattern>
+                                <unitPattern count="other">{0} kilovatnih ur</unitPattern>
                         </unit>
                         <unit type="frequency-gigahertz">
-                                <displayName draft="contributed">gigahertz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} gigahertz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} gigahertza</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} gigahertzev</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} gigahertzev</unitPattern>
+                                <displayName>gigahertz</displayName>
+                                <unitPattern count="one">{0} gigahertz</unitPattern>
+                                <unitPattern count="two">{0} gigahertza</unitPattern>
+                                <unitPattern count="few">{0} gigahertzi</unitPattern>
+                                <unitPattern count="other">{0} gigahertzev</unitPattern>
                         </unit>
                         <unit type="frequency-megahertz">
-                                <displayName draft="contributed">megahertz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} megahertz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} megahertza</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} megahertzev</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} megahertzev</unitPattern>
+                                <displayName>megahertz</displayName>
+                                <unitPattern count="one">{0} megahertz</unitPattern>
+                                <unitPattern count="two">{0} megahertza</unitPattern>
+                                <unitPattern count="few">{0} megahertzi</unitPattern>
+                                <unitPattern count="other">{0} megahertzev</unitPattern>
                         </unit>
                         <unit type="frequency-kilohertz">
-                                <displayName draft="contributed">kilohertz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kilohertz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kilohertza</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kilohertzev</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kilohertzev</unitPattern>
+                                <displayName>kilohertz</displayName>
+                                <unitPattern count="one">{0} kilohertz</unitPattern>
+                                <unitPattern count="two">{0} kilohertza</unitPattern>
+                                <unitPattern count="few">{0} kilohertzi</unitPattern>
+                                <unitPattern count="other">{0} kilohertzev</unitPattern>
                         </unit>
                         <unit type="frequency-hertz">
-                                <displayName draft="contributed">hertz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} hertz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} hertza</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} hertzev</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} hertzev</unitPattern>
+                                <displayName>hertz</displayName>
+                                <unitPattern count="one">{0} hertz</unitPattern>
+                                <unitPattern count="two">{0} hertza</unitPattern>
+                                <unitPattern count="few">{0} hertzi</unitPattern>
+                                <unitPattern count="other">{0} hertzev</unitPattern>
                         </unit>
                         <unit type="length-kilometer">
-                                <displayName draft="contributed">kilometri</displayName>
+                                <displayName>kilometri</displayName>
                                 <unitPattern count="one">{0} kilometer</unitPattern>
                                 <unitPattern count="two">{0} kilometra</unitPattern>
                                 <unitPattern count="few">{0} kilometri</unitPattern>
                                 <unitPattern count="other">{0} kilometrov</unitPattern>
                                 <perUnitPattern>{0} na kilometer</perUnitPattern>
                         </unit>
                         <unit type="length-meter">
-                                <displayName draft="contributed">metri</displayName>
+                                <displayName>metri</displayName>
                                 <unitPattern count="one">{0} meter</unitPattern>
                                 <unitPattern count="two">{0} metra</unitPattern>
                                 <unitPattern count="few">{0} metri</unitPattern>
                                 <unitPattern count="other">{0} metrov</unitPattern>
                                 <perUnitPattern>{0} na meter</perUnitPattern>
                         </unit>
                         <unit type="length-decimeter">
-                                <displayName draft="contributed">decimetri</displayName>
-                                <unitPattern count="one" draft="contributed">{0} decimeter</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} decimetra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} decimetri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} decimetrov</unitPattern>
+                                <displayName>decimetri</displayName>
+                                <unitPattern count="one">{0} decimeter</unitPattern>
+                                <unitPattern count="two">{0} decimetra</unitPattern>
+                                <unitPattern count="few">{0} decimetri</unitPattern>
+                                <unitPattern count="other">{0} decimetrov</unitPattern>
                         </unit>
                         <unit type="length-centimeter">
-                                <displayName draft="contributed">centimetri</displayName>
+                                <displayName>centimetri</displayName>
                                 <unitPattern count="one">{0} centimeter</unitPattern>
                                 <unitPattern count="two">{0} centimetra</unitPattern>
                                 <unitPattern count="few">{0} centimetri</unitPattern>
                                 <unitPattern count="other">{0} centimetrov</unitPattern>
                                 <perUnitPattern>{0} na centimeter</perUnitPattern>
                         </unit>
                         <unit type="length-millimeter">
-                                <displayName draft="contributed">milimetri</displayName>
+                                <displayName>milimetri</displayName>
                                 <unitPattern count="one">{0} milimeter</unitPattern>
                                 <unitPattern count="two">{0} milimetra</unitPattern>
                                 <unitPattern count="few">{0} milimetri</unitPattern>
                                 <unitPattern count="other">{0} milimetrov</unitPattern>
                         </unit>
                         <unit type="length-micrometer">
-                                <displayName draft="contributed">mikrometri</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mikrometer</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mikrometra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mikrometri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mikrometrov</unitPattern>
+                                <displayName>mikrometri</displayName>
+                                <unitPattern count="one">{0} mikrometer</unitPattern>
+                                <unitPattern count="two">{0} mikrometra</unitPattern>
+                                <unitPattern count="few">{0} mikrometri</unitPattern>
+                                <unitPattern count="other">{0} mikrometrov</unitPattern>
                         </unit>
                         <unit type="length-nanometer">
-                                <displayName draft="contributed">nanometri</displayName>
-                                <unitPattern count="one" draft="contributed">{0} nanometer</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} nanometra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} nanometri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} nanometrov</unitPattern>
+                                <displayName>nanometri</displayName>
+                                <unitPattern count="one">{0} nanometer</unitPattern>
+                                <unitPattern count="two">{0} nanometra</unitPattern>
+                                <unitPattern count="few">{0} nanometri</unitPattern>
+                                <unitPattern count="other">{0} nanometrov</unitPattern>
                         </unit>
                         <unit type="length-picometer">
-                                <displayName draft="contributed">pm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} pm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} pm</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} pm</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} pm</unitPattern>
+                                <displayName>pikometri</displayName>
+                                <unitPattern count="one">{0} pikometer</unitPattern>
+                                <unitPattern count="two">{0} pikometra</unitPattern>
+                                <unitPattern count="few">{0} pikometri</unitPattern>
+                                <unitPattern count="other">{0} pikometrov</unitPattern>
                         </unit>
                         <unit type="length-mile">
-                                <displayName draft="contributed">milje</displayName>
+                                <displayName>milje</displayName>
                                 <unitPattern count="one">{0} milja</unitPattern>
                                 <unitPattern count="two">{0} milji</unitPattern>
                                 <unitPattern count="few">{0} milje</unitPattern>
                                 <unitPattern count="other">{0} milj</unitPattern>
                         </unit>
                         <unit type="length-yard">
-                                <displayName draft="contributed">yd</displayName>
-                                <unitPattern count="one" draft="contributed">{0} yd</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} yd</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} yd</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} yd</unitPattern>
+                                <displayName>jardi</displayName>
+                                <unitPattern count="one">{0} jard</unitPattern>
+                                <unitPattern count="two">{0} jarda</unitPattern>
+                                <unitPattern count="few">{0} jardi</unitPattern>
+                                <unitPattern count="other">{0} jardov</unitPattern>
                         </unit>
                         <unit type="length-foot">
-                                <displayName draft="contributed">ft</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ft</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ft</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ft</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+                                <displayName>čevlji</displayName>
+                                <unitPattern count="one">{0} čevelj</unitPattern>
+                                <unitPattern count="two">{0} čevlja</unitPattern>
+                                <unitPattern count="few">{0} čevlji</unitPattern>
+                                <unitPattern count="other">{0} čevljev</unitPattern>
                                 <perUnitPattern>{0} na čevelj</perUnitPattern>
                         </unit>
                         <unit type="length-inch">
-                                <displayName draft="contributed">in</displayName>
-                                <unitPattern count="one" draft="contributed">{0} in</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} in</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} in</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} in</unitPattern>
+                                <displayName>palec</displayName>
+                                <unitPattern count="one">{0} palec</unitPattern>
+                                <unitPattern count="two">{0} palca</unitPattern>
+                                <unitPattern count="few">{0} palci</unitPattern>
+                                <unitPattern count="other">{0} palcev</unitPattern>
                                 <perUnitPattern>{0} na palec</perUnitPattern>
                         </unit>
                         <unit type="length-parsec">
-                                <displayName draft="contributed">pc</displayName>
-                                <unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} pc</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} pc</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+                                <displayName>parsek</displayName>
+                                <unitPattern count="one">{0} parsek</unitPattern>
+                                <unitPattern count="two">{0} parseka</unitPattern>
+                                <unitPattern count="few">{0} parseki</unitPattern>
+                                <unitPattern count="other">{0} parsekov</unitPattern>
                         </unit>
                         <unit type="length-light-year">
-                                <displayName draft="contributed">svetlobnih let</displayName>
-                                <unitPattern count="one" draft="contributed">{0} svetlobno leto</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} svetlobni leti</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} svetlobna leta</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} svetlobnih let</unitPattern>
+                                <displayName>svetlobnih let</displayName>
+                                <unitPattern count="one">{0} svetlobno leto</unitPattern>
+                                <unitPattern count="two">{0} svetlobni leti</unitPattern>
+                                <unitPattern count="few">{0} svetlobna leta</unitPattern>
+                                <unitPattern count="other">{0} svetlobnih let</unitPattern>
                         </unit>
                         <unit type="length-astronomical-unit">
-                                <displayName draft="contributed">au</displayName>
-                                <unitPattern count="one" draft="contributed">{0} au</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} au</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} au</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} au</unitPattern>
+                                <displayName>astronomska enota</displayName>
+                                <unitPattern count="one">{0} astronomska enota</unitPattern>
+                                <unitPattern count="two">{0} astronomski enoti</unitPattern>
+                                <unitPattern count="few">{0} astronomske enote</unitPattern>
+                                <unitPattern count="other">{0} astronomskih enot</unitPattern>
+                        </unit>
+                        <unit type="length-furlong">
+                                <displayName draft="contributed">fur</displayName>
+                                <unitPattern count="one" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+                        </unit>
+                        <unit type="length-fathom">
+                                <displayName draft="contributed">fm</displayName>
+                                <unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} fm</unitPattern>
                         </unit>
                         <unit type="length-nautical-mile">
-                                <displayName draft="contributed">nmi</displayName>
-                                <unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} nmi</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} nmi</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
+                                <displayName>navtična milja</displayName>
+                                <unitPattern count="one">{0} navtična milja</unitPattern>
+                                <unitPattern count="two">{0} navtični milji</unitPattern>
+                                <unitPattern count="few">{0} navtične milje</unitPattern>
+                                <unitPattern count="other">{0} navtičnih milj</unitPattern>
                         </unit>
                         <unit type="length-mile-scandinavian">
-                                <displayName draft="contributed">skandinavska milja</displayName>
+                                <displayName>skandinavska milja</displayName>
                                 <unitPattern count="one">{0} skandinavska milja</unitPattern>
                                 <unitPattern count="two">{0} skandinavski milji</unitPattern>
                                 <unitPattern count="few">{0} skandinavske milje</unitPattern>
                                 <unitPattern count="other">{0} skandinavskih milj</unitPattern>
                         </unit>
+                        <unit type="length-point">
+                                <displayName draft="contributed">točke</displayName>
+                                <unitPattern count="one" draft="contributed">{0} točka</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} točki</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} točke</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+                        </unit>
                         <unit type="light-lux">
-                                <displayName draft="contributed">luks</displayName>
-                                <unitPattern count="one" draft="contributed">{0} luks</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} luksa</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} luksi</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} luksov</unitPattern>
+                                <displayName>luks</displayName>
+                                <unitPattern count="one">{0} luks</unitPattern>
+                                <unitPattern count="two">{0} luksa</unitPattern>
+                                <unitPattern count="few">{0} luksi</unitPattern>
+                                <unitPattern count="other">{0} luksov</unitPattern>
                         </unit>
                         <unit type="mass-metric-ton">
-                                <displayName draft="contributed">t</displayName>
-                                <unitPattern count="one" draft="contributed">{0} t</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} t</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} t</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} t</unitPattern>
+                                <displayName>metrične tone</displayName>
+                                <unitPattern count="one">{0} metrična tona</unitPattern>
+                                <unitPattern count="two">{0} metrični toni</unitPattern>
+                                <unitPattern count="few">{0} metrične tone</unitPattern>
+                                <unitPattern count="other">{0} metričnih ton</unitPattern>
                         </unit>
                         <unit type="mass-kilogram">
-                                <displayName draft="contributed">kg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kg</unitPattern>
-                                <perUnitPattern>{0}/kg</perUnitPattern>
+                                <displayName>kilogrami</displayName>
+                                <unitPattern count="one">{0} kilogram</unitPattern>
+                                <unitPattern count="two">{0} kilograma</unitPattern>
+                                <unitPattern count="few">{0} kilogrami</unitPattern>
+                                <unitPattern count="other">{0} kilogramov</unitPattern>
+                                <perUnitPattern>{0} na kilogram</perUnitPattern>
                         </unit>
                         <unit type="mass-gram">
-                                <displayName draft="contributed">g</displayName>
-                                <unitPattern count="one" draft="contributed">{0} g</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} g</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} g</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} g</unitPattern>
-                                <perUnitPattern>{0}/g</perUnitPattern>
+                                <displayName>grami</displayName>
+                                <unitPattern count="one">{0} gram</unitPattern>
+                                <unitPattern count="two">{0} grama</unitPattern>
+                                <unitPattern count="few">{0} grami</unitPattern>
+                                <unitPattern count="other">{0} gramov</unitPattern>
+                                <perUnitPattern>{0} na gram</perUnitPattern>
                         </unit>
                         <unit type="mass-milligram">
-                                <displayName draft="contributed">mg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mg</unitPattern>
+                                <displayName>miligrami</displayName>
+                                <unitPattern count="one">{0} miligram</unitPattern>
+                                <unitPattern count="two">{0} miligrama</unitPattern>
+                                <unitPattern count="few">{0} miligrami</unitPattern>
+                                <unitPattern count="other">{0} miligramov</unitPattern>
                         </unit>
                         <unit type="mass-microgram">
-                                <displayName draft="contributed">µg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} µg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} µg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} µg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} µg</unitPattern>
+                                <displayName>mikrogrami</displayName>
+                                <unitPattern count="one">{0} mikrogram</unitPattern>
+                                <unitPattern count="two">{0} mikrograma</unitPattern>
+                                <unitPattern count="few">{0} mikrogrami</unitPattern>
+                                <unitPattern count="other">{0} mikrogramov</unitPattern>
                         </unit>
                         <unit type="mass-ton">
-                                <displayName draft="contributed">tn</displayName>
-                                <unitPattern count="one" draft="contributed">{0} tn</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} tn</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} tn</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} tn</unitPattern>
+                                <displayName>tone</displayName>
+                                <unitPattern count="one">{0} ameriška tona</unitPattern>
+                                <unitPattern count="two">{0} ameriški toni</unitPattern>
+                                <unitPattern count="few">{0} tone</unitPattern>
+                                <unitPattern count="other">{0} ameriških ton</unitPattern>
+                        </unit>
+                        <unit type="mass-stone">
+                                <displayName draft="contributed">st</displayName>
+                                <unitPattern count="one" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} st</unitPattern>
                         </unit>
                         <unit type="mass-pound">
-                                <displayName draft="contributed">lb</displayName>
-                                <unitPattern count="one" draft="contributed">{0} lb</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} lb</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} lb</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} lb</unitPattern>
-                                <perUnitPattern>{0}/lb</perUnitPattern>
+                                <displayName>funti</displayName>
+                                <unitPattern count="one">{0} funt</unitPattern>
+                                <unitPattern count="two">{0} funta</unitPattern>
+                                <unitPattern count="few">{0} funti</unitPattern>
+                                <unitPattern count="other">{0} funtov</unitPattern>
+                                <perUnitPattern>{0} na funt</perUnitPattern>
                         </unit>
                         <unit type="mass-ounce">
-                                <displayName draft="contributed">oz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} oz</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} oz</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} oz</unitPattern>
-                                <perUnitPattern>{0}/oz</perUnitPattern>
+                                <displayName>unče</displayName>
+                                <unitPattern count="one">{0} unča</unitPattern>
+                                <unitPattern count="two">{0} unči</unitPattern>
+                                <unitPattern count="few">{0} unče</unitPattern>
+                                <unitPattern count="other">{0} unč</unitPattern>
+                                <perUnitPattern>{0} na unčo</perUnitPattern>
                         </unit>
                         <unit type="mass-ounce-troy">
-                                <displayName draft="contributed">oz t</displayName>
-                                <unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} oz t</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
+                                <displayName>trojanske unče</displayName>
+                                <unitPattern count="one">{0} trojanska unča</unitPattern>
+                                <unitPattern count="two">{0} trojanski unči</unitPattern>
+                                <unitPattern count="few">{0} trojanske unče</unitPattern>
+                                <unitPattern count="other">{0} trojanskih unč</unitPattern>
                         </unit>
                         <unit type="mass-carat">
-                                <displayName draft="contributed">CD</displayName>
-                                <unitPattern count="one" draft="contributed">{0} CD</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} CD</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} CD</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} CD</unitPattern>
+                                <displayName>karati</displayName>
+                                <unitPattern count="one">{0} karat</unitPattern>
+                                <unitPattern count="two">{0} karata</unitPattern>
+                                <unitPattern count="few">{0} karati</unitPattern>
+                                <unitPattern count="other">{0} karatov</unitPattern>
                         </unit>
                         <unit type="power-gigawatt">
-                                <displayName draft="contributed">GW</displayName>
-                                <unitPattern count="one" draft="contributed">{0} GW</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} GW</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} GW</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} GW</unitPattern>
+                                <displayName>gigavati</displayName>
+                                <unitPattern count="one">{0} gigavat</unitPattern>
+                                <unitPattern count="two">{0} gigavata</unitPattern>
+                                <unitPattern count="few">{0} gigavati</unitPattern>
+                                <unitPattern count="other">{0} gigavatov</unitPattern>
                         </unit>
                         <unit type="power-megawatt">
-                                <displayName draft="contributed">MW</displayName>
-                                <unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} MW</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} MW</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} MW</unitPattern>
+                                <displayName>megavati</displayName>
+                                <unitPattern count="one">{0} megavat</unitPattern>
+                                <unitPattern count="two">{0} megavata</unitPattern>
+                                <unitPattern count="few">{0} megavati</unitPattern>
+                                <unitPattern count="other">{0} megavatov</unitPattern>
                         </unit>
                         <unit type="power-kilowatt">
-                                <displayName draft="contributed">kW</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kW</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kW</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kW</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kW</unitPattern>
+                                <displayName>kilovati</displayName>
+                                <unitPattern count="one">{0} kilovat</unitPattern>
+                                <unitPattern count="two">{0} kilovata</unitPattern>
+                                <unitPattern count="few">{0} kilovati</unitPattern>
+                                <unitPattern count="other">{0} kilovatov</unitPattern>
                         </unit>
                         <unit type="power-watt">
-                                <displayName draft="contributed">W</displayName>
-                                <unitPattern count="one" draft="contributed">{0} W</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} W</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} W</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} W</unitPattern>
+                                <displayName>vati</displayName>
+                                <unitPattern count="one">{0} vat</unitPattern>
+                                <unitPattern count="two">{0} vata</unitPattern>
+                                <unitPattern count="few">{0} vati</unitPattern>
+                                <unitPattern count="other">{0} vatov</unitPattern>
                         </unit>
                         <unit type="power-milliwatt">
-                                <displayName draft="contributed">mW</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mW</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mW</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mW</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+                                <displayName>milivati</displayName>
+                                <unitPattern count="one">{0} milivat</unitPattern>
+                                <unitPattern count="two">{0} milivata</unitPattern>
+                                <unitPattern count="few">{0} milivati</unitPattern>
+                                <unitPattern count="other">{0} milivatov</unitPattern>
                         </unit>
                         <unit type="power-horsepower">
-                                <displayName draft="contributed">KM</displayName>
-                                <unitPattern count="one" draft="contributed">{0} KM</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} KM</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} KM</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} KM</unitPattern>
+                                <displayName>konjska moč</displayName>
+                                <unitPattern count="one">{0} konjska moč</unitPattern>
+                                <unitPattern count="two">{0} konjski moči</unitPattern>
+                                <unitPattern count="few">{0} konjske moči</unitPattern>
+                                <unitPattern count="other">{0} konjskih moči</unitPattern>
                         </unit>
                         <unit type="pressure-hectopascal">
-                                <displayName draft="contributed">hPa</displayName>
-                                <unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} hPa</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} hPa</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
+                                <displayName>hektopaskali</displayName>
+                                <unitPattern count="one">{0} hektopaskal</unitPattern>
+                                <unitPattern count="two">{0} hektopaskala</unitPattern>
+                                <unitPattern count="few">{0} hektopaskali</unitPattern>
+                                <unitPattern count="other">{0} hektopaskalov</unitPattern>
                         </unit>
                         <unit type="pressure-millimeter-of-mercury">
-                                <displayName draft="contributed">mm Hg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mm Hg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mm Hg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
+                                <displayName>milimetri živega srebra</displayName>
+                                <unitPattern count="one">{0} milimeter živega srebra</unitPattern>
+                                <unitPattern count="two">{0} milimetra živega srebra</unitPattern>
+                                <unitPattern count="few">{0} milimetri živega srebra</unitPattern>
+                                <unitPattern count="other">{0} milimetrov živega srebra</unitPattern>
                         </unit>
                         <unit type="pressure-pound-per-square-inch">
-                                <displayName draft="contributed">psi</displayName>
-                                <unitPattern count="one" draft="contributed">{0} psi</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} psi</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} psi</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} psi</unitPattern>
+                                <displayName>funti na kvadratni palec</displayName>
+                                <unitPattern count="one">{0} funt na kvadratni palec</unitPattern>
+                                <unitPattern count="two">{0} funta na kvadratni palec</unitPattern>
+                                <unitPattern count="few">{0} funti na kvadratni palec</unitPattern>
+                                <unitPattern count="other">{0} funtov na kvadratni palec</unitPattern>
                         </unit>
                         <unit type="pressure-inch-hg">
-                                <displayName draft="contributed">inHg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} inHg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
+                                <displayName>palci živega srebra</displayName>
+                                <unitPattern count="one">{0} palec živega srebra</unitPattern>
+                                <unitPattern count="two">{0} palca živega srebra</unitPattern>
+                                <unitPattern count="few">{0} palci živega srebra</unitPattern>
+                                <unitPattern count="other">{0} palcev živega srebra</unitPattern>
                         </unit>
                         <unit type="pressure-millibar">
-                                <displayName draft="contributed">mbar</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mbar</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
+                                <displayName>milibari</displayName>
+                                <unitPattern count="one">{0} milibar</unitPattern>
+                                <unitPattern count="two">{0} milibara</unitPattern>
+                                <unitPattern count="few">{0} milibari</unitPattern>
+                                <unitPattern count="other">{0} milibarov</unitPattern>
                         </unit>
                         <unit type="speed-kilometer-per-hour">
-                                <displayName draft="contributed">kilometri na uro</displayName>
+                                <displayName>kilometri na uro</displayName>
                                 <unitPattern count="one">{0} kilometer na uro</unitPattern>
                                 <unitPattern count="two">{0} kilometra na uro</unitPattern>
                                 <unitPattern count="few">{0} kilometri na uro</unitPattern>
                                 <unitPattern count="other">{0} kilometrov na uro</unitPattern>
                         </unit>
                         <unit type="speed-meter-per-second">
-                                <displayName draft="contributed">metri na sekundo</displayName>
+                                <displayName>metri na sekundo</displayName>
                                 <unitPattern count="one">{0} meter na sekundo</unitPattern>
                                 <unitPattern count="two">{0} metra na sekundo</unitPattern>
                                 <unitPattern count="few">{0} metri na sekundo</unitPattern>
                                 <unitPattern count="other">{0} metrov na sekundo</unitPattern>
                         </unit>
                         <unit type="speed-mile-per-hour">
-                                <displayName draft="contributed">milje na uro</displayName>
+                                <displayName>milje na uro</displayName>
                                 <unitPattern count="one">{0} milja na uro</unitPattern>
                                 <unitPattern count="two">{0} milji na uro</unitPattern>
                                 <unitPattern count="few">{0} milje na uro</unitPattern>
                                 <unitPattern count="other">{0} milj na uro</unitPattern>
                         </unit>

@@ -7118,418 +8361,456 @@
                                 <unitPattern count="two">{0}°</unitPattern>
                                 <unitPattern count="few">{0}°</unitPattern>
                                 <unitPattern count="other">{0}°</unitPattern>
                         </unit>
                         <unit type="temperature-celsius">
-                                <displayName draft="contributed">°C</displayName>
-                                <unitPattern count="one" draft="contributed">{0} °C</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} °C</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} °C</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} °C</unitPattern>
+                                <displayName>stopinje Celzija</displayName>
+                                <unitPattern count="one">{0} stopinja Celzija</unitPattern>
+                                <unitPattern count="two">{0} stopinji Celzija</unitPattern>
+                                <unitPattern count="few">{0} stopinje Celzija</unitPattern>
+                                <unitPattern count="other">{0} stopinj Celzija</unitPattern>
                         </unit>
                         <unit type="temperature-fahrenheit">
-                                <displayName draft="contributed">°F</displayName>
-                                <unitPattern count="one" draft="contributed">{0} °F</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} °F</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} °F</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} °F</unitPattern>
+                                <displayName>stopinje Farenheita</displayName>
+                                <unitPattern count="one">{0} stopinja Farenheita</unitPattern>
+                                <unitPattern count="two">{0} stopinji Farenheita</unitPattern>
+                                <unitPattern count="few">{0} stopinje Farenheita</unitPattern>
+                                <unitPattern count="other">{0} stopinj Farenheita</unitPattern>
                         </unit>
                         <unit type="temperature-kelvin">
                                 <displayName>kelvini</displayName>
                                 <unitPattern count="one">{0} kelvin</unitPattern>
                                 <unitPattern count="two">{0} kelvina</unitPattern>
                                 <unitPattern count="few">{0} kelvini</unitPattern>
                                 <unitPattern count="other">{0} kelvinov</unitPattern>
                         </unit>
                         <unit type="volume-cubic-kilometer">
-                                <displayName draft="contributed">kubičnih kilometrov</displayName>
+                                <displayName>kubičnih kilometrov</displayName>
                                 <unitPattern count="one">{0} kubični kilometer</unitPattern>
                                 <unitPattern count="two">{0} kubična kilometra</unitPattern>
                                 <unitPattern count="few">{0} kubični kilometri</unitPattern>
                                 <unitPattern count="other">{0} kubičnih kilometrov</unitPattern>
                         </unit>
                         <unit type="volume-cubic-meter">
-                                <displayName draft="contributed">kubičnih metrov</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kubični meter</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kubična metra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kubični metri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kubičnih metrov</unitPattern>
+                                <displayName>kubičnih metrov</displayName>
+                                <unitPattern count="one">{0} kubični meter</unitPattern>
+                                <unitPattern count="two">{0} kubična metra</unitPattern>
+                                <unitPattern count="few">{0} kubični metri</unitPattern>
+                                <unitPattern count="other">{0} kubičnih metrov</unitPattern>
                                 <perUnitPattern>{0} na kubični meter</perUnitPattern>
                         </unit>
                         <unit type="volume-cubic-centimeter">
-                                <displayName draft="contributed">kubični centimeter</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kubični centimeter</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kubična centimetra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kubični centimetri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kubičnih centimetrov</unitPattern>
+                                <displayName>kubični centimeter</displayName>
+                                <unitPattern count="one">{0} kubični centimeter</unitPattern>
+                                <unitPattern count="two">{0} kubična centimetra</unitPattern>
+                                <unitPattern count="few">{0} kubični centimetri</unitPattern>
+                                <unitPattern count="other">{0} kubičnih centimetrov</unitPattern>
                                 <perUnitPattern>{0} na kubični centimeter</perUnitPattern>
                         </unit>
                         <unit type="volume-cubic-mile">
-                                <displayName draft="contributed">kubične milje</displayName>
+                                <displayName>kubične milje</displayName>
                                 <unitPattern count="one">{0} kubična milja</unitPattern>
                                 <unitPattern count="two">{0} kubični milji</unitPattern>
                                 <unitPattern count="few">{0} kubične milje</unitPattern>
                                 <unitPattern count="other">{0} kubičnih milj</unitPattern>
                         </unit>
                         <unit type="volume-cubic-yard">
-                                <displayName draft="contributed">kubični jard</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kubični jard</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kubična jarda</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kubični jardi</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kubičnih jardov</unitPattern>
+                                <displayName>kubični jard</displayName>
+                                <unitPattern count="one">{0} kubični jard</unitPattern>
+                                <unitPattern count="two">{0} kubična jarda</unitPattern>
+                                <unitPattern count="few">{0} kubični jardi</unitPattern>
+                                <unitPattern count="other">{0} kubičnih jardov</unitPattern>
                         </unit>
                         <unit type="volume-cubic-foot">
-                                <displayName draft="contributed">kubični čevlji</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kubični čevelj</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kubična čevlja</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kubični čevlji</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kubičnih čevljev</unitPattern>
+                                <displayName>kubični čevlji</displayName>
+                                <unitPattern count="one">{0} kubični čevelj</unitPattern>
+                                <unitPattern count="two">{0} kubična čevlja</unitPattern>
+                                <unitPattern count="few">{0} kubični čevlji</unitPattern>
+                                <unitPattern count="other">{0} kubičnih čevljev</unitPattern>
                         </unit>
                         <unit type="volume-cubic-inch">
-                                <displayName draft="contributed">kubičnih palcev</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kubični palec</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kubična palca</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kubični palci</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kubičnih palcev</unitPattern>
+                                <displayName>kubični palci</displayName>
+                                <unitPattern count="one">{0} kubični palec</unitPattern>
+                                <unitPattern count="two">{0} kubična palca</unitPattern>
+                                <unitPattern count="few">{0} kubični palci</unitPattern>
+                                <unitPattern count="other">{0} kubičnih palcev</unitPattern>
                         </unit>
                         <unit type="volume-megaliter">
-                                <displayName draft="contributed">megalitri</displayName>
-                                <unitPattern count="one" draft="contributed">{0} megaliter</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} megalitra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} megalitri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} megalitrov</unitPattern>
+                                <displayName>megalitri</displayName>
+                                <unitPattern count="one">{0} megaliter</unitPattern>
+                                <unitPattern count="two">{0} megalitra</unitPattern>
+                                <unitPattern count="few">{0} megalitri</unitPattern>
+                                <unitPattern count="other">{0} megalitrov</unitPattern>
                         </unit>
                         <unit type="volume-hectoliter">
-                                <displayName draft="contributed">hektolitri</displayName>
-                                <unitPattern count="one" draft="contributed">{0} hektoliter</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} hektolitra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} hektolitri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} hektolitrov</unitPattern>
+                                <displayName>hektolitri</displayName>
+                                <unitPattern count="one">{0} hektoliter</unitPattern>
+                                <unitPattern count="two">{0} hektolitra</unitPattern>
+                                <unitPattern count="few">{0} hektolitri</unitPattern>
+                                <unitPattern count="other">{0} hektolitrov</unitPattern>
                         </unit>
                         <unit type="volume-liter">
-                                <displayName draft="contributed">litrov</displayName>
+                                <displayName>litri</displayName>
                                 <unitPattern count="one">{0} liter</unitPattern>
                                 <unitPattern count="two">{0} litra</unitPattern>
                                 <unitPattern count="few">{0} litri</unitPattern>
                                 <unitPattern count="other">{0} litrov</unitPattern>
                                 <perUnitPattern>{0} na liter</perUnitPattern>
                         </unit>
                         <unit type="volume-deciliter">
-                                <displayName draft="contributed">decilitri</displayName>
-                                <unitPattern count="one" draft="contributed">{0} deciliter</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} decilitra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} decilitri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} decilitrov</unitPattern>
+                                <displayName>decilitri</displayName>
+                                <unitPattern count="one">{0} deciliter</unitPattern>
+                                <unitPattern count="two">{0} decilitra</unitPattern>
+                                <unitPattern count="few">{0} decilitri</unitPattern>
+                                <unitPattern count="other">{0} decilitrov</unitPattern>
                         </unit>
                         <unit type="volume-centiliter">
-                                <displayName draft="contributed">centilitrov</displayName>
-                                <unitPattern count="one" draft="contributed">{0} centiliter</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} centilitra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} centilitri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} centilitrov</unitPattern>
+                                <displayName>centilitri</displayName>
+                                <unitPattern count="one">{0} centiliter</unitPattern>
+                                <unitPattern count="two">{0} centilitra</unitPattern>
+                                <unitPattern count="few">{0} centilitri</unitPattern>
+                                <unitPattern count="other">{0} centilitrov</unitPattern>
                         </unit>
                         <unit type="volume-milliliter">
-                                <displayName draft="contributed">mililitri</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mililiter</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mililitra</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mililitri</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} militrov</unitPattern>
+                                <displayName>mililitri</displayName>
+                                <unitPattern count="one">{0} mililiter</unitPattern>
+                                <unitPattern count="two">{0} mililitra</unitPattern>
+                                <unitPattern count="few">{0} mililitri</unitPattern>
+                                <unitPattern count="other">{0} militrov</unitPattern>
                         </unit>
                         <unit type="volume-pint-metric">
-                                <displayName draft="contributed">metrične pinte</displayName>
-                                <unitPattern count="one" draft="contributed">{0} metrična pinta</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} metrični pinti</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} metrične pinte</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} metričnih pint</unitPattern>
+                                <displayName>metrične pinte</displayName>
+                                <unitPattern count="one">{0} metrična pinta</unitPattern>
+                                <unitPattern count="two">{0} metrični pinti</unitPattern>
+                                <unitPattern count="few">{0} metrične pinte</unitPattern>
+                                <unitPattern count="other">{0} metričnih pint</unitPattern>
                         </unit>
                         <unit type="volume-cup-metric">
                                 <displayName>metrične skodelice</displayName>
                                 <unitPattern count="one">{0} metrična skodelica</unitPattern>
                                 <unitPattern count="two">{0} metrični skodelici</unitPattern>
                                 <unitPattern count="few">{0} metrične skodelice</unitPattern>
                                 <unitPattern count="other">{0} metričnih skodelic</unitPattern>
                         </unit>
                         <unit type="volume-acre-foot">
-                                <displayName draft="contributed">ac ft</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ac ft</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+                                <displayName>aker-čevelj</displayName>
+                                <unitPattern count="one">{0} aker-čevelj</unitPattern>
+                                <unitPattern count="two">{0} aker-čevlja</unitPattern>
+                                <unitPattern count="few">{0} aker-čevlji</unitPattern>
+                                <unitPattern count="other">{0} aker-čevljev</unitPattern>
                         </unit>
                         <unit type="volume-gallon">
-                                <displayName draft="contributed">gal</displayName>
-                                <unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} gal</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} gal</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+                                <displayName>galone</displayName>
+                                <unitPattern count="one">{0} galona</unitPattern>
+                                <unitPattern count="two">{0} galoni</unitPattern>
+                                <unitPattern count="few">{0} galon</unitPattern>
+                                <unitPattern count="other">{0} galon</unitPattern>
                                 <perUnitPattern>{0} na galono</perUnitPattern>
                         </unit>
+                        <unit type="volume-gallon-imperial">
+                                <displayName>imperialna galona</displayName>
+                                <unitPattern count="one">{0} imperialna galona</unitPattern>
+                                <unitPattern count="two">{0} imperialni galoni</unitPattern>
+                                <unitPattern count="few">{0} imperialne galone</unitPattern>
+                                <unitPattern count="other">{0} imperialne galone</unitPattern>
+                                <perUnitPattern>{0} na imp. gal</perUnitPattern>
+                        </unit>
                         <unit type="volume-quart">
-                                <displayName draft="contributed">qt</displayName>
-                                <unitPattern count="one" draft="contributed">{0} qt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} qt</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} qt</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} qt</unitPattern>
+                                <displayName>četrtine</displayName>
+                                <unitPattern count="one">{0} četrtina</unitPattern>
+                                <unitPattern count="two">{0} četrtini</unitPattern>
+                                <unitPattern count="few">{0} četrtine</unitPattern>
+                                <unitPattern count="other">{0} četrtin</unitPattern>
                         </unit>
                         <unit type="volume-pint">
-                                <displayName draft="contributed">pt</displayName>
-                                <unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} pt</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} pt</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+                                <displayName>pinte</displayName>
+                                <unitPattern count="one">{0} pinta</unitPattern>
+                                <unitPattern count="two">{0} pinti</unitPattern>
+                                <unitPattern count="few">{0} pinte</unitPattern>
+                                <unitPattern count="other">{0} pint</unitPattern>
                         </unit>
                         <unit type="volume-cup">
-                                <displayName draft="contributed">skodelice</displayName>
-                                <unitPattern count="one" draft="contributed">{0} skodelica</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} skodelici</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} skodelice</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} skodelic</unitPattern>
+                                <displayName>skodelice</displayName>
+                                <unitPattern count="one">{0} skodelica</unitPattern>
+                                <unitPattern count="two">{0} skodelici</unitPattern>
+                                <unitPattern count="few">{0} skodelice</unitPattern>
+                                <unitPattern count="other">{0} skodelic</unitPattern>
                         </unit>
                         <unit type="volume-fluid-ounce">
-                                <displayName draft="contributed">fl oz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} fl oz</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+                                <displayName>tekoče unče</displayName>
+                                <unitPattern count="one">{0} tekoča unča</unitPattern>
+                                <unitPattern count="two">{0} tekoči unči</unitPattern>
+                                <unitPattern count="few">{0} tekoče unče</unitPattern>
+                                <unitPattern count="other">{0} tekočih unč</unitPattern>
                         </unit>
                         <unit type="volume-tablespoon">
-                                <displayName draft="contributed">jedilne žlice</displayName>
-                                <unitPattern count="one" draft="contributed">{0} jedilna žlica</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} jedilni žlici</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} jedilne žlice</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} jedilnih žlic</unitPattern>
+                                <displayName>jedilne žlice</displayName>
+                                <unitPattern count="one">{0} jedilna žlica</unitPattern>
+                                <unitPattern count="two">{0} jedilni žlici</unitPattern>
+                                <unitPattern count="few">{0} jedilne žlice</unitPattern>
+                                <unitPattern count="other">{0} jedilnih žlic</unitPattern>
                         </unit>
                         <unit type="volume-teaspoon">
-                                <displayName draft="contributed">čajne žličke</displayName>
-                                <unitPattern count="one" draft="contributed">{0} čajna žlička</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} čajni žlički</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} čajne žličke</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} čajnih žličk</unitPattern>
+                                <displayName>čajne žličke</displayName>
+                                <unitPattern count="one">{0} čajna žlička</unitPattern>
+                                <unitPattern count="two">{0} čajni žlički</unitPattern>
+                                <unitPattern count="few">{0} čajne žličke</unitPattern>
+                                <unitPattern count="other">{0} čajnih žličk</unitPattern>
                         </unit>
                         <coordinateUnit>
                                 <coordinateUnitPattern type="east">{0} V</coordinateUnitPattern>
                                 <coordinateUnitPattern type="north">{0} S</coordinateUnitPattern>
                                 <coordinateUnitPattern type="south">{0} J</coordinateUnitPattern>
                                 <coordinateUnitPattern type="west">{0} Z</coordinateUnitPattern>
                         </coordinateUnit>
                 </unitLength>
                 <unitLength type="short">
                         <compoundUnit type="per">
-                                <compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+                                <compoundUnitPattern>{0}/{1}</compoundUnitPattern>
                         </compoundUnit>
                         <unit type="acceleration-g-force">
-                                <displayName draft="contributed">G</displayName>
-                                <unitPattern count="one" draft="contributed">{0} G</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} G</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} G</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} G</unitPattern>
+                                <displayName>G</displayName>
+                                <unitPattern count="one">{0} G</unitPattern>
+                                <unitPattern count="two">{0} G</unitPattern>
+                                <unitPattern count="few">{0} G</unitPattern>
+                                <unitPattern count="other">{0} G</unitPattern>
                         </unit>
                         <unit type="acceleration-meter-per-second-squared">
-                                <displayName draft="contributed">m/s²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} m/s²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} m/s²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
+                                <displayName>m/s²</displayName>
+                                <unitPattern count="one">{0} m/s²</unitPattern>
+                                <unitPattern count="two">{0} m/s²</unitPattern>
+                                <unitPattern count="few">{0} m/s²</unitPattern>
+                                <unitPattern count="other">{0} m/s²</unitPattern>
                         </unit>
                         <unit type="angle-revolution">
                                 <displayName>vrt</displayName>
                                 <unitPattern count="one">{0} vrt</unitPattern>
                                 <unitPattern count="two">{0} vrt</unitPattern>
                                 <unitPattern count="few">{0} vrt</unitPattern>
                                 <unitPattern count="other">{0} vrt</unitPattern>
                         </unit>
                         <unit type="angle-radian">
-                                <displayName draft="contributed">rad</displayName>
-                                <unitPattern count="one" draft="contributed">{0} rad</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} rad</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} rad</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} rad</unitPattern>
+                                <displayName>rad</displayName>
+                                <unitPattern count="one">{0} rad</unitPattern>
+                                <unitPattern count="two">{0} rad</unitPattern>
+                                <unitPattern count="few">{0} rad</unitPattern>
+                                <unitPattern count="other">{0} rad</unitPattern>
                         </unit>
                         <unit type="angle-degree">
-                                <displayName draft="contributed">°</displayName>
-                                <unitPattern count="one" draft="contributed">{0} °</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} °</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} °</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} °</unitPattern>
+                                <displayName>°</displayName>
+                                <unitPattern count="one">{0} °</unitPattern>
+                                <unitPattern count="two">{0} °</unitPattern>
+                                <unitPattern count="few">{0} °</unitPattern>
+                                <unitPattern count="other">{0} °</unitPattern>
                         </unit>
                         <unit type="angle-arc-minute">
-                                <displayName draft="contributed">′</displayName>
-                                <unitPattern count="one" draft="contributed">{0}′</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0}′</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0}′</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0}′</unitPattern>
+                                <displayName>′</displayName>
+                                <unitPattern count="one">{0}′</unitPattern>
+                                <unitPattern count="two">{0}′</unitPattern>
+                                <unitPattern count="few">{0}′</unitPattern>
+                                <unitPattern count="other">{0}′</unitPattern>
                         </unit>
                         <unit type="angle-arc-second">
-                                <displayName draft="contributed">″</displayName>
-                                <unitPattern count="one" draft="contributed">{0}″</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0}″</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0}″</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0}″</unitPattern>
+                                <displayName>″</displayName>
+                                <unitPattern count="one">{0}″</unitPattern>
+                                <unitPattern count="two">{0}″</unitPattern>
+                                <unitPattern count="few">{0}″</unitPattern>
+                                <unitPattern count="other">{0}″</unitPattern>
                         </unit>
                         <unit type="area-square-kilometer">
-                                <displayName draft="contributed">km²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} km²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} km²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} km²</unitPattern>
+                                <displayName>km²</displayName>
+                                <unitPattern count="one">{0} km²</unitPattern>
+                                <unitPattern count="two">{0} km²</unitPattern>
+                                <unitPattern count="few">{0} km²</unitPattern>
+                                <unitPattern count="other">{0} km²</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/km²</perUnitPattern>
                         </unit>
                         <unit type="area-hectare">
-                                <displayName draft="contributed">ha</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ha</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ha</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ha</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ha</unitPattern>
+                                <displayName>ha</displayName>
+                                <unitPattern count="one">{0} ha</unitPattern>
+                                <unitPattern count="two">{0} ha</unitPattern>
+                                <unitPattern count="few">{0} ha</unitPattern>
+                                <unitPattern count="other">{0} ha</unitPattern>
                         </unit>
                         <unit type="area-square-meter">
-                                <displayName draft="contributed">m²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} m²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} m²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} m²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} m²</unitPattern>
-                                <perUnitPattern>{0} na m²</perUnitPattern>
+                                <displayName>m²</displayName>
+                                <unitPattern count="one">{0} m²</unitPattern>
+                                <unitPattern count="two">{0} m²</unitPattern>
+                                <unitPattern count="few">{0} m²</unitPattern>
+                                <unitPattern count="other">{0} m²</unitPattern>
+                                <perUnitPattern>{0}/m²</perUnitPattern>
                         </unit>
                         <unit type="area-square-centimeter">
-                                <displayName draft="contributed">cm²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} cm²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} cm²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
-                                <perUnitPattern>{0} na cm²</perUnitPattern>
+                                <displayName>cm²</displayName>
+                                <unitPattern count="one">{0} cm²</unitPattern>
+                                <unitPattern count="two">{0} cm²</unitPattern>
+                                <unitPattern count="few">{0} cm²</unitPattern>
+                                <unitPattern count="other">{0} cm²</unitPattern>
+                                <perUnitPattern>{0}/cm²</perUnitPattern>
                         </unit>
                         <unit type="area-square-mile">
-                                <displayName draft="contributed">mi²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mi²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
+                                <displayName>mi²</displayName>
+                                <unitPattern count="one">{0} mi²</unitPattern>
+                                <unitPattern count="two">{0} mi²</unitPattern>
+                                <unitPattern count="few">{0} mi²</unitPattern>
+                                <unitPattern count="other">{0} mi²</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/mi²</perUnitPattern>
                         </unit>
                         <unit type="area-acre">
-                                <displayName draft="contributed">juter</displayName>
-                                <unitPattern count="one" draft="contributed">{0} jut.</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} jut.</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} jut.</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} jut.</unitPattern>
+                                <displayName>aker</displayName>
+                                <unitPattern count="one">{0} ac</unitPattern>
+                                <unitPattern count="two">{0} ac</unitPattern>
+                                <unitPattern count="few">{0} ac</unitPattern>
+                                <unitPattern count="other">{0} ac</unitPattern>
                         </unit>
                         <unit type="area-square-yard">
-                                <displayName draft="contributed">yd²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} yd²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+                                <displayName>yd²</displayName>
+                                <unitPattern count="one">{0} yd²</unitPattern>
+                                <unitPattern count="two">{0} yd²</unitPattern>
+                                <unitPattern count="few">{0} yd²</unitPattern>
+                                <unitPattern count="other">{0} yd²</unitPattern>
                         </unit>
                         <unit type="area-square-foot">
-                                <displayName draft="contributed">ft²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ft²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
+                                <displayName>ft²</displayName>
+                                <unitPattern count="one">{0} ft²</unitPattern>
+                                <unitPattern count="two">{0} ft²</unitPattern>
+                                <unitPattern count="few">{0} ft²</unitPattern>
+                                <unitPattern count="other">{0} ft²</unitPattern>
                         </unit>
                         <unit type="area-square-inch">
-                                <displayName draft="contributed">in²</displayName>
-                                <unitPattern count="one" draft="contributed">{0} in²</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} in²</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} in²</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} in²</unitPattern>
-                                <perUnitPattern>{0} na in²</perUnitPattern>
+                                <displayName>in²</displayName>
+                                <unitPattern count="one">{0} in²</unitPattern>
+                                <unitPattern count="two">{0} in²</unitPattern>
+                                <unitPattern count="few">{0} in²</unitPattern>
+                                <unitPattern count="other">{0} in²</unitPattern>
+                                <perUnitPattern>{0}/in²</perUnitPattern>
                         </unit>
                         <unit type="concentr-karat">
                                 <displayName draft="contributed">kt</displayName>
                                 <unitPattern count="one" draft="contributed">{0} kt</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} kt</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} kt</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} kt</unitPattern>
                         </unit>
+                        <unit type="concentr-milligram-per-deciliter">
+                                <displayName draft="contributed">mg/dL</displayName>
+                                <unitPattern count="one" draft="contributed">{0} mg/dL</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} mg/dL</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} mg/dL</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} mg/dL</unitPattern>
+                        </unit>
+                        <unit type="concentr-millimole-per-liter">
+                                <displayName draft="contributed">mmol/L</displayName>
+                                <unitPattern count="one" draft="contributed">{0} mmol/L</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} mmol/L</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} mmol/L</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} mmol/L</unitPattern>
+                        </unit>
+                        <unit type="concentr-part-per-million">
+                                <displayName draft="contributed">ppm</displayName>
+                                <unitPattern count="one" draft="contributed">{0} ppm</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} ppm</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} ppm</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} ppm</unitPattern>
+                        </unit>
                         <unit type="consumption-liter-per-kilometer">
-                                <displayName draft="contributed">L/km</displayName>
-                                <unitPattern count="one" draft="contributed">{0} L/km</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} L/km</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} L/km</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} L/km</unitPattern>
+                                <displayName>L/km</displayName>
+                                <unitPattern count="one">{0} L/km</unitPattern>
+                                <unitPattern count="two">{0} L/km</unitPattern>
+                                <unitPattern count="few">{0} L/km</unitPattern>
+                                <unitPattern count="other">{0} L/km</unitPattern>
                         </unit>
                         <unit type="consumption-liter-per-100kilometers">
                                 <displayName>l/100 km</displayName>
                                 <unitPattern count="one">{0} l/100 km</unitPattern>
                                 <unitPattern count="two">{0} l/100 km</unitPattern>
                                 <unitPattern count="few">{0} l/100 km</unitPattern>
                                 <unitPattern count="other">{0} l/100 km</unitPattern>
                         </unit>
                         <unit type="consumption-mile-per-gallon">
-                                <displayName draft="contributed">mpg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mpg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mpg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
+                                <displayName>mpg</displayName>
+                                <unitPattern count="one">{0} mpg</unitPattern>
+                                <unitPattern count="two">{0} mpg</unitPattern>
+                                <unitPattern count="few">{0} mpg</unitPattern>
+                                <unitPattern count="other">{0} mpg</unitPattern>
+                        </unit>
+                        <unit type="consumption-mile-per-gallon-imperial">
+                                <displayName draft="contributed">mpg Imp.</displayName>
+                                <unitPattern count="one" draft="contributed">{0} mpg Imp.</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} mpg Imp.</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} mpg Imp.</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} mpg Imp.</unitPattern>
                         </unit>
                         <unit type="digital-terabyte">
-                                <displayName draft="contributed">TB</displayName>
-                                <unitPattern count="one" draft="contributed">{0} TB</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} TB</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} TB</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} TB</unitPattern>
+                                <displayName>TB</displayName>
+                                <unitPattern count="one">{0} TB</unitPattern>
+                                <unitPattern count="two">{0} TB</unitPattern>
+                                <unitPattern count="few">{0} TB</unitPattern>
+                                <unitPattern count="other">{0} TB</unitPattern>
                         </unit>
                         <unit type="digital-terabit">
-                                <displayName draft="contributed">Tb</displayName>
-                                <unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} Tb</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} Tb</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
+                                <displayName>Tb</displayName>
+                                <unitPattern count="one">{0} Tb</unitPattern>
+                                <unitPattern count="two">{0} Tb</unitPattern>
+                                <unitPattern count="few">{0} Tb</unitPattern>
+                                <unitPattern count="other">{0} Tb</unitPattern>
                         </unit>
                         <unit type="digital-gigabyte">
-                                <displayName draft="contributed">GB</displayName>
-                                <unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} GB</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} GB</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} GB</unitPattern>
+                                <displayName>GB</displayName>
+                                <unitPattern count="one">{0} GB</unitPattern>
+                                <unitPattern count="two">{0} GB</unitPattern>
+                                <unitPattern count="few">{0} GB</unitPattern>
+                                <unitPattern count="other">{0} GB</unitPattern>
                         </unit>
                         <unit type="digital-gigabit">
-                                <displayName draft="contributed">Gb</displayName>
-                                <unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} Gb</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} Gb</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
+                                <displayName>Gb</displayName>
+                                <unitPattern count="one">{0} Gb</unitPattern>
+                                <unitPattern count="two">{0} Gb</unitPattern>
+                                <unitPattern count="few">{0} Gb</unitPattern>
+                                <unitPattern count="other">{0} Gb</unitPattern>
                         </unit>
                         <unit type="digital-megabyte">
-                                <displayName draft="contributed">MB</displayName>
-                                <unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} MB</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} MB</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} MB</unitPattern>
+                                <displayName>MB</displayName>
+                                <unitPattern count="one">{0} MB</unitPattern>
+                                <unitPattern count="two">{0} MB</unitPattern>
+                                <unitPattern count="few">{0} MB</unitPattern>
+                                <unitPattern count="other">{0} MB</unitPattern>
                         </unit>
                         <unit type="digital-megabit">
-                                <displayName draft="contributed">Mb</displayName>
-                                <unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} Mb</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} Mb</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
+                                <displayName>Mb</displayName>
+                                <unitPattern count="one">{0} Mb</unitPattern>
+                                <unitPattern count="two">{0} Mb</unitPattern>
+                                <unitPattern count="few">{0} Mb</unitPattern>
+                                <unitPattern count="other">{0} Mb</unitPattern>
                         </unit>
                         <unit type="digital-kilobyte">
-                                <displayName draft="contributed">kB</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kB</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kB</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kB</unitPattern>
+                                <displayName>kB</displayName>
+                                <unitPattern count="one">{0} kB</unitPattern>
+                                <unitPattern count="two">{0} kB</unitPattern>
+                                <unitPattern count="few">{0} kB</unitPattern>
+                                <unitPattern count="other">{0} kB</unitPattern>
                         </unit>
                         <unit type="digital-kilobit">
-                                <displayName draft="contributed">kb</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kb</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kb</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kb</unitPattern>
+                                <displayName>kb</displayName>
+                                <unitPattern count="one">{0} kb</unitPattern>
+                                <unitPattern count="two">{0} kb</unitPattern>
+                                <unitPattern count="few">{0} kb</unitPattern>
+                                <unitPattern count="other">{0} kb</unitPattern>
                         </unit>
                         <unit type="digital-byte">
-                                <displayName draft="contributed">bajt</displayName>
-                                <unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} bajta</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} bajti</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} bajtov</unitPattern>
+                                <displayName>bajt</displayName>
+                                <unitPattern count="one">{0} bajt</unitPattern>
+                                <unitPattern count="two">{0} bajta</unitPattern>
+                                <unitPattern count="few">{0} bajti</unitPattern>
+                                <unitPattern count="other">{0} bajtov</unitPattern>
                         </unit>
                         <unit type="digital-bit">
-                                <displayName draft="contributed">bit</displayName>
-                                <unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} bit</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} bit</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} bit</unitPattern>
+                                <displayName>bit</displayName>
+                                <unitPattern count="one">{0} bit</unitPattern>
+                                <unitPattern count="two">{0} bit</unitPattern>
+                                <unitPattern count="few">{0} bit</unitPattern>
+                                <unitPattern count="other">{0} bit</unitPattern>
                         </unit>
                         <unit type="duration-century">
                                 <displayName>stol.</displayName>
                                 <unitPattern count="one">{0} stol.</unitPattern>
                                 <unitPattern count="two">{0} stol.</unitPattern>

@@ -7575,23 +8856,23 @@
                                 <unitPattern count="few">{0} h</unitPattern>
                                 <unitPattern count="other">{0} h</unitPattern>
                                 <perUnitPattern>{0}/h</perUnitPattern>
                         </unit>
                         <unit type="duration-minute">
-                                <displayName>minut</displayName>
+                                <displayName>min</displayName>
                                 <unitPattern count="one">{0} min</unitPattern>
                                 <unitPattern count="two">{0} min</unitPattern>
                                 <unitPattern count="few">{0} min</unitPattern>
                                 <unitPattern count="other">{0} min</unitPattern>
                                 <perUnitPattern>{0}/min</perUnitPattern>
                         </unit>
                         <unit type="duration-second">
-                                <displayName>sekund</displayName>
-                                <unitPattern count="one">{0} s</unitPattern>
-                                <unitPattern count="two">{0} s</unitPattern>
-                                <unitPattern count="few">{0} s</unitPattern>
-                                <unitPattern count="other">{0} s</unitPattern>
+                                <displayName>sek.</displayName>
+                                <unitPattern count="one">{0} sek.</unitPattern>
+                                <unitPattern count="two">{0} sek.</unitPattern>
+                                <unitPattern count="few">{0} sek.</unitPattern>
+                                <unitPattern count="other">{0} sek.</unitPattern>
                                 <perUnitPattern>{0}/s</perUnitPattern>
                         </unit>
                         <unit type="duration-millisecond">
                                 <displayName>ms</displayName>
                                 <unitPattern count="one">{0} ms</unitPattern>

@@ -7612,409 +8893,437 @@
                                 <unitPattern count="two">{0} ns</unitPattern>
                                 <unitPattern count="few">{0} ns</unitPattern>
                                 <unitPattern count="other">{0} ns</unitPattern>
                         </unit>
                         <unit type="electric-ampere">
-                                <displayName draft="contributed">amp</displayName>
-                                <unitPattern count="one" draft="contributed">{0} A</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} A</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} A</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} A</unitPattern>
+                                <displayName>A</displayName>
+                                <unitPattern count="one">{0} A</unitPattern>
+                                <unitPattern count="two">{0} A</unitPattern>
+                                <unitPattern count="few">{0} A</unitPattern>
+                                <unitPattern count="other">{0} A</unitPattern>
                         </unit>
                         <unit type="electric-milliampere">
-                                <displayName draft="contributed">mA</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mA</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mA</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mA</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mA</unitPattern>
+                                <displayName>mA</displayName>
+                                <unitPattern count="one">{0} mA</unitPattern>
+                                <unitPattern count="two">{0} mA</unitPattern>
+                                <unitPattern count="few">{0} mA</unitPattern>
+                                <unitPattern count="other">{0} mA</unitPattern>
                         </unit>
                         <unit type="electric-ohm">
-                                <displayName draft="contributed">ohm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} Ω</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} Ω</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} Ω</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} Ω</unitPattern>
+                                <displayName>ohm</displayName>
+                                <unitPattern count="one">{0} Ω</unitPattern>
+                                <unitPattern count="two">{0} Ω</unitPattern>
+                                <unitPattern count="few">{0} Ω</unitPattern>
+                                <unitPattern count="other">{0} Ω</unitPattern>
                         </unit>
                         <unit type="electric-volt">
-                                <displayName draft="contributed">V</displayName>
-                                <unitPattern count="one" draft="contributed">{0} V</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} V</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} V</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} V</unitPattern>
+                                <displayName>V</displayName>
+                                <unitPattern count="one">{0} V</unitPattern>
+                                <unitPattern count="two">{0} V</unitPattern>
+                                <unitPattern count="few">{0} V</unitPattern>
+                                <unitPattern count="other">{0} V</unitPattern>
                         </unit>
                         <unit type="energy-kilocalorie">
-                                <displayName draft="contributed">kcal</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kcal</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+                                <displayName>kcal</displayName>
+                                <unitPattern count="one">{0} kcal</unitPattern>
+                                <unitPattern count="two">{0} kcal</unitPattern>
+                                <unitPattern count="few">{0} kcal</unitPattern>
+                                <unitPattern count="other">{0} kcal</unitPattern>
                         </unit>
                         <unit type="energy-calorie">
-                                <displayName draft="contributed">cal</displayName>
-                                <unitPattern count="one" draft="contributed">{0} cal</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} cal</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} cal</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} cal</unitPattern>
+                                <displayName>cal</displayName>
+                                <unitPattern count="one">{0} cal</unitPattern>
+                                <unitPattern count="two">{0} cal</unitPattern>
+                                <unitPattern count="few">{0} cal</unitPattern>
+                                <unitPattern count="other">{0} cal</unitPattern>
                         </unit>
                         <unit type="energy-foodcalorie">
-                                <displayName draft="contributed">Cal</displayName>
-                                <unitPattern count="one" draft="contributed">{0} Cal</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} Cal</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} Cal</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} Cal</unitPattern>
+                                <displayName>Cal</displayName>
+                                <unitPattern count="one">{0} Cal</unitPattern>
+                                <unitPattern count="two">{0} Cal</unitPattern>
+                                <unitPattern count="few">{0} Cal</unitPattern>
+                                <unitPattern count="other">{0} Cal</unitPattern>
                         </unit>
                         <unit type="energy-kilojoule">
-                                <displayName draft="contributed">kJ</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kJ</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kJ</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
+                                <displayName>kJ</displayName>
+                                <unitPattern count="one">{0} kJ</unitPattern>
+                                <unitPattern count="two">{0} kJ</unitPattern>
+                                <unitPattern count="few">{0} kJ</unitPattern>
+                                <unitPattern count="other">{0} kJ</unitPattern>
                         </unit>
                         <unit type="energy-joule">
-                                <displayName draft="contributed">joule</displayName>
-                                <unitPattern count="one" draft="contributed">{0} J</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} J</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} J</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} J</unitPattern>
+                                <displayName>J</displayName>
+                                <unitPattern count="one">{0} J</unitPattern>
+                                <unitPattern count="two">{0} J</unitPattern>
+                                <unitPattern count="few">{0} J</unitPattern>
+                                <unitPattern count="other">{0} J</unitPattern>
                         </unit>
                         <unit type="energy-kilowatt-hour">
-                                <displayName draft="contributed">kWh</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kWh</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kWh</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kWh</unitPattern>
+                                <displayName>kWh</displayName>
+                                <unitPattern count="one">{0} kWh</unitPattern>
+                                <unitPattern count="two">{0} kWh</unitPattern>
+                                <unitPattern count="few">{0} kWh</unitPattern>
+                                <unitPattern count="other">{0} kWh</unitPattern>
                         </unit>
                         <unit type="frequency-gigahertz">
-                                <displayName draft="contributed">GHz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} GHz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} GHz</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} GHz</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
+                                <displayName>GHz</displayName>
+                                <unitPattern count="one">{0} GHz</unitPattern>
+                                <unitPattern count="two">{0} GHz</unitPattern>
+                                <unitPattern count="few">{0} GHz</unitPattern>
+                                <unitPattern count="other">{0} GHz</unitPattern>
                         </unit>
                         <unit type="frequency-megahertz">
-                                <displayName draft="contributed">MHz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} MHz</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} MHz</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
+                                <displayName>MHz</displayName>
+                                <unitPattern count="one">{0} MHz</unitPattern>
+                                <unitPattern count="two">{0} MHz</unitPattern>
+                                <unitPattern count="few">{0} MHz</unitPattern>
+                                <unitPattern count="other">{0} MHz</unitPattern>
                         </unit>
                         <unit type="frequency-kilohertz">
-                                <displayName draft="contributed">kHz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kHz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kHz</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kHz</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
+                                <displayName>kHz</displayName>
+                                <unitPattern count="one">{0} kHz</unitPattern>
+                                <unitPattern count="two">{0} kHz</unitPattern>
+                                <unitPattern count="few">{0} kHz</unitPattern>
+                                <unitPattern count="other">{0} kHz</unitPattern>
                         </unit>
                         <unit type="frequency-hertz">
-                                <displayName draft="contributed">Hz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} Hz</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} Hz</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
+                                <displayName>Hz</displayName>
+                                <unitPattern count="one">{0} Hz</unitPattern>
+                                <unitPattern count="two">{0} Hz</unitPattern>
+                                <unitPattern count="few">{0} Hz</unitPattern>
+                                <unitPattern count="other">{0} Hz</unitPattern>
                         </unit>
                         <unit type="length-kilometer">
-                                <displayName draft="contributed">km</displayName>
-                                <unitPattern count="one" draft="contributed">{0} km</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} km</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} km</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} km</unitPattern>
+                                <displayName>km</displayName>
+                                <unitPattern count="one">{0} km</unitPattern>
+                                <unitPattern count="two">{0} km</unitPattern>
+                                <unitPattern count="few">{0} km</unitPattern>
+                                <unitPattern count="other">{0} km</unitPattern>
                                 <perUnitPattern>{0}/km</perUnitPattern>
                         </unit>
                         <unit type="length-meter">
-                                <displayName draft="contributed">m</displayName>
-                                <unitPattern count="one" draft="contributed">{0} m</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} m</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} m</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} m</unitPattern>
+                                <displayName>m</displayName>
+                                <unitPattern count="one">{0} m</unitPattern>
+                                <unitPattern count="two">{0} m</unitPattern>
+                                <unitPattern count="few">{0} m</unitPattern>
+                                <unitPattern count="other">{0} m</unitPattern>
                                 <perUnitPattern>{0}/m</perUnitPattern>
                         </unit>
                         <unit type="length-decimeter">
-                                <displayName draft="contributed">dm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} dm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} dm</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} dm</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} dm</unitPattern>
+                                <displayName>dm</displayName>
+                                <unitPattern count="one">{0} dm</unitPattern>
+                                <unitPattern count="two">{0} dm</unitPattern>
+                                <unitPattern count="few">{0} dm</unitPattern>
+                                <unitPattern count="other">{0} dm</unitPattern>
                         </unit>
                         <unit type="length-centimeter">
-                                <displayName draft="contributed">cm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} cm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} cm</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} cm</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} cm</unitPattern>
+                                <displayName>cm</displayName>
+                                <unitPattern count="one">{0} cm</unitPattern>
+                                <unitPattern count="two">{0} cm</unitPattern>
+                                <unitPattern count="few">{0} cm</unitPattern>
+                                <unitPattern count="other">{0} cm</unitPattern>
                                 <perUnitPattern>{0}/cm</perUnitPattern>
                         </unit>
                         <unit type="length-millimeter">
-                                <displayName draft="contributed">mm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mm</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mm</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mm</unitPattern>
+                                <displayName>mm</displayName>
+                                <unitPattern count="one">{0} mm</unitPattern>
+                                <unitPattern count="two">{0} mm</unitPattern>
+                                <unitPattern count="few">{0} mm</unitPattern>
+                                <unitPattern count="other">{0} mm</unitPattern>
                         </unit>
                         <unit type="length-micrometer">
-                                <displayName draft="contributed">µm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} µm</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} µm</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+                                <displayName>µm</displayName>
+                                <unitPattern count="one">{0} µm</unitPattern>
+                                <unitPattern count="two">{0} µm</unitPattern>
+                                <unitPattern count="few">{0} µm</unitPattern>
+                                <unitPattern count="other">{0} µm</unitPattern>
                         </unit>
                         <unit type="length-nanometer">
-                                <displayName draft="contributed">nm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} nm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} nm</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} nm</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} nm</unitPattern>
+                                <displayName>nm</displayName>
+                                <unitPattern count="one">{0} nm</unitPattern>
+                                <unitPattern count="two">{0} nm</unitPattern>
+                                <unitPattern count="few">{0} nm</unitPattern>
+                                <unitPattern count="other">{0} nm</unitPattern>
                         </unit>
                         <unit type="length-picometer">
-                                <displayName draft="contributed">pm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} pm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} pm</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} pm</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} pm</unitPattern>
+                                <displayName>pm</displayName>
+                                <unitPattern count="one">{0} pm</unitPattern>
+                                <unitPattern count="two">{0} pm</unitPattern>
+                                <unitPattern count="few">{0} pm</unitPattern>
+                                <unitPattern count="other">{0} pm</unitPattern>
                         </unit>
                         <unit type="length-mile">
-                                <displayName draft="contributed">mi</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mi</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mi</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+                                <displayName>mi</displayName>
+                                <unitPattern count="one">{0} mi</unitPattern>
+                                <unitPattern count="two">{0} mi</unitPattern>
+                                <unitPattern count="few">{0} mi</unitPattern>
+                                <unitPattern count="other">{0} mi</unitPattern>
                         </unit>
                         <unit type="length-yard">
-                                <displayName draft="contributed">yd</displayName>
-                                <unitPattern count="one" draft="contributed">{0} yd</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} yd</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} yd</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} yd</unitPattern>
+                                <displayName>yd</displayName>
+                                <unitPattern count="one">{0} yd</unitPattern>
+                                <unitPattern count="two">{0} yd</unitPattern>
+                                <unitPattern count="few">{0} yd</unitPattern>
+                                <unitPattern count="other">{0} yd</unitPattern>
                         </unit>
                         <unit type="length-foot">
-                                <displayName draft="contributed">ft</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ft</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ft</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ft</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+                                <displayName>ft</displayName>
+                                <unitPattern count="one">{0} ft</unitPattern>
+                                <unitPattern count="two">{0} ft</unitPattern>
+                                <unitPattern count="few">{0} ft</unitPattern>
+                                <unitPattern count="other">{0} ft</unitPattern>
                                 <perUnitPattern>{0}/ft</perUnitPattern>
                         </unit>
                         <unit type="length-inch">
-                                <displayName draft="contributed">in</displayName>
-                                <unitPattern count="one" draft="contributed">{0} in</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} in</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} in</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} in</unitPattern>
+                                <displayName>in</displayName>
+                                <unitPattern count="one">{0} in</unitPattern>
+                                <unitPattern count="two">{0} in</unitPattern>
+                                <unitPattern count="few">{0} in</unitPattern>
+                                <unitPattern count="other">{0} in</unitPattern>
                                 <perUnitPattern>{0}/in</perUnitPattern>
                         </unit>
                         <unit type="length-parsec">
-                                <displayName draft="contributed">pc</displayName>
-                                <unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} pc</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} pc</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+                                <displayName>pc</displayName>
+                                <unitPattern count="one">{0} pc</unitPattern>
+                                <unitPattern count="two">{0} pc</unitPattern>
+                                <unitPattern count="few">{0} pc</unitPattern>
+                                <unitPattern count="other">{0} pc</unitPattern>
                         </unit>
                         <unit type="length-light-year">
-                                <displayName draft="contributed">sv. let</displayName>
-                                <unitPattern count="one" draft="contributed">{0} sv. let</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} sv. leti</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} sv. leta</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} sv. let</unitPattern>
+                                <displayName>sv. let</displayName>
+                                <unitPattern count="one">{0} sv. let</unitPattern>
+                                <unitPattern count="two">{0} sv. leti</unitPattern>
+                                <unitPattern count="few">{0} sv. leta</unitPattern>
+                                <unitPattern count="other">{0} sv. let</unitPattern>
                         </unit>
                         <unit type="length-astronomical-unit">
-                                <displayName draft="contributed">au</displayName>
-                                <unitPattern count="one" draft="contributed">{0} au</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} au</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} au</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} au</unitPattern>
+                                <displayName>ae</displayName>
+                                <unitPattern count="one">{0} ae</unitPattern>
+                                <unitPattern count="two">{0} ae</unitPattern>
+                                <unitPattern count="few">{0} ae</unitPattern>
+                                <unitPattern count="other">{0} ae</unitPattern>
+                        </unit>
+                        <unit type="length-furlong">
+                                <displayName draft="contributed">fur</displayName>
+                                <unitPattern count="one" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+                        </unit>
+                        <unit type="length-fathom">
+                                <displayName draft="contributed">fm</displayName>
+                                <unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} fm</unitPattern>
                         </unit>
                         <unit type="length-nautical-mile">
-                                <displayName draft="contributed">nmi</displayName>
-                                <unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} nmi</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} nmi</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
+                                <displayName>nmi</displayName>
+                                <unitPattern count="one">{0} nmi</unitPattern>
+                                <unitPattern count="two">{0} nmi</unitPattern>
+                                <unitPattern count="few">{0} nmi</unitPattern>
+                                <unitPattern count="other">{0} nmi</unitPattern>
                         </unit>
                         <unit type="length-mile-scandinavian">
                                 <displayName>smi</displayName>
                                 <unitPattern count="one">{0} smi</unitPattern>
                                 <unitPattern count="two">{0} smi</unitPattern>
                                 <unitPattern count="few">{0} smi</unitPattern>
                                 <unitPattern count="other">{0} smi</unitPattern>
                         </unit>
+                        <unit type="length-point">
+                                <displayName draft="contributed">pt</displayName>
+                                <unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} pt</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} pt</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+                        </unit>
                         <unit type="light-lux">
-                                <displayName draft="contributed">lx</displayName>
-                                <unitPattern count="one" draft="contributed">{0} lx</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} lx</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} lx</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} lx</unitPattern>
+                                <displayName>lx</displayName>
+                                <unitPattern count="one">{0} lx</unitPattern>
+                                <unitPattern count="two">{0} lx</unitPattern>
+                                <unitPattern count="few">{0} lx</unitPattern>
+                                <unitPattern count="other">{0} lx</unitPattern>
                         </unit>
                         <unit type="mass-metric-ton">
-                                <displayName draft="contributed">t</displayName>
-                                <unitPattern count="one" draft="contributed">{0} t</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} t</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} t</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} t</unitPattern>
+                                <displayName>t</displayName>
+                                <unitPattern count="one">{0} t</unitPattern>
+                                <unitPattern count="two">{0} t</unitPattern>
+                                <unitPattern count="few">{0} t</unitPattern>
+                                <unitPattern count="other">{0} t</unitPattern>
                         </unit>
                         <unit type="mass-kilogram">
-                                <displayName draft="contributed">kg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kg</unitPattern>
+                                <displayName>kg</displayName>
+                                <unitPattern count="one">{0} kg</unitPattern>
+                                <unitPattern count="two">{0} kg</unitPattern>
+                                <unitPattern count="few">{0} kg</unitPattern>
+                                <unitPattern count="other">{0} kg</unitPattern>
                                 <perUnitPattern>{0}/kg</perUnitPattern>
                         </unit>
                         <unit type="mass-gram">
-                                <displayName draft="contributed">g</displayName>
-                                <unitPattern count="one" draft="contributed">{0} g</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} g</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} g</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} g</unitPattern>
+                                <displayName>g</displayName>
+                                <unitPattern count="one">{0} g</unitPattern>
+                                <unitPattern count="two">{0} g</unitPattern>
+                                <unitPattern count="few">{0} g</unitPattern>
+                                <unitPattern count="other">{0} g</unitPattern>
                                 <perUnitPattern>{0}/g</perUnitPattern>
                         </unit>
                         <unit type="mass-milligram">
-                                <displayName draft="contributed">mg</displayName>
+                                <displayName>mg</displayName>
                                 <unitPattern count="one">{0} mg</unitPattern>
                                 <unitPattern count="two">{0} mg</unitPattern>
                                 <unitPattern count="few">{0} mg</unitPattern>
                                 <unitPattern count="other">{0} mg</unitPattern>
                         </unit>
                         <unit type="mass-microgram">
-                                <displayName draft="contributed">µg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} µg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} µg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} µg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} µg</unitPattern>
+                                <displayName>µg</displayName>
+                                <unitPattern count="one">{0} µg</unitPattern>
+                                <unitPattern count="two">{0} µg</unitPattern>
+                                <unitPattern count="few">{0} µg</unitPattern>
+                                <unitPattern count="other">{0} µg</unitPattern>
                         </unit>
                         <unit type="mass-ton">
-                                <displayName draft="contributed">tn</displayName>
-                                <unitPattern count="one" draft="contributed">{0} tn</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} tn</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} tn</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} tn</unitPattern>
+                                <displayName>sh tn</displayName>
+                                <unitPattern count="one">{0} sh tn</unitPattern>
+                                <unitPattern count="two">{0} sh tn</unitPattern>
+                                <unitPattern count="few">{0} sh tn</unitPattern>
+                                <unitPattern count="other">{0} sh tn</unitPattern>
+                        </unit>
+                        <unit type="mass-stone">
+                                <displayName draft="contributed">st</displayName>
+                                <unitPattern count="one" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} st</unitPattern>
                         </unit>
                         <unit type="mass-pound">
-                                <displayName draft="contributed">lb</displayName>
-                                <unitPattern count="one" draft="contributed">{0} lb</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} lb</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} lb</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} lb</unitPattern>
+                                <displayName>lb</displayName>
+                                <unitPattern count="one">{0} lb</unitPattern>
+                                <unitPattern count="two">{0} lb</unitPattern>
+                                <unitPattern count="few">{0} lb</unitPattern>
+                                <unitPattern count="other">{0} lb</unitPattern>
                                 <perUnitPattern>{0}/lb</perUnitPattern>
                         </unit>
                         <unit type="mass-ounce">
-                                <displayName draft="contributed">oz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} oz</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} oz</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+                                <displayName>oz</displayName>
+                                <unitPattern count="one">{0} oz</unitPattern>
+                                <unitPattern count="two">{0} oz</unitPattern>
+                                <unitPattern count="few">{0} oz</unitPattern>
+                                <unitPattern count="other">{0} oz</unitPattern>
                                 <perUnitPattern>{0}/oz</perUnitPattern>
                         </unit>
                         <unit type="mass-ounce-troy">
-                                <displayName draft="contributed">oz t</displayName>
-                                <unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} oz t</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
+                                <displayName>oz t</displayName>
+                                <unitPattern count="one">{0} oz t</unitPattern>
+                                <unitPattern count="two">{0} oz t</unitPattern>
+                                <unitPattern count="few">{0} oz t</unitPattern>
+                                <unitPattern count="other">{0} oz t</unitPattern>
                         </unit>
                         <unit type="mass-carat">
-                                <displayName draft="contributed">CD</displayName>
-                                <unitPattern count="one" draft="contributed">{0} CD</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} CD</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} CD</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} CD</unitPattern>
+                                <displayName>CD</displayName>
+                                <unitPattern count="one">{0} CD</unitPattern>
+                                <unitPattern count="two">{0} CD</unitPattern>
+                                <unitPattern count="few">{0} CD</unitPattern>
+                                <unitPattern count="other">{0} CD</unitPattern>
                         </unit>
                         <unit type="power-gigawatt">
-                                <displayName draft="contributed">GW</displayName>
-                                <unitPattern count="one" draft="contributed">{0} GW</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} GW</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} GW</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} GW</unitPattern>
+                                <displayName>GW</displayName>
+                                <unitPattern count="one">{0} GW</unitPattern>
+                                <unitPattern count="two">{0} GW</unitPattern>
+                                <unitPattern count="few">{0} GW</unitPattern>
+                                <unitPattern count="other">{0} GW</unitPattern>
                         </unit>
                         <unit type="power-megawatt">
-                                <displayName draft="contributed">MW</displayName>
-                                <unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} MW</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} MW</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} MW</unitPattern>
+                                <displayName>MW</displayName>
+                                <unitPattern count="one">{0} MW</unitPattern>
+                                <unitPattern count="two">{0} MW</unitPattern>
+                                <unitPattern count="few">{0} MW</unitPattern>
+                                <unitPattern count="other">{0} MW</unitPattern>
                         </unit>
                         <unit type="power-kilowatt">
-                                <displayName draft="contributed">kW</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kW</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kW</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kW</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kW</unitPattern>
+                                <displayName>kW</displayName>
+                                <unitPattern count="one">{0} kW</unitPattern>
+                                <unitPattern count="two">{0} kW</unitPattern>
+                                <unitPattern count="few">{0} kW</unitPattern>
+                                <unitPattern count="other">{0} kW</unitPattern>
                         </unit>
                         <unit type="power-watt">
-                                <displayName draft="contributed">W</displayName>
-                                <unitPattern count="one" draft="contributed">{0} W</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} W</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} W</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} W</unitPattern>
+                                <displayName>W</displayName>
+                                <unitPattern count="one">{0} W</unitPattern>
+                                <unitPattern count="two">{0} W</unitPattern>
+                                <unitPattern count="few">{0} W</unitPattern>
+                                <unitPattern count="other">{0} W</unitPattern>
                         </unit>
                         <unit type="power-milliwatt">
-                                <displayName draft="contributed">mW</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mW</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mW</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mW</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+                                <displayName>mW</displayName>
+                                <unitPattern count="one">{0} mW</unitPattern>
+                                <unitPattern count="two">{0} mW</unitPattern>
+                                <unitPattern count="few">{0} mW</unitPattern>
+                                <unitPattern count="other">{0} mW</unitPattern>
                         </unit>
                         <unit type="power-horsepower">
-                                <displayName draft="contributed">KM</displayName>
-                                <unitPattern count="one" draft="contributed">{0} KM</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} KM</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} KM</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} KM</unitPattern>
+                                <displayName>KM</displayName>
+                                <unitPattern count="one">{0} KM</unitPattern>
+                                <unitPattern count="two">{0} KM</unitPattern>
+                                <unitPattern count="few">{0} KM</unitPattern>
+                                <unitPattern count="other">{0} KM</unitPattern>
                         </unit>
                         <unit type="pressure-hectopascal">
-                                <displayName draft="contributed">hPa</displayName>
-                                <unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} hPa</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} hPa</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
+                                <displayName>hPa</displayName>
+                                <unitPattern count="one">{0} hPa</unitPattern>
+                                <unitPattern count="two">{0} hPa</unitPattern>
+                                <unitPattern count="few">{0} hPa</unitPattern>
+                                <unitPattern count="other">{0} hPa</unitPattern>
                         </unit>
                         <unit type="pressure-millimeter-of-mercury">
-                                <displayName draft="contributed">mm Hg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mm Hg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mm Hg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
+                                <displayName>mmHg</displayName>
+                                <unitPattern count="one">{0} mmHG</unitPattern>
+                                <unitPattern count="two">{0} mmHG</unitPattern>
+                                <unitPattern count="few">{0} mmHG</unitPattern>
+                                <unitPattern count="other">{0} mmHG</unitPattern>
                         </unit>
                         <unit type="pressure-pound-per-square-inch">
-                                <displayName draft="contributed">psi</displayName>
-                                <unitPattern count="one" draft="contributed">{0} psi</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} psi</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} psi</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} psi</unitPattern>
+                                <displayName>psi</displayName>
+                                <unitPattern count="one">{0} psi</unitPattern>
+                                <unitPattern count="two">{0} psi</unitPattern>
+                                <unitPattern count="few">{0} psi</unitPattern>
+                                <unitPattern count="other">{0} psi</unitPattern>
                         </unit>
                         <unit type="pressure-inch-hg">
-                                <displayName draft="contributed">inHg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} inHg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
+                                <displayName>inHg</displayName>
+                                <unitPattern count="one">{0} inHg</unitPattern>
+                                <unitPattern count="two">{0} inHg</unitPattern>
+                                <unitPattern count="few">{0} inHg</unitPattern>
+                                <unitPattern count="other">{0} inHg</unitPattern>
                         </unit>
                         <unit type="pressure-millibar">
-                                <displayName draft="contributed">mbar</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mbar</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
+                                <displayName>mbar</displayName>
+                                <unitPattern count="one">{0} mbar</unitPattern>
+                                <unitPattern count="two">{0} mbar</unitPattern>
+                                <unitPattern count="few">{0} mbar</unitPattern>
+                                <unitPattern count="other">{0} mbar</unitPattern>
                         </unit>
                         <unit type="speed-kilometer-per-hour">
-                                <displayName draft="contributed">km/h</displayName>
-                                <unitPattern count="one" draft="contributed">{0} km/h</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} km/h</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} km/h</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} km/h</unitPattern>
+                                <displayName>km/h</displayName>
+                                <unitPattern count="one">{0} km/h</unitPattern>
+                                <unitPattern count="two">{0} km/h</unitPattern>
+                                <unitPattern count="few">{0} km/h</unitPattern>
+                                <unitPattern count="other">{0} km/h</unitPattern>
                         </unit>
                         <unit type="speed-meter-per-second">
-                                <displayName draft="contributed">m/s</displayName>
-                                <unitPattern count="one" draft="contributed">{0} m/s</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} m/s</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} m/s</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} m/s</unitPattern>
+                                <displayName>m/s</displayName>
+                                <unitPattern count="one">{0} m/s</unitPattern>
+                                <unitPattern count="two">{0} m/s</unitPattern>
+                                <unitPattern count="few">{0} m/s</unitPattern>
+                                <unitPattern count="other">{0} m/s</unitPattern>
                         </unit>
                         <unit type="speed-mile-per-hour">
-                                <displayName draft="contributed">mi/h</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mi/h</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mi/h</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mi/h</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mi/h</unitPattern>
+                                <displayName>mi/h</displayName>
+                                <unitPattern count="one">{0} mi/h</unitPattern>
+                                <unitPattern count="two">{0} mi/h</unitPattern>
+                                <unitPattern count="few">{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="two">{0} kn</unitPattern>

@@ -8027,123 +9336,123 @@
                                 <unitPattern count="two">{0}°</unitPattern>
                                 <unitPattern count="few">{0}°</unitPattern>
                                 <unitPattern count="other">{0}°</unitPattern>
                         </unit>
                         <unit type="temperature-celsius">
-                                <displayName draft="contributed">°C</displayName>
-                                <unitPattern count="one" draft="contributed">{0} °C</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} °C</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} °C</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} °C</unitPattern>
+                                <displayName>°C</displayName>
+                                <unitPattern count="one">{0} °C</unitPattern>
+                                <unitPattern count="two">{0} °C</unitPattern>
+                                <unitPattern count="few">{0} °C</unitPattern>
+                                <unitPattern count="other">{0} °C</unitPattern>
                         </unit>
                         <unit type="temperature-fahrenheit">
-                                <displayName draft="contributed">°F</displayName>
-                                <unitPattern count="one" draft="contributed">{0} °F</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} °F</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} °F</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} °F</unitPattern>
+                                <displayName>°F</displayName>
+                                <unitPattern count="one">{0} °F</unitPattern>
+                                <unitPattern count="two">{0} °F</unitPattern>
+                                <unitPattern count="few">{0} °F</unitPattern>
+                                <unitPattern count="other">{0} °F</unitPattern>
                         </unit>
                         <unit type="temperature-kelvin">
-                                <displayName draft="contributed">K</displayName>
-                                <unitPattern count="one" draft="contributed">{0} K</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} K</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} K</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} K</unitPattern>
+                                <displayName>K</displayName>
+                                <unitPattern count="one">{0} K</unitPattern>
+                                <unitPattern count="two">{0} K</unitPattern>
+                                <unitPattern count="few">{0} K</unitPattern>
+                                <unitPattern count="other">{0} K</unitPattern>
                         </unit>
                         <unit type="volume-cubic-kilometer">
-                                <displayName draft="contributed">km³</displayName>
-                                <unitPattern count="one" draft="contributed">{0} km³</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} km³</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} km³</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} km³</unitPattern>
+                                <displayName>km³</displayName>
+                                <unitPattern count="one">{0} km³</unitPattern>
+                                <unitPattern count="two">{0} km³</unitPattern>
+                                <unitPattern count="few">{0} km³</unitPattern>
+                                <unitPattern count="other">{0} km³</unitPattern>
                         </unit>
                         <unit type="volume-cubic-meter">
-                                <displayName draft="contributed">m³</displayName>
-                                <unitPattern count="one" draft="contributed">{0} m³</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} m³</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} m³</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} m³</unitPattern>
+                                <displayName>m³</displayName>
+                                <unitPattern count="one">{0} m³</unitPattern>
+                                <unitPattern count="two">{0} m³</unitPattern>
+                                <unitPattern count="few">{0} m³</unitPattern>
+                                <unitPattern count="other">{0} m³</unitPattern>
                                 <perUnitPattern>{0}/m³</perUnitPattern>
                         </unit>
                         <unit type="volume-cubic-centimeter">
-                                <displayName draft="contributed">cm³</displayName>
-                                <unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} cm³</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+                                <displayName>cm³</displayName>
+                                <unitPattern count="one">{0} cm³</unitPattern>
+                                <unitPattern count="two">{0} cm³</unitPattern>
+                                <unitPattern count="few">{0} cm³</unitPattern>
+                                <unitPattern count="other">{0} cm³</unitPattern>
                                 <perUnitPattern>{0}/cm³</perUnitPattern>
                         </unit>
                         <unit type="volume-cubic-mile">
-                                <displayName draft="contributed">mi³</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mi³</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mi³</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mi³</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mi³</unitPattern>
+                                <displayName>mi³</displayName>
+                                <unitPattern count="one">{0} mi³</unitPattern>
+                                <unitPattern count="two">{0} mi³</unitPattern>
+                                <unitPattern count="few">{0} mi³</unitPattern>
+                                <unitPattern count="other">{0} mi³</unitPattern>
                         </unit>
                         <unit type="volume-cubic-yard">
-                                <displayName draft="contributed">yd³</displayName>
-                                <unitPattern count="one" draft="contributed">{0} yd³</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} yd³</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} yd³</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
+                                <displayName>yd³</displayName>
+                                <unitPattern count="one">{0} yd³</unitPattern>
+                                <unitPattern count="two">{0} yd³</unitPattern>
+                                <unitPattern count="few">{0} yd³</unitPattern>
+                                <unitPattern count="other">{0} yd³</unitPattern>
                         </unit>
                         <unit type="volume-cubic-foot">
-                                <displayName draft="contributed">ft³</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ft³</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
+                                <displayName>ft³</displayName>
+                                <unitPattern count="one">{0} ft³</unitPattern>
+                                <unitPattern count="two">{0} ft³</unitPattern>
+                                <unitPattern count="few">{0} ft³</unitPattern>
+                                <unitPattern count="other">{0} ft³</unitPattern>
                         </unit>
                         <unit type="volume-cubic-inch">
-                                <displayName draft="contributed">in³</displayName>
-                                <unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} in³</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} in³</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} in³</unitPattern>
+                                <displayName>in³</displayName>
+                                <unitPattern count="one">{0} in³</unitPattern>
+                                <unitPattern count="two">{0} in³</unitPattern>
+                                <unitPattern count="few">{0} in³</unitPattern>
+                                <unitPattern count="other">{0} in³</unitPattern>
                         </unit>
                         <unit type="volume-megaliter">
-                                <displayName draft="contributed">Ml</displayName>
-                                <unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} Ml</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} Ml</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
+                                <displayName>Ml</displayName>
+                                <unitPattern count="one">{0} Ml</unitPattern>
+                                <unitPattern count="two">{0} Ml</unitPattern>
+                                <unitPattern count="few">{0} Ml</unitPattern>
+                                <unitPattern count="other">{0} Ml</unitPattern>
                         </unit>
                         <unit type="volume-hectoliter">
-                                <displayName draft="contributed">hL</displayName>
-                                <unitPattern count="one" draft="contributed">{0} hL</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} hL</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} hL</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} hL</unitPattern>
+                                <displayName>hL</displayName>
+                                <unitPattern count="one">{0} hL</unitPattern>
+                                <unitPattern count="two">{0} hL</unitPattern>
+                                <unitPattern count="few">{0} hL</unitPattern>
+                                <unitPattern count="other">{0} hL</unitPattern>
                         </unit>
                         <unit type="volume-liter">
-                                <displayName draft="contributed">l</displayName>
-                                <unitPattern count="one" draft="contributed">{0} l</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} l</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} l</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} l</unitPattern>
+                                <displayName>l</displayName>
+                                <unitPattern count="one">{0} l</unitPattern>
+                                <unitPattern count="two">{0} l</unitPattern>
+                                <unitPattern count="few">{0} l</unitPattern>
+                                <unitPattern count="other">{0} l</unitPattern>
                                 <perUnitPattern>{0}/l</perUnitPattern>
                         </unit>
                         <unit type="volume-deciliter">
-                                <displayName draft="contributed">dL</displayName>
-                                <unitPattern count="one" draft="contributed">{0} dL</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} dL</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} dL</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} dL</unitPattern>
+                                <displayName>dL</displayName>
+                                <unitPattern count="one">{0} dL</unitPattern>
+                                <unitPattern count="two">{0} dL</unitPattern>
+                                <unitPattern count="few">{0} dL</unitPattern>
+                                <unitPattern count="other">{0} dL</unitPattern>
                         </unit>
                         <unit type="volume-centiliter">
-                                <displayName draft="contributed">cL</displayName>
-                                <unitPattern count="one" draft="contributed">{0} cL</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} cL</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} cL</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} cL</unitPattern>
+                                <displayName>cL</displayName>
+                                <unitPattern count="one">{0} cL</unitPattern>
+                                <unitPattern count="two">{0} cL</unitPattern>
+                                <unitPattern count="few">{0} cL</unitPattern>
+                                <unitPattern count="other">{0} cL</unitPattern>
                         </unit>
                         <unit type="volume-milliliter">
-                                <displayName draft="contributed">ml</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ml</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ml</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ml</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ml</unitPattern>
+                                <displayName>ml</displayName>
+                                <unitPattern count="one">{0} ml</unitPattern>
+                                <unitPattern count="two">{0} ml</unitPattern>
+                                <unitPattern count="few">{0} ml</unitPattern>
+                                <unitPattern count="other">{0} ml</unitPattern>
                         </unit>
                         <unit type="volume-pint-metric">
                                 <displayName>mpt</displayName>
                                 <unitPattern count="one">{0} mpt</unitPattern>
                                 <unitPattern count="two">{0} mpt</unitPattern>

@@ -8156,83 +9465,99 @@
                                 <unitPattern count="two">{0} m. skod.</unitPattern>
                                 <unitPattern count="few">{0} m. skod.</unitPattern>
                                 <unitPattern count="other">{0} m. skod.</unitPattern>
                         </unit>
                         <unit type="volume-acre-foot">
-                                <displayName draft="contributed">ac ft</displayName>
-                                <unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} ac ft</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+                                <displayName>ac ft</displayName>
+                                <unitPattern count="one">{0} ac ft</unitPattern>
+                                <unitPattern count="two">{0} ac ft</unitPattern>
+                                <unitPattern count="few">{0} ac ft</unitPattern>
+                                <unitPattern count="other">{0} ac ft</unitPattern>
                         </unit>
                         <unit type="volume-gallon">
-                                <displayName draft="contributed">gal</displayName>
-                                <unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} gal</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} gal</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+                                <displayName>gal</displayName>
+                                <unitPattern count="one">{0} gal</unitPattern>
+                                <unitPattern count="two">{0} gal</unitPattern>
+                                <unitPattern count="few">{0} gal</unitPattern>
+                                <unitPattern count="other">{0} gal</unitPattern>
                                 <perUnitPattern>{0}/gal</perUnitPattern>
                         </unit>
+                        <unit type="volume-gallon-imperial">
+                                <displayName>imp. gal</displayName>
+                                <unitPattern count="one">{0} imp. gal</unitPattern>
+                                <unitPattern count="two">{0} imp. gal</unitPattern>
+                                <unitPattern count="few">{0} imp. gal</unitPattern>
+                                <unitPattern count="other">{0} imp. gal</unitPattern>
+                                <perUnitPattern>{0}/imp. gal</perUnitPattern>
+                        </unit>
                         <unit type="volume-quart">
-                                <displayName draft="contributed">qt</displayName>
-                                <unitPattern count="one" draft="contributed">{0} qt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} qt</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} qt</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} qt</unitPattern>
+                                <displayName>qt</displayName>
+                                <unitPattern count="one">{0} qt</unitPattern>
+                                <unitPattern count="two">{0} qt</unitPattern>
+                                <unitPattern count="few">{0} qt</unitPattern>
+                                <unitPattern count="other">{0} qt</unitPattern>
                         </unit>
                         <unit type="volume-pint">
-                                <displayName draft="contributed">pt</displayName>
-                                <unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} pt</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} pt</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+                                <displayName>pt</displayName>
+                                <unitPattern count="one">{0} pt</unitPattern>
+                                <unitPattern count="two">{0} pt</unitPattern>
+                                <unitPattern count="few">{0} pt</unitPattern>
+                                <unitPattern count="other">{0} pt</unitPattern>
                         </unit>
                         <unit type="volume-cup">
-                                <displayName draft="contributed">c</displayName>
-                                <unitPattern count="one" draft="contributed">{0} c</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} c</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} c</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} c</unitPattern>
+                                <displayName>c</displayName>
+                                <unitPattern count="one">{0} c</unitPattern>
+                                <unitPattern count="two">{0} c</unitPattern>
+                                <unitPattern count="few">{0} c</unitPattern>
+                                <unitPattern count="other">{0} c</unitPattern>
                         </unit>
                         <unit type="volume-fluid-ounce">
-                                <displayName draft="contributed">fl oz</displayName>
-                                <unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} fl oz</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+                                <displayName>fl oz</displayName>
+                                <unitPattern count="one">{0} fl oz</unitPattern>
+                                <unitPattern count="two">{0} fl oz</unitPattern>
+                                <unitPattern count="few">{0} fl oz</unitPattern>
+                                <unitPattern count="other">{0} fl oz</unitPattern>
                         </unit>
                         <unit type="volume-tablespoon">
-                                <displayName draft="contributed">žlica</displayName>
-                                <unitPattern count="one" draft="contributed">{0} žlica</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} žlici</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} žlice</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} žlic</unitPattern>
+                                <displayName>žlica</displayName>
+                                <unitPattern count="one">{0} žlica</unitPattern>
+                                <unitPattern count="two">{0} žlici</unitPattern>
+                                <unitPattern count="few">{0} žlice</unitPattern>
+                                <unitPattern count="other">{0} žlic</unitPattern>
                         </unit>
                         <unit type="volume-teaspoon">
-                                <displayName draft="contributed">žlička</displayName>
-                                <unitPattern count="one" draft="contributed">{0} žlička</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} žlički</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} žličke</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} žličk</unitPattern>
+                                <displayName>žlička</displayName>
+                                <unitPattern count="one">{0} žlička</unitPattern>
+                                <unitPattern count="two">{0} žlički</unitPattern>
+                                <unitPattern count="few">{0} žličke</unitPattern>
+                                <unitPattern count="other">{0} žličk</unitPattern>
                         </unit>
                         <coordinateUnit>
                                 <coordinateUnitPattern type="east">{0} V</coordinateUnitPattern>
                                 <coordinateUnitPattern type="north">{0} S</coordinateUnitPattern>
                                 <coordinateUnitPattern type="south">{0} J</coordinateUnitPattern>
                                 <coordinateUnitPattern type="west">{0} Z</coordinateUnitPattern>
                         </coordinateUnit>
                 </unitLength>
                 <unitLength type="narrow">
                         <compoundUnit type="per">
-                                <compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+                                <compoundUnitPattern>{0}/{1}</compoundUnitPattern>
                         </compoundUnit>
                         <unit type="acceleration-g-force">
+                                <displayName draft="contributed">G</displayName>
                                 <unitPattern count="one" draft="contributed">{0} G</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} G</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} G</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} G</unitPattern>
                         </unit>
+                        <unit type="acceleration-meter-per-second-squared">
+                                <displayName draft="contributed">m/s²</displayName>
+                                <unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} m/s²</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} m/s²</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
+                        </unit>
                         <unit type="angle-degree">
                                 <unitPattern count="one" draft="contributed">{0} °</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} °</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} °</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} °</unitPattern>

@@ -8284,161 +9609,325 @@
                                 <unitPattern count="two" draft="contributed">{0} ft²</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
                         </unit>
                         <unit type="consumption-liter-per-100kilometers">
-                                <displayName draft="contributed">l/100 km</displayName>
+                                <displayName>l/100 km</displayName>
                                 <unitPattern count="one">{0} l/100 km</unitPattern>
                                 <unitPattern count="two">{0} l/100 km</unitPattern>
                                 <unitPattern count="few">{0} l/100 km</unitPattern>
                                 <unitPattern count="other">{0} l/100 km</unitPattern>
                         </unit>
+                        <unit type="duration-century">
+                                <displayName draft="contributed">st.</displayName>
+                                <unitPattern count="one" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} st</unitPattern>
+                        </unit>
                         <unit type="duration-year">
                                 <displayName>let</displayName>
                                 <unitPattern count="one">{0} l</unitPattern>
                                 <unitPattern count="two">{0} l</unitPattern>
                                 <unitPattern count="few">{0} l</unitPattern>
                                 <unitPattern count="other">{0} l</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/l</perUnitPattern>
                         </unit>
                         <unit type="duration-month">
                                 <displayName>mesecev</displayName>
                                 <unitPattern count="one">{0} m</unitPattern>
                                 <unitPattern count="two">{0} m</unitPattern>
                                 <unitPattern count="few">{0} m</unitPattern>
                                 <unitPattern count="other">{0} m</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/m</perUnitPattern>
                         </unit>
                         <unit type="duration-week">
                                 <displayName>tednov</displayName>
                                 <unitPattern count="one">{0} t</unitPattern>
                                 <unitPattern count="two">{0} t</unitPattern>
                                 <unitPattern count="few">{0} t</unitPattern>
                                 <unitPattern count="other">{0} t</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/t</perUnitPattern>
                         </unit>
                         <unit type="duration-day">
                                 <displayName>dni</displayName>
                                 <unitPattern count="one">{0} d</unitPattern>
                                 <unitPattern count="two">{0} d</unitPattern>
                                 <unitPattern count="few">{0} d</unitPattern>
                                 <unitPattern count="other">{0} d</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/dan.</perUnitPattern>
                         </unit>
                         <unit type="duration-hour">
                                 <displayName>ur</displayName>
                                 <unitPattern count="one">{0} h</unitPattern>
                                 <unitPattern count="two">{0} h</unitPattern>
                                 <unitPattern count="few">{0} h</unitPattern>
                                 <unitPattern count="other">{0} h</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/h</perUnitPattern>
                         </unit>
                         <unit type="duration-minute">
                                 <displayName>minut</displayName>
                                 <unitPattern count="one">{0} min</unitPattern>
                                 <unitPattern count="two">{0} min</unitPattern>
                                 <unitPattern count="few">{0} min</unitPattern>
                                 <unitPattern count="other">{0} min</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/min</perUnitPattern>
                         </unit>
                         <unit type="duration-second">
-                                <displayName>sekund</displayName>
+                                <displayName>s</displayName>
                                 <unitPattern count="one">{0} s</unitPattern>
                                 <unitPattern count="two">{0} s</unitPattern>
                                 <unitPattern count="few">{0} s</unitPattern>
                                 <unitPattern count="other">{0} s</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/s</perUnitPattern>
                         </unit>
                         <unit type="duration-millisecond">
                                 <displayName>ms</displayName>
                                 <unitPattern count="one">{0} ms</unitPattern>
                                 <unitPattern count="two">{0} ms</unitPattern>
                                 <unitPattern count="few">{0} ms</unitPattern>
                                 <unitPattern count="other">{0} ms</unitPattern>
                         </unit>
+                        <unit type="duration-microsecond">
+                                <displayName draft="contributed">μs</displayName>
+                                <unitPattern count="one" draft="contributed">{0} μs</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} μs</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} μs</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} μs</unitPattern>
+                        </unit>
+                        <unit type="duration-nanosecond">
+                                <displayName draft="contributed">ns</displayName>
+                                <unitPattern count="one" draft="contributed">{0} ns</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} ns</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} ns</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} ns</unitPattern>
+                        </unit>
                         <unit type="length-kilometer">
-                                <displayName draft="contributed">km</displayName>
-                                <unitPattern count="one" draft="contributed">{0} km</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} km</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} km</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} km</unitPattern>
+                                <displayName>km</displayName>
+                                <unitPattern count="one">{0} km</unitPattern>
+                                <unitPattern count="two">{0} km</unitPattern>
+                                <unitPattern count="few">{0} km</unitPattern>
+                                <unitPattern count="other">{0} km</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/km</perUnitPattern>
                         </unit>
                         <unit type="length-meter">
-                                <displayName draft="contributed">m</displayName>
-                                <unitPattern count="one" draft="contributed">{0} m</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} m</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} m</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} m</unitPattern>
+                                <displayName>m</displayName>
+                                <unitPattern count="one">{0} m</unitPattern>
+                                <unitPattern count="two">{0} m</unitPattern>
+                                <unitPattern count="few">{0} m</unitPattern>
+                                <unitPattern count="other">{0} m</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/m</perUnitPattern>
+                        </unit>
+                        <unit type="length-decimeter">
+                                <displayName draft="contributed">dm</displayName>
+                                <unitPattern count="one" draft="contributed">{0} dm</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} dm</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} dm</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} dm</unitPattern>
                         </unit>
                         <unit type="length-centimeter">
-                                <displayName draft="contributed">cm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} cm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} cm</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} cm</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} cm</unitPattern>
+                                <displayName>cm</displayName>
+                                <unitPattern count="one">{0} cm</unitPattern>
+                                <unitPattern count="two">{0} cm</unitPattern>
+                                <unitPattern count="few">{0} cm</unitPattern>
+                                <unitPattern count="other">{0} cm</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/cm</perUnitPattern>
                         </unit>
                         <unit type="length-millimeter">
-                                <displayName draft="contributed">mm</displayName>
-                                <unitPattern count="one" draft="contributed">{0} mm</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} mm</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} mm</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} mm</unitPattern>
+                                <displayName>mm</displayName>
+                                <unitPattern count="one">{0} mm</unitPattern>
+                                <unitPattern count="two">{0} mm</unitPattern>
+                                <unitPattern count="few">{0} mm</unitPattern>
+                                <unitPattern count="other">{0} mm</unitPattern>
+                        </unit>
+                        <unit type="length-micrometer">
+                                <displayName draft="contributed">µm</displayName>
+                                <unitPattern count="one" draft="contributed">{0} µm</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} µm</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} µm</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+                        </unit>
+                        <unit type="length-nanometer">
+                                <displayName draft="contributed">nm</displayName>
+                                <unitPattern count="one" draft="contributed">{0} nm</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} nm</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} nm</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} nm</unitPattern>
                         </unit>
                         <unit type="length-picometer">
+                                <displayName draft="contributed">pm</displayName>
                                 <unitPattern count="one" draft="contributed">{0} pm</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} pm</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} pm</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} pm</unitPattern>
                         </unit>
                         <unit type="length-mile">
+                                <displayName draft="contributed">mi</displayName>
                                 <unitPattern count="one" draft="contributed">{0} mi</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} mi</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} mi</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} mi</unitPattern>
                         </unit>
                         <unit type="length-yard">
+                                <displayName draft="contributed">yd</displayName>
                                 <unitPattern count="one" draft="contributed">{0} yd</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} yd</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} yd</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} yd</unitPattern>
                         </unit>
                         <unit type="length-foot">
+                                <displayName draft="contributed">ft</displayName>
                                 <unitPattern count="one" draft="contributed">{0} ft</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} ft</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} ft</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/ft</perUnitPattern>
                         </unit>
                         <unit type="length-inch">
+                                <displayName draft="contributed">in</displayName>
                                 <unitPattern count="one" draft="contributed">{0} in</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} in</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} in</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} in</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/in</perUnitPattern>
+                        </unit>
+                        <unit type="length-parsec">
+                                <displayName draft="contributed">pc</displayName>
+                                <unitPattern count="one" draft="contributed">{0} pc</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} pc</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} pc</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} pc</unitPattern>
                         </unit>
                         <unit type="length-light-year">
+                                <displayName draft="contributed">sv. let</displayName>
                                 <unitPattern count="one" draft="contributed">{0} ly</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} sv. l.</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} sv. l.</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} sv. l.</unitPattern>
                         </unit>
+                        <unit type="length-astronomical-unit">
+                                <displayName draft="contributed">ae</displayName>
+                                <unitPattern count="one" draft="contributed">{0} ae</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} ae</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} ae</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} ae</unitPattern>
+                        </unit>
+                        <unit type="length-furlong">
+                                <displayName draft="contributed">fur</displayName>
+                                <unitPattern count="one" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} fur</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+                        </unit>
+                        <unit type="length-fathom">
+                                <displayName draft="contributed">fm</displayName>
+                                <unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} fm</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} fm</unitPattern>
+                        </unit>
+                        <unit type="length-nautical-mile">
+                                <displayName draft="contributed">nmi</displayName>
+                                <unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} nmi</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} nmi</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
+                        </unit>
+                        <unit type="length-mile-scandinavian">
+                                <displayName draft="contributed">smi</displayName>
+                                <unitPattern count="one" draft="contributed">{0} smi</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} smi</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} smi</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} smi</unitPattern>
+                        </unit>
+                        <unit type="length-point">
+                                <displayName draft="contributed">pt</displayName>
+                                <unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} pt</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} pt</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+                        </unit>
+                        <unit type="mass-metric-ton">
+                                <displayName draft="contributed">t</displayName>
+                                <unitPattern count="one" draft="contributed">{0} t</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} t</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} t</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} t</unitPattern>
+                        </unit>
                         <unit type="mass-kilogram">
-                                <displayName draft="contributed">kg</displayName>
-                                <unitPattern count="one" draft="contributed">{0} kg</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} kg</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} kg</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} kg</unitPattern>
+                                <displayName>kg</displayName>
+                                <unitPattern count="one">{0} kg</unitPattern>
+                                <unitPattern count="two">{0} kg</unitPattern>
+                                <unitPattern count="few">{0} kg</unitPattern>
+                                <unitPattern count="other">{0} kg</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/kg</perUnitPattern>
                         </unit>
                         <unit type="mass-gram">
-                                <displayName draft="contributed">g</displayName>
-                                <unitPattern count="one" draft="contributed">{0} g</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} g</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} g</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} g</unitPattern>
+                                <displayName>g</displayName>
+                                <unitPattern count="one">{0} g</unitPattern>
+                                <unitPattern count="two">{0} g</unitPattern>
+                                <unitPattern count="few">{0} g</unitPattern>
+                                <unitPattern count="other">{0} g</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/g</perUnitPattern>
+                        </unit>
+                        <unit type="mass-milligram">
+                                <displayName draft="contributed">mg</displayName>
+                                <unitPattern count="one" draft="contributed">{0} mg</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} mg</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} mg</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} mg</unitPattern>
+                        </unit>
+                        <unit type="mass-microgram">
+                                <displayName draft="contributed">µg</displayName>
+                                <unitPattern count="one" draft="contributed">{0} µg</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} µg</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} µg</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} µg</unitPattern>
+                        </unit>
+                        <unit type="mass-ton">
+                                <displayName draft="contributed">tn</displayName>
+                                <unitPattern count="one" draft="contributed">{0} tn</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} tn</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} tn</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} tn</unitPattern>
+                        </unit>
+                        <unit type="mass-stone">
+                                <displayName draft="contributed">st</displayName>
+                                <unitPattern count="one" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} st</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} st</unitPattern>
                         </unit>
                         <unit type="mass-pound">
+                                <displayName draft="contributed">lb</displayName>
                                 <unitPattern count="one" draft="contributed">{0} lb</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} lb</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} lb</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} lb</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/lb</perUnitPattern>
                         </unit>
                         <unit type="mass-ounce">
+                                <displayName draft="contributed">oz</displayName>
                                 <unitPattern count="one" draft="contributed">{0} oz</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} oz</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} oz</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+                                <perUnitPattern draft="contributed">{0}/oz</perUnitPattern>
+                        </unit>
+                        <unit type="mass-ounce-troy">
+                                <displayName draft="contributed">oz t</displayName>
+                                <unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} oz t</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
+                        </unit>
+                        <unit type="mass-carat">
+                                <displayName draft="contributed">CD</displayName>
+                                <unitPattern count="one" draft="contributed">{0} CD</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} CD</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} CD</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} CD</unitPattern>
                         </unit>
                         <unit type="power-kilowatt">
                                 <unitPattern count="one" draft="contributed">{0} kW</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} kW</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} kW</unitPattern>

@@ -8455,59 +9944,100 @@
                                 <unitPattern count="two" draft="contributed">{0} KM</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} KM</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} hp</unitPattern>
                         </unit>
                         <unit type="pressure-hectopascal">
+                                <displayName draft="contributed">hPa</displayName>
                                 <unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} hPa</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} hPa</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
                         </unit>
+                        <unit type="pressure-millimeter-of-mercury">
+                                <displayName draft="contributed">mm Hg</displayName>
+                                <unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} mm Hg</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} mm Hg</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
+                        </unit>
+                        <unit type="pressure-pound-per-square-inch">
+                                <displayName draft="contributed">psi</displayName>
+                                <unitPattern count="one" draft="contributed">{0} psi</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} psi</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} psi</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} psi</unitPattern>
+                        </unit>
                         <unit type="pressure-inch-hg">
+                                <displayName draft="contributed">inHg</displayName>
                                 <unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} inHg</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
                         </unit>
                         <unit type="pressure-millibar">
+                                <displayName draft="contributed">mbar</displayName>
                                 <unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} mbar</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
                         </unit>
                         <unit type="speed-kilometer-per-hour">
-                                <displayName draft="contributed">km/h</displayName>
-                                <unitPattern count="one" draft="contributed">{0} km/h</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} km/h</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} km/h</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} km/h</unitPattern>
+                                <displayName>km/h</displayName>
+                                <unitPattern count="one">{0} km/h</unitPattern>
+                                <unitPattern count="two">{0} km/h</unitPattern>
+                                <unitPattern count="few">{0} km/h</unitPattern>
+                                <unitPattern count="other">{0} km/h</unitPattern>
                         </unit>
                         <unit type="speed-meter-per-second">
+                                <displayName draft="contributed">m/s</displayName>
                                 <unitPattern count="one" draft="contributed">{0} m/s</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} m/s</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} m/s</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} m/s</unitPattern>
                         </unit>
                         <unit type="speed-mile-per-hour">
+                                <displayName draft="contributed">mi/h</displayName>
                                 <unitPattern count="one" draft="contributed">{0} mi/h</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} mi/h</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} mi/h</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} mi/h</unitPattern>
                         </unit>
+                        <unit type="speed-knot">
+                                <displayName draft="contributed">kn</displayName>
+                                <unitPattern count="one" draft="contributed">{0} kn</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} kn</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} kn</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} kn</unitPattern>
+                        </unit>
+                        <unit type="temperature-generic">
+                                <displayName draft="contributed">°</displayName>
+                                <unitPattern count="one" draft="contributed">{0}°</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0}°</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0}°</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0}°</unitPattern>
+                        </unit>
                         <unit type="temperature-celsius">
-                                <displayName draft="contributed">°C</displayName>
-                                <unitPattern count="one" draft="contributed">{0} °</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} °</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} °</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} °</unitPattern>
+                                <displayName>°C</displayName>
+                                <unitPattern count="one">{0} °</unitPattern>
+                                <unitPattern count="two">{0} °</unitPattern>
+                                <unitPattern count="few">{0} °</unitPattern>
+                                <unitPattern count="other">{0} °</unitPattern>
                         </unit>
                         <unit type="temperature-fahrenheit">
+                                <displayName draft="contributed">°F</displayName>
                                 <unitPattern count="one" draft="contributed">{0} °F</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} °F</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} °F</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} °F</unitPattern>
                         </unit>
+                        <unit type="temperature-kelvin">
+                                <displayName draft="contributed">K</displayName>
+                                <unitPattern count="one" draft="contributed">{0} K</unitPattern>
+                                <unitPattern count="two" draft="contributed">{0} K</unitPattern>
+                                <unitPattern count="few" draft="contributed">{0} K</unitPattern>
+                                <unitPattern count="other" draft="contributed">{0} K</unitPattern>
+                        </unit>
                         <unit type="volume-cubic-kilometer">
                                 <unitPattern count="one" draft="contributed">{0} km³</unitPattern>
                                 <unitPattern count="two" draft="contributed">{0} km³</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} km³</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} km³</unitPattern>

@@ -8517,15 +10047,15 @@
                                 <unitPattern count="two" draft="contributed">{0} mi³</unitPattern>
                                 <unitPattern count="few" draft="contributed">{0} mi³</unitPattern>
                                 <unitPattern count="other" draft="contributed">{0} mi³</unitPattern>
                         </unit>
                         <unit type="volume-liter">
-                                <displayName draft="contributed">l</displayName>
-                                <unitPattern count="one" draft="contributed">{0} l</unitPattern>
-                                <unitPattern count="two" draft="contributed">{0} l</unitPattern>
-                                <unitPattern count="few" draft="contributed">{0} l</unitPattern>
-                                <unitPattern count="other" draft="contributed">{0} l</unitPattern>
+                                <displayName>l</displayName>
+                                <unitPattern count="one">{0} l</unitPattern>
+                                <unitPattern count="two">{0} l</unitPattern>
+                                <unitPattern count="few">{0} l</unitPattern>
+                                <unitPattern count="other">{0} l</unitPattern>
                         </unit>
                         <coordinateUnit>
                                 <coordinateUnitPattern type="east">{0} V</coordinateUnitPattern>
                                 <coordinateUnitPattern type="north">{0} S</coordinateUnitPattern>
                                 <coordinateUnitPattern type="south">{0} J</coordinateUnitPattern>

@@ -8547,10 +10077,22 @@
                         <listPatternPart type="start">{0}, {1}</listPatternPart>
                         <listPatternPart type="middle">{0}, {1}</listPatternPart>
                         <listPatternPart type="end">{0} in {1}</listPatternPart>
                         <listPatternPart type="2">{0} in {1}</listPatternPart>
                 </listPattern>
+                <listPattern type="or">
+                        <listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
+                        <listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
+                        <listPatternPart type="end" draft="contributed">{0} ali {1}</listPatternPart>
+                        <listPatternPart type="2" draft="contributed">{0} ali {1}</listPatternPart>
+                </listPattern>
+                <listPattern type="standard-short">
+                        <listPatternPart type="start">{0}, {1}</listPatternPart>
+                        <listPatternPart type="middle">{0}, {1}</listPatternPart>
+                        <listPatternPart type="end">{0} in {1}</listPatternPart>
+                        <listPatternPart type="2">{0} in {1}</listPatternPart>
+                </listPattern>
                 <listPattern type="unit">
                         <listPatternPart type="start">{0}, {1}</listPatternPart>
                         <listPatternPart type="middle">{0}, {1}</listPatternPart>
                         <listPatternPart type="end">{0} in {1}</listPatternPart>
                         <listPatternPart type="2">{0} in {1}</listPatternPart>

@@ -8572,7 +10114,107 @@
                 <messages>
                         <yesstr>da:d</yesstr>
                         <nostr>ne:n</nostr>
                 </messages>
         </posix>
+        <characterLabels>
+                <characterLabelPattern type="all" draft="contributed">{0} – vse</characterLabelPattern>
+                <characterLabelPattern type="category-list">{0}: {1}</characterLabelPattern>
+                <characterLabelPattern type="compatibility" draft="contributed">{0} – združljivost</characterLabelPattern>
+                <characterLabelPattern type="enclosed" draft="contributed">{0} – vključeno</characterLabelPattern>
+                <characterLabelPattern type="extended" draft="contributed">{0} – razširjeno</characterLabelPattern>
+                <characterLabelPattern type="historic" draft="contributed">{0} – zgodovinsko</characterLabelPattern>
+                <characterLabelPattern type="miscellaneous" draft="contributed">{0} – razno</characterLabelPattern>
+                <characterLabelPattern type="other" draft="contributed">{0} – drugo</characterLabelPattern>
+                <characterLabelPattern type="scripts" draft="contributed">pisave – {0}</characterLabelPattern>
+                <characterLabelPattern type="strokes" count="one" draft="contributed">{0} poteza</characterLabelPattern>
+                <characterLabelPattern type="strokes" count="two" draft="contributed">{0} potezi</characterLabelPattern>
+                <characterLabelPattern type="strokes" count="few" draft="contributed">{0} potez</characterLabelPattern>
+                <characterLabelPattern type="strokes" count="other" draft="contributed">{0} potez</characterLabelPattern>
+                <characterLabel type="activities" draft="contributed">dejavnosti</characterLabel>
+                <characterLabel type="african_scripts" draft="contributed">afriške pisave</characterLabel>
+                <characterLabel type="american_scripts" draft="contributed">ameriške pisave</characterLabel>
+                <characterLabel type="animal">žival</characterLabel>
+                <characterLabel type="animals_nature" draft="contributed">živali in narava</characterLabel>
+                <characterLabel type="arrows" draft="contributed">puščice</characterLabel>
+                <characterLabel type="body">telo</characterLabel>
+                <characterLabel type="box_drawing" draft="contributed">risani okviri</characterLabel>
+                <characterLabel type="braille" draft="contributed">braillova pisava</characterLabel>
+                <characterLabel type="building">zgradba</characterLabel>
+                <characterLabel type="bullets_stars" draft="contributed">oznake/zvezdice</characterLabel>
+                <characterLabel type="consonantal_jamo" draft="contributed">soglasniška črka jamo</characterLabel>
+                <characterLabel type="currency_symbols" draft="contributed">valutni simboli</characterLabel>
+                <characterLabel type="dash_connector" draft="contributed">pomišljaj/povezovalnik</characterLabel>
+                <characterLabel type="digits">števke</characterLabel>
+                <characterLabel type="dingbats" draft="contributed">Dingbati</characterLabel>
+                <characterLabel type="divination_symbols" draft="contributed">vedeževalski simboli</characterLabel>
+                <characterLabel type="downwards_arrows" draft="contributed">puščice dol</characterLabel>
+                <characterLabel type="downwards_upwards_arrows" draft="contributed">puščice gor-dol</characterLabel>
+                <characterLabel type="east_asian_scripts" draft="contributed">vzhodnoazijske pisave</characterLabel>
+                <characterLabel type="emoji" draft="contributed">čustveni simboli</characterLabel>
+                <characterLabel type="european_scripts" draft="contributed">evropske pisave</characterLabel>
+                <characterLabel type="female">ženska</characterLabel>
+                <characterLabel type="flag">zastava</characterLabel>
+                <characterLabel type="flags" draft="contributed">zastave</characterLabel>
+                <characterLabel type="food_drink" draft="contributed">hrana in pijača</characterLabel>
+                <characterLabel type="format" draft="contributed">oblika</characterLabel>
+                <characterLabel type="format_whitespace" draft="contributed">oblika in presledki</characterLabel>
+                <characterLabel type="full_width_form_variant" draft="contributed">variantne oblike polne širine</characterLabel>
+                <characterLabel type="geometric_shapes" draft="contributed">geometrijske oblike</characterLabel>
+                <characterLabel type="half_width_form_variant" draft="contributed">variantne oblike polovične širine</characterLabel>
+                <characterLabel type="han_characters" draft="contributed">znaki han</characterLabel>
+                <characterLabel type="han_radicals" draft="contributed">koreni han</characterLabel>
+                <characterLabel type="hanja" draft="contributed">hanja</characterLabel>
+                <characterLabel type="hanzi_simplified" draft="contributed">hanzi (poenostavljeno)</characterLabel>
+                <characterLabel type="hanzi_traditional" draft="contributed">hanzi (tradicionalno)</characterLabel>
+                <characterLabel type="heart">srce</characterLabel>
+                <characterLabel type="historic_scripts" draft="contributed">zgodovinske pisave</characterLabel>
+                <characterLabel type="ideographic_desc_characters" draft="contributed">ideogramski opisni znaki</characterLabel>
+                <characterLabel type="japanese_kana" draft="contributed">japonska kana</characterLabel>
+                <characterLabel type="kanbun" draft="contributed">kanbun</characterLabel>
+                <characterLabel type="kanji" draft="contributed">kandži</characterLabel>
+                <characterLabel type="keycap">keycap</characterLabel>
+                <characterLabel type="leftwards_arrows" draft="contributed">puščice levo</characterLabel>
+                <characterLabel type="leftwards_rightwards_arrows" draft="contributed">puščice levo-desno</characterLabel>
+                <characterLabel type="letterlike_symbols" draft="contributed">simboli kot črke</characterLabel>
+                <characterLabel type="limited_use" draft="contributed">omejena uporaba</characterLabel>
+                <characterLabel type="male">moški</characterLabel>
+                <characterLabel type="math_symbols" draft="contributed">matematični simboli</characterLabel>
+                <characterLabel type="middle_eastern_scripts" draft="contributed">pisave Bližnjega vzhoda</characterLabel>
+                <characterLabel type="miscellaneous" draft="contributed">Razno</characterLabel>
+                <characterLabel type="modern_scripts" draft="contributed">moderne pisave</characterLabel>
+                <characterLabel type="modifier" draft="contributed">modifikator</characterLabel>
+                <characterLabel type="musical_symbols" draft="contributed">glasbeni simboli</characterLabel>
+                <characterLabel type="nature">narava</characterLabel>
+                <characterLabel type="nonspacing" draft="contributed">sestavljiv znak</characterLabel>
+                <characterLabel type="numbers" draft="contributed">številke</characterLabel>
+                <characterLabel type="objects" draft="contributed">predmeti</characterLabel>
+                <characterLabel type="other" draft="contributed">drugo</characterLabel>
+                <characterLabel type="paired" draft="contributed">v paru</characterLabel>
+                <characterLabel type="person">oseba</characterLabel>
+                <characterLabel type="phonetic_alphabet" draft="contributed">fonetična abeceda</characterLabel>
+                <characterLabel type="pictographs" draft="contributed">piktogrami</characterLabel>
+                <characterLabel type="place">kraj</characterLabel>
+                <characterLabel type="plant">rastlina</characterLabel>
+                <characterLabel type="punctuation" draft="contributed">ločila</characterLabel>
+                <characterLabel type="rightwards_arrows" draft="contributed">puščice desno</characterLabel>
+                <characterLabel type="sign_standard_symbols" draft="contributed">znaki/standardni simboli</characterLabel>
+                <characterLabel type="small_form_variant" draft="contributed">male variantne oblike</characterLabel>
+                <characterLabel type="smiley">smeško</characterLabel>
+                <characterLabel type="smileys_people" draft="contributed">smeški in osebe</characterLabel>
+                <characterLabel type="south_asian_scripts" draft="contributed">južnoazijske pisave</characterLabel>
+                <characterLabel type="southeast_asian_scripts" draft="contributed">pisave jugovzhodne Azije</characterLabel>
+                <characterLabel type="spacing" draft="contributed">razmik</characterLabel>
+                <characterLabel type="sport">šport</characterLabel>
+                <characterLabel type="symbols" draft="contributed">simboli</characterLabel>
+                <characterLabel type="technical_symbols" draft="contributed">tehnični simboli</characterLabel>
+                <characterLabel type="tone_marks" draft="contributed">naglasna znamenja</characterLabel>
+                <characterLabel type="travel">potovanje</characterLabel>
+                <characterLabel type="travel_places" draft="contributed">potovanja in kraji</characterLabel>
+                <characterLabel type="upwards_arrows" draft="contributed">puščice navzgor</characterLabel>
+                <characterLabel type="variant_forms" draft="contributed">variantne oblike</characterLabel>
+                <characterLabel type="vocalic_jamo" draft="contributed">samoglasniška črka jamo</characterLabel>
+                <characterLabel type="weather">vreme</characterLabel>
+                <characterLabel type="western_asian_scripts" draft="contributed">zahodnoazijske pisave</characterLabel>
+                <characterLabel type="whitespace" draft="contributed">presledek</characterLabel>
+        </characterLabels>
 </ldml>
-
< prev index next >