changeset 56122:925ee7a89325

8221432: Upgrade CLDR to Version 35.1 Reviewed-by: rriggs, srl
author naoto
date Wed, 08 May 2019 12:45:02 -0700
parents 6f6b636d2909
children 62b6e7587b1f
files make/data/cldr/README make/data/cldr/common/bcp47/timezone.xml make/data/cldr/common/dtd/ldml.dtd make/data/cldr/common/dtd/ldmlBCP47.dtd make/data/cldr/common/dtd/ldmlSupplemental.dtd make/data/cldr/common/main/af.xml make/data/cldr/common/main/af_NA.xml make/data/cldr/common/main/af_ZA.xml make/data/cldr/common/main/agq.xml make/data/cldr/common/main/agq_CM.xml make/data/cldr/common/main/ak.xml make/data/cldr/common/main/ak_GH.xml make/data/cldr/common/main/am.xml make/data/cldr/common/main/am_ET.xml make/data/cldr/common/main/ar.xml make/data/cldr/common/main/ar_001.xml make/data/cldr/common/main/ar_AE.xml make/data/cldr/common/main/ar_BH.xml make/data/cldr/common/main/ar_DJ.xml make/data/cldr/common/main/ar_DZ.xml make/data/cldr/common/main/ar_EG.xml make/data/cldr/common/main/ar_EH.xml make/data/cldr/common/main/ar_ER.xml make/data/cldr/common/main/ar_IL.xml make/data/cldr/common/main/ar_IQ.xml make/data/cldr/common/main/ar_JO.xml make/data/cldr/common/main/ar_KM.xml make/data/cldr/common/main/ar_KW.xml make/data/cldr/common/main/ar_LB.xml make/data/cldr/common/main/ar_LY.xml make/data/cldr/common/main/ar_MA.xml make/data/cldr/common/main/ar_MR.xml make/data/cldr/common/main/ar_OM.xml make/data/cldr/common/main/ar_PS.xml make/data/cldr/common/main/ar_QA.xml make/data/cldr/common/main/ar_SA.xml make/data/cldr/common/main/ar_SD.xml make/data/cldr/common/main/ar_SO.xml make/data/cldr/common/main/ar_SS.xml make/data/cldr/common/main/ar_SY.xml make/data/cldr/common/main/ar_TD.xml make/data/cldr/common/main/ar_TN.xml make/data/cldr/common/main/ar_YE.xml make/data/cldr/common/main/as.xml make/data/cldr/common/main/as_IN.xml make/data/cldr/common/main/asa.xml make/data/cldr/common/main/asa_TZ.xml make/data/cldr/common/main/ast.xml make/data/cldr/common/main/ast_ES.xml make/data/cldr/common/main/az.xml make/data/cldr/common/main/az_Cyrl.xml make/data/cldr/common/main/az_Cyrl_AZ.xml make/data/cldr/common/main/az_Latn.xml make/data/cldr/common/main/az_Latn_AZ.xml make/data/cldr/common/main/bas.xml make/data/cldr/common/main/bas_CM.xml make/data/cldr/common/main/be.xml make/data/cldr/common/main/be_BY.xml make/data/cldr/common/main/bem.xml make/data/cldr/common/main/bem_ZM.xml make/data/cldr/common/main/bez.xml make/data/cldr/common/main/bez_TZ.xml make/data/cldr/common/main/bg.xml make/data/cldr/common/main/bg_BG.xml make/data/cldr/common/main/bm.xml make/data/cldr/common/main/bm_ML.xml make/data/cldr/common/main/bn.xml make/data/cldr/common/main/bn_BD.xml make/data/cldr/common/main/bn_IN.xml make/data/cldr/common/main/bo.xml make/data/cldr/common/main/bo_CN.xml make/data/cldr/common/main/bo_IN.xml make/data/cldr/common/main/br.xml make/data/cldr/common/main/br_FR.xml make/data/cldr/common/main/brx.xml make/data/cldr/common/main/brx_IN.xml make/data/cldr/common/main/bs.xml make/data/cldr/common/main/bs_Cyrl.xml make/data/cldr/common/main/bs_Cyrl_BA.xml make/data/cldr/common/main/bs_Latn.xml make/data/cldr/common/main/bs_Latn_BA.xml make/data/cldr/common/main/ca.xml make/data/cldr/common/main/ca_AD.xml make/data/cldr/common/main/ca_ES.xml make/data/cldr/common/main/ca_ES_VALENCIA.xml make/data/cldr/common/main/ca_FR.xml make/data/cldr/common/main/ca_IT.xml make/data/cldr/common/main/ccp.xml make/data/cldr/common/main/ccp_BD.xml make/data/cldr/common/main/ccp_IN.xml make/data/cldr/common/main/ce.xml make/data/cldr/common/main/ce_RU.xml make/data/cldr/common/main/ceb.xml make/data/cldr/common/main/ceb_PH.xml make/data/cldr/common/main/cgg.xml make/data/cldr/common/main/cgg_UG.xml make/data/cldr/common/main/chr.xml make/data/cldr/common/main/chr_US.xml make/data/cldr/common/main/ckb.xml make/data/cldr/common/main/ckb_IQ.xml make/data/cldr/common/main/ckb_IR.xml make/data/cldr/common/main/cs.xml make/data/cldr/common/main/cs_CZ.xml make/data/cldr/common/main/cu.xml make/data/cldr/common/main/cu_RU.xml make/data/cldr/common/main/cy.xml make/data/cldr/common/main/cy_GB.xml make/data/cldr/common/main/da.xml make/data/cldr/common/main/da_DK.xml make/data/cldr/common/main/da_GL.xml make/data/cldr/common/main/dav.xml make/data/cldr/common/main/dav_KE.xml make/data/cldr/common/main/de.xml make/data/cldr/common/main/de_AT.xml make/data/cldr/common/main/de_BE.xml make/data/cldr/common/main/de_CH.xml make/data/cldr/common/main/de_DE.xml make/data/cldr/common/main/de_IT.xml make/data/cldr/common/main/de_LI.xml make/data/cldr/common/main/de_LU.xml make/data/cldr/common/main/dje.xml make/data/cldr/common/main/dje_NE.xml make/data/cldr/common/main/dsb.xml make/data/cldr/common/main/dsb_DE.xml make/data/cldr/common/main/dua.xml make/data/cldr/common/main/dua_CM.xml make/data/cldr/common/main/dyo.xml make/data/cldr/common/main/dyo_SN.xml make/data/cldr/common/main/dz.xml make/data/cldr/common/main/dz_BT.xml make/data/cldr/common/main/ebu.xml make/data/cldr/common/main/ebu_KE.xml make/data/cldr/common/main/ee.xml make/data/cldr/common/main/ee_GH.xml make/data/cldr/common/main/ee_TG.xml make/data/cldr/common/main/el.xml make/data/cldr/common/main/el_CY.xml make/data/cldr/common/main/el_GR.xml make/data/cldr/common/main/en.xml make/data/cldr/common/main/en_001.xml make/data/cldr/common/main/en_150.xml make/data/cldr/common/main/en_AE.xml make/data/cldr/common/main/en_AG.xml make/data/cldr/common/main/en_AI.xml make/data/cldr/common/main/en_AS.xml make/data/cldr/common/main/en_AT.xml make/data/cldr/common/main/en_AU.xml make/data/cldr/common/main/en_BB.xml make/data/cldr/common/main/en_BE.xml make/data/cldr/common/main/en_BI.xml make/data/cldr/common/main/en_BM.xml make/data/cldr/common/main/en_BS.xml make/data/cldr/common/main/en_BW.xml make/data/cldr/common/main/en_BZ.xml make/data/cldr/common/main/en_CA.xml make/data/cldr/common/main/en_CC.xml make/data/cldr/common/main/en_CH.xml make/data/cldr/common/main/en_CK.xml make/data/cldr/common/main/en_CM.xml make/data/cldr/common/main/en_CX.xml make/data/cldr/common/main/en_CY.xml make/data/cldr/common/main/en_DE.xml make/data/cldr/common/main/en_DG.xml make/data/cldr/common/main/en_DK.xml make/data/cldr/common/main/en_DM.xml make/data/cldr/common/main/en_ER.xml make/data/cldr/common/main/en_FI.xml make/data/cldr/common/main/en_FJ.xml make/data/cldr/common/main/en_FK.xml make/data/cldr/common/main/en_FM.xml make/data/cldr/common/main/en_GB.xml make/data/cldr/common/main/en_GD.xml make/data/cldr/common/main/en_GG.xml make/data/cldr/common/main/en_GH.xml make/data/cldr/common/main/en_GI.xml make/data/cldr/common/main/en_GM.xml make/data/cldr/common/main/en_GU.xml make/data/cldr/common/main/en_GY.xml make/data/cldr/common/main/en_HK.xml make/data/cldr/common/main/en_IE.xml make/data/cldr/common/main/en_IL.xml make/data/cldr/common/main/en_IM.xml make/data/cldr/common/main/en_IN.xml make/data/cldr/common/main/en_IO.xml make/data/cldr/common/main/en_JE.xml make/data/cldr/common/main/en_JM.xml make/data/cldr/common/main/en_KE.xml make/data/cldr/common/main/en_KI.xml make/data/cldr/common/main/en_KN.xml make/data/cldr/common/main/en_KY.xml make/data/cldr/common/main/en_LC.xml make/data/cldr/common/main/en_LR.xml make/data/cldr/common/main/en_LS.xml make/data/cldr/common/main/en_MG.xml make/data/cldr/common/main/en_MH.xml make/data/cldr/common/main/en_MO.xml make/data/cldr/common/main/en_MP.xml make/data/cldr/common/main/en_MS.xml make/data/cldr/common/main/en_MT.xml make/data/cldr/common/main/en_MU.xml make/data/cldr/common/main/en_MW.xml make/data/cldr/common/main/en_MY.xml make/data/cldr/common/main/en_NA.xml make/data/cldr/common/main/en_NF.xml make/data/cldr/common/main/en_NG.xml make/data/cldr/common/main/en_NL.xml make/data/cldr/common/main/en_NR.xml make/data/cldr/common/main/en_NU.xml make/data/cldr/common/main/en_NZ.xml make/data/cldr/common/main/en_PG.xml make/data/cldr/common/main/en_PH.xml make/data/cldr/common/main/en_PK.xml make/data/cldr/common/main/en_PN.xml make/data/cldr/common/main/en_PR.xml make/data/cldr/common/main/en_PW.xml make/data/cldr/common/main/en_RW.xml make/data/cldr/common/main/en_SB.xml make/data/cldr/common/main/en_SC.xml make/data/cldr/common/main/en_SD.xml make/data/cldr/common/main/en_SE.xml make/data/cldr/common/main/en_SG.xml make/data/cldr/common/main/en_SH.xml make/data/cldr/common/main/en_SI.xml make/data/cldr/common/main/en_SL.xml make/data/cldr/common/main/en_SS.xml make/data/cldr/common/main/en_SX.xml make/data/cldr/common/main/en_SZ.xml make/data/cldr/common/main/en_TC.xml make/data/cldr/common/main/en_TK.xml make/data/cldr/common/main/en_TO.xml make/data/cldr/common/main/en_TT.xml make/data/cldr/common/main/en_TV.xml make/data/cldr/common/main/en_TZ.xml make/data/cldr/common/main/en_UG.xml make/data/cldr/common/main/en_UM.xml make/data/cldr/common/main/en_US.xml make/data/cldr/common/main/en_US_POSIX.xml make/data/cldr/common/main/en_VC.xml make/data/cldr/common/main/en_VG.xml make/data/cldr/common/main/en_VI.xml make/data/cldr/common/main/en_VU.xml make/data/cldr/common/main/en_WS.xml make/data/cldr/common/main/en_ZA.xml make/data/cldr/common/main/en_ZM.xml make/data/cldr/common/main/en_ZW.xml make/data/cldr/common/main/eo.xml make/data/cldr/common/main/eo_001.xml make/data/cldr/common/main/es.xml make/data/cldr/common/main/es_419.xml make/data/cldr/common/main/es_AR.xml make/data/cldr/common/main/es_BO.xml make/data/cldr/common/main/es_BR.xml make/data/cldr/common/main/es_BZ.xml make/data/cldr/common/main/es_CL.xml make/data/cldr/common/main/es_CO.xml make/data/cldr/common/main/es_CR.xml make/data/cldr/common/main/es_CU.xml make/data/cldr/common/main/es_DO.xml make/data/cldr/common/main/es_EA.xml make/data/cldr/common/main/es_EC.xml make/data/cldr/common/main/es_ES.xml make/data/cldr/common/main/es_GQ.xml make/data/cldr/common/main/es_GT.xml make/data/cldr/common/main/es_HN.xml make/data/cldr/common/main/es_IC.xml make/data/cldr/common/main/es_MX.xml make/data/cldr/common/main/es_NI.xml make/data/cldr/common/main/es_PA.xml make/data/cldr/common/main/es_PE.xml make/data/cldr/common/main/es_PH.xml make/data/cldr/common/main/es_PR.xml make/data/cldr/common/main/es_PY.xml make/data/cldr/common/main/es_SV.xml make/data/cldr/common/main/es_US.xml make/data/cldr/common/main/es_UY.xml make/data/cldr/common/main/es_VE.xml make/data/cldr/common/main/et.xml make/data/cldr/common/main/et_EE.xml make/data/cldr/common/main/eu.xml make/data/cldr/common/main/eu_ES.xml make/data/cldr/common/main/ewo.xml make/data/cldr/common/main/ewo_CM.xml make/data/cldr/common/main/fa.xml make/data/cldr/common/main/fa_AF.xml make/data/cldr/common/main/fa_IR.xml make/data/cldr/common/main/ff.xml make/data/cldr/common/main/ff_CM.xml make/data/cldr/common/main/ff_GN.xml make/data/cldr/common/main/ff_Latn.xml make/data/cldr/common/main/ff_Latn_BF.xml make/data/cldr/common/main/ff_Latn_CM.xml make/data/cldr/common/main/ff_Latn_GH.xml make/data/cldr/common/main/ff_Latn_GM.xml make/data/cldr/common/main/ff_Latn_GN.xml make/data/cldr/common/main/ff_Latn_GW.xml make/data/cldr/common/main/ff_Latn_LR.xml make/data/cldr/common/main/ff_Latn_MR.xml make/data/cldr/common/main/ff_Latn_NE.xml make/data/cldr/common/main/ff_Latn_NG.xml make/data/cldr/common/main/ff_Latn_SL.xml make/data/cldr/common/main/ff_Latn_SN.xml make/data/cldr/common/main/ff_MR.xml make/data/cldr/common/main/ff_SN.xml make/data/cldr/common/main/fi.xml make/data/cldr/common/main/fi_FI.xml make/data/cldr/common/main/fil.xml make/data/cldr/common/main/fil_PH.xml make/data/cldr/common/main/fo.xml make/data/cldr/common/main/fo_DK.xml make/data/cldr/common/main/fo_FO.xml make/data/cldr/common/main/fr.xml make/data/cldr/common/main/fr_BE.xml make/data/cldr/common/main/fr_BF.xml make/data/cldr/common/main/fr_BI.xml make/data/cldr/common/main/fr_BJ.xml make/data/cldr/common/main/fr_BL.xml make/data/cldr/common/main/fr_CA.xml make/data/cldr/common/main/fr_CD.xml make/data/cldr/common/main/fr_CF.xml make/data/cldr/common/main/fr_CG.xml make/data/cldr/common/main/fr_CH.xml make/data/cldr/common/main/fr_CI.xml make/data/cldr/common/main/fr_CM.xml make/data/cldr/common/main/fr_DJ.xml make/data/cldr/common/main/fr_DZ.xml make/data/cldr/common/main/fr_FR.xml make/data/cldr/common/main/fr_GA.xml make/data/cldr/common/main/fr_GF.xml make/data/cldr/common/main/fr_GN.xml make/data/cldr/common/main/fr_GP.xml make/data/cldr/common/main/fr_GQ.xml make/data/cldr/common/main/fr_HT.xml make/data/cldr/common/main/fr_KM.xml make/data/cldr/common/main/fr_LU.xml make/data/cldr/common/main/fr_MA.xml make/data/cldr/common/main/fr_MC.xml make/data/cldr/common/main/fr_MF.xml make/data/cldr/common/main/fr_MG.xml make/data/cldr/common/main/fr_ML.xml make/data/cldr/common/main/fr_MQ.xml make/data/cldr/common/main/fr_MR.xml make/data/cldr/common/main/fr_MU.xml make/data/cldr/common/main/fr_NC.xml make/data/cldr/common/main/fr_NE.xml make/data/cldr/common/main/fr_PF.xml make/data/cldr/common/main/fr_PM.xml make/data/cldr/common/main/fr_RE.xml make/data/cldr/common/main/fr_RW.xml make/data/cldr/common/main/fr_SC.xml make/data/cldr/common/main/fr_SN.xml make/data/cldr/common/main/fr_SY.xml make/data/cldr/common/main/fr_TD.xml make/data/cldr/common/main/fr_TG.xml make/data/cldr/common/main/fr_TN.xml make/data/cldr/common/main/fr_VU.xml make/data/cldr/common/main/fr_WF.xml make/data/cldr/common/main/fr_YT.xml make/data/cldr/common/main/fur.xml make/data/cldr/common/main/fur_IT.xml make/data/cldr/common/main/fy.xml make/data/cldr/common/main/fy_NL.xml make/data/cldr/common/main/ga.xml make/data/cldr/common/main/ga_IE.xml make/data/cldr/common/main/gd.xml make/data/cldr/common/main/gd_GB.xml make/data/cldr/common/main/gl.xml make/data/cldr/common/main/gl_ES.xml make/data/cldr/common/main/gsw.xml make/data/cldr/common/main/gsw_CH.xml make/data/cldr/common/main/gsw_FR.xml make/data/cldr/common/main/gsw_LI.xml make/data/cldr/common/main/gu.xml make/data/cldr/common/main/gu_IN.xml make/data/cldr/common/main/guz.xml make/data/cldr/common/main/guz_KE.xml make/data/cldr/common/main/gv.xml make/data/cldr/common/main/gv_IM.xml make/data/cldr/common/main/ha.xml make/data/cldr/common/main/ha_GH.xml make/data/cldr/common/main/ha_NE.xml make/data/cldr/common/main/ha_NG.xml make/data/cldr/common/main/haw.xml make/data/cldr/common/main/haw_US.xml make/data/cldr/common/main/he.xml make/data/cldr/common/main/he_IL.xml make/data/cldr/common/main/hi.xml make/data/cldr/common/main/hi_IN.xml make/data/cldr/common/main/hr.xml make/data/cldr/common/main/hr_BA.xml make/data/cldr/common/main/hr_HR.xml make/data/cldr/common/main/hsb.xml make/data/cldr/common/main/hsb_DE.xml make/data/cldr/common/main/hu.xml make/data/cldr/common/main/hu_HU.xml make/data/cldr/common/main/hy.xml make/data/cldr/common/main/hy_AM.xml make/data/cldr/common/main/ia.xml make/data/cldr/common/main/ia_001.xml make/data/cldr/common/main/id.xml make/data/cldr/common/main/id_ID.xml make/data/cldr/common/main/ig.xml make/data/cldr/common/main/ig_NG.xml make/data/cldr/common/main/ii.xml make/data/cldr/common/main/ii_CN.xml make/data/cldr/common/main/is.xml make/data/cldr/common/main/is_IS.xml make/data/cldr/common/main/it.xml make/data/cldr/common/main/it_CH.xml make/data/cldr/common/main/it_IT.xml make/data/cldr/common/main/it_SM.xml make/data/cldr/common/main/it_VA.xml make/data/cldr/common/main/ja.xml make/data/cldr/common/main/ja_JP.xml make/data/cldr/common/main/jgo.xml make/data/cldr/common/main/jgo_CM.xml make/data/cldr/common/main/jmc.xml make/data/cldr/common/main/jmc_TZ.xml make/data/cldr/common/main/jv.xml make/data/cldr/common/main/jv_ID.xml make/data/cldr/common/main/ka.xml make/data/cldr/common/main/ka_GE.xml make/data/cldr/common/main/kab.xml make/data/cldr/common/main/kab_DZ.xml make/data/cldr/common/main/kam.xml make/data/cldr/common/main/kam_KE.xml make/data/cldr/common/main/kde.xml make/data/cldr/common/main/kde_TZ.xml make/data/cldr/common/main/kea.xml make/data/cldr/common/main/kea_CV.xml make/data/cldr/common/main/khq.xml make/data/cldr/common/main/khq_ML.xml make/data/cldr/common/main/ki.xml make/data/cldr/common/main/ki_KE.xml make/data/cldr/common/main/kk.xml make/data/cldr/common/main/kk_KZ.xml make/data/cldr/common/main/kkj.xml make/data/cldr/common/main/kkj_CM.xml make/data/cldr/common/main/kl.xml make/data/cldr/common/main/kl_GL.xml make/data/cldr/common/main/kln.xml make/data/cldr/common/main/kln_KE.xml make/data/cldr/common/main/km.xml make/data/cldr/common/main/km_KH.xml make/data/cldr/common/main/kn.xml make/data/cldr/common/main/kn_IN.xml make/data/cldr/common/main/ko.xml make/data/cldr/common/main/ko_KP.xml make/data/cldr/common/main/ko_KR.xml make/data/cldr/common/main/kok.xml make/data/cldr/common/main/kok_IN.xml make/data/cldr/common/main/ks.xml make/data/cldr/common/main/ks_IN.xml make/data/cldr/common/main/ksb.xml make/data/cldr/common/main/ksb_TZ.xml make/data/cldr/common/main/ksf.xml make/data/cldr/common/main/ksf_CM.xml make/data/cldr/common/main/ksh.xml make/data/cldr/common/main/ksh_DE.xml make/data/cldr/common/main/ku.xml make/data/cldr/common/main/ku_TR.xml make/data/cldr/common/main/kw.xml make/data/cldr/common/main/kw_GB.xml make/data/cldr/common/main/ky.xml make/data/cldr/common/main/ky_KG.xml make/data/cldr/common/main/lag.xml make/data/cldr/common/main/lag_TZ.xml make/data/cldr/common/main/lb.xml make/data/cldr/common/main/lb_LU.xml make/data/cldr/common/main/lg.xml make/data/cldr/common/main/lg_UG.xml make/data/cldr/common/main/lkt.xml make/data/cldr/common/main/lkt_US.xml make/data/cldr/common/main/ln.xml make/data/cldr/common/main/ln_AO.xml make/data/cldr/common/main/ln_CD.xml make/data/cldr/common/main/ln_CF.xml make/data/cldr/common/main/ln_CG.xml make/data/cldr/common/main/lo.xml make/data/cldr/common/main/lo_LA.xml make/data/cldr/common/main/lrc.xml make/data/cldr/common/main/lrc_IQ.xml make/data/cldr/common/main/lrc_IR.xml make/data/cldr/common/main/lt.xml make/data/cldr/common/main/lt_LT.xml make/data/cldr/common/main/lu.xml make/data/cldr/common/main/lu_CD.xml make/data/cldr/common/main/luo.xml make/data/cldr/common/main/luo_KE.xml make/data/cldr/common/main/luy.xml make/data/cldr/common/main/luy_KE.xml make/data/cldr/common/main/lv.xml make/data/cldr/common/main/lv_LV.xml make/data/cldr/common/main/mas.xml make/data/cldr/common/main/mas_KE.xml make/data/cldr/common/main/mas_TZ.xml make/data/cldr/common/main/mer.xml make/data/cldr/common/main/mer_KE.xml make/data/cldr/common/main/mfe.xml make/data/cldr/common/main/mfe_MU.xml make/data/cldr/common/main/mg.xml make/data/cldr/common/main/mg_MG.xml make/data/cldr/common/main/mgh.xml make/data/cldr/common/main/mgh_MZ.xml make/data/cldr/common/main/mgo.xml make/data/cldr/common/main/mgo_CM.xml make/data/cldr/common/main/mi.xml make/data/cldr/common/main/mi_NZ.xml make/data/cldr/common/main/mk.xml make/data/cldr/common/main/mk_MK.xml make/data/cldr/common/main/ml.xml make/data/cldr/common/main/ml_IN.xml make/data/cldr/common/main/mn.xml make/data/cldr/common/main/mn_MN.xml make/data/cldr/common/main/mr.xml make/data/cldr/common/main/mr_IN.xml make/data/cldr/common/main/ms.xml make/data/cldr/common/main/ms_BN.xml make/data/cldr/common/main/ms_MY.xml make/data/cldr/common/main/ms_SG.xml make/data/cldr/common/main/mt.xml make/data/cldr/common/main/mt_MT.xml make/data/cldr/common/main/mua.xml make/data/cldr/common/main/mua_CM.xml make/data/cldr/common/main/my.xml make/data/cldr/common/main/my_MM.xml make/data/cldr/common/main/mzn.xml make/data/cldr/common/main/mzn_IR.xml make/data/cldr/common/main/naq.xml make/data/cldr/common/main/naq_NA.xml make/data/cldr/common/main/nb.xml make/data/cldr/common/main/nb_NO.xml make/data/cldr/common/main/nb_SJ.xml make/data/cldr/common/main/nd.xml make/data/cldr/common/main/nd_ZW.xml make/data/cldr/common/main/nds.xml make/data/cldr/common/main/nds_DE.xml make/data/cldr/common/main/nds_NL.xml make/data/cldr/common/main/ne.xml make/data/cldr/common/main/ne_IN.xml make/data/cldr/common/main/ne_NP.xml make/data/cldr/common/main/nl.xml make/data/cldr/common/main/nl_AW.xml make/data/cldr/common/main/nl_BE.xml make/data/cldr/common/main/nl_BQ.xml make/data/cldr/common/main/nl_CW.xml make/data/cldr/common/main/nl_NL.xml make/data/cldr/common/main/nl_SR.xml make/data/cldr/common/main/nl_SX.xml make/data/cldr/common/main/nmg.xml make/data/cldr/common/main/nmg_CM.xml make/data/cldr/common/main/nn.xml make/data/cldr/common/main/nn_NO.xml make/data/cldr/common/main/nnh.xml make/data/cldr/common/main/nnh_CM.xml make/data/cldr/common/main/nus.xml make/data/cldr/common/main/nus_SS.xml make/data/cldr/common/main/nyn.xml make/data/cldr/common/main/nyn_UG.xml make/data/cldr/common/main/om.xml make/data/cldr/common/main/om_ET.xml make/data/cldr/common/main/om_KE.xml make/data/cldr/common/main/or.xml make/data/cldr/common/main/or_IN.xml make/data/cldr/common/main/os.xml make/data/cldr/common/main/os_GE.xml make/data/cldr/common/main/os_RU.xml make/data/cldr/common/main/pa.xml make/data/cldr/common/main/pa_Arab.xml make/data/cldr/common/main/pa_Arab_PK.xml make/data/cldr/common/main/pa_Guru.xml make/data/cldr/common/main/pa_Guru_IN.xml make/data/cldr/common/main/pl.xml make/data/cldr/common/main/pl_PL.xml make/data/cldr/common/main/prg.xml make/data/cldr/common/main/prg_001.xml make/data/cldr/common/main/ps.xml make/data/cldr/common/main/ps_AF.xml make/data/cldr/common/main/ps_PK.xml make/data/cldr/common/main/pt.xml make/data/cldr/common/main/pt_AO.xml make/data/cldr/common/main/pt_BR.xml make/data/cldr/common/main/pt_CH.xml make/data/cldr/common/main/pt_CV.xml make/data/cldr/common/main/pt_GQ.xml make/data/cldr/common/main/pt_GW.xml make/data/cldr/common/main/pt_LU.xml make/data/cldr/common/main/pt_MO.xml make/data/cldr/common/main/pt_MZ.xml make/data/cldr/common/main/pt_PT.xml make/data/cldr/common/main/pt_ST.xml make/data/cldr/common/main/pt_TL.xml make/data/cldr/common/main/qu.xml make/data/cldr/common/main/qu_BO.xml make/data/cldr/common/main/qu_EC.xml make/data/cldr/common/main/qu_PE.xml make/data/cldr/common/main/rm.xml make/data/cldr/common/main/rm_CH.xml make/data/cldr/common/main/rn.xml make/data/cldr/common/main/rn_BI.xml make/data/cldr/common/main/ro.xml make/data/cldr/common/main/ro_MD.xml make/data/cldr/common/main/ro_RO.xml make/data/cldr/common/main/rof.xml make/data/cldr/common/main/rof_TZ.xml make/data/cldr/common/main/root.xml make/data/cldr/common/main/ru.xml make/data/cldr/common/main/ru_BY.xml make/data/cldr/common/main/ru_KG.xml make/data/cldr/common/main/ru_KZ.xml make/data/cldr/common/main/ru_MD.xml make/data/cldr/common/main/ru_RU.xml make/data/cldr/common/main/ru_UA.xml make/data/cldr/common/main/rw.xml make/data/cldr/common/main/rw_RW.xml make/data/cldr/common/main/rwk.xml make/data/cldr/common/main/rwk_TZ.xml make/data/cldr/common/main/sah.xml make/data/cldr/common/main/sah_RU.xml make/data/cldr/common/main/saq.xml make/data/cldr/common/main/saq_KE.xml make/data/cldr/common/main/sbp.xml make/data/cldr/common/main/sbp_TZ.xml make/data/cldr/common/main/sd.xml make/data/cldr/common/main/sd_PK.xml make/data/cldr/common/main/se.xml make/data/cldr/common/main/se_FI.xml make/data/cldr/common/main/se_NO.xml make/data/cldr/common/main/se_SE.xml make/data/cldr/common/main/seh.xml make/data/cldr/common/main/seh_MZ.xml make/data/cldr/common/main/ses.xml make/data/cldr/common/main/ses_ML.xml make/data/cldr/common/main/sg.xml make/data/cldr/common/main/sg_CF.xml make/data/cldr/common/main/shi.xml make/data/cldr/common/main/shi_Latn.xml make/data/cldr/common/main/shi_Latn_MA.xml make/data/cldr/common/main/shi_Tfng.xml make/data/cldr/common/main/shi_Tfng_MA.xml make/data/cldr/common/main/si.xml make/data/cldr/common/main/si_LK.xml make/data/cldr/common/main/sk.xml make/data/cldr/common/main/sk_SK.xml make/data/cldr/common/main/sl.xml make/data/cldr/common/main/sl_SI.xml make/data/cldr/common/main/smn.xml make/data/cldr/common/main/smn_FI.xml make/data/cldr/common/main/sn.xml make/data/cldr/common/main/sn_ZW.xml make/data/cldr/common/main/so.xml make/data/cldr/common/main/so_DJ.xml make/data/cldr/common/main/so_ET.xml make/data/cldr/common/main/so_KE.xml make/data/cldr/common/main/so_SO.xml make/data/cldr/common/main/sq.xml make/data/cldr/common/main/sq_AL.xml make/data/cldr/common/main/sq_MK.xml make/data/cldr/common/main/sq_XK.xml make/data/cldr/common/main/sr.xml make/data/cldr/common/main/sr_Cyrl.xml make/data/cldr/common/main/sr_Cyrl_BA.xml make/data/cldr/common/main/sr_Cyrl_ME.xml make/data/cldr/common/main/sr_Cyrl_RS.xml make/data/cldr/common/main/sr_Cyrl_XK.xml make/data/cldr/common/main/sr_Latn.xml make/data/cldr/common/main/sr_Latn_BA.xml make/data/cldr/common/main/sr_Latn_ME.xml make/data/cldr/common/main/sr_Latn_RS.xml make/data/cldr/common/main/sr_Latn_XK.xml make/data/cldr/common/main/sv.xml make/data/cldr/common/main/sv_AX.xml make/data/cldr/common/main/sv_FI.xml make/data/cldr/common/main/sv_SE.xml make/data/cldr/common/main/sw.xml make/data/cldr/common/main/sw_CD.xml make/data/cldr/common/main/sw_KE.xml make/data/cldr/common/main/sw_TZ.xml make/data/cldr/common/main/sw_UG.xml make/data/cldr/common/main/ta.xml make/data/cldr/common/main/ta_IN.xml make/data/cldr/common/main/ta_LK.xml make/data/cldr/common/main/ta_MY.xml make/data/cldr/common/main/ta_SG.xml make/data/cldr/common/main/te.xml make/data/cldr/common/main/te_IN.xml make/data/cldr/common/main/teo.xml make/data/cldr/common/main/teo_KE.xml make/data/cldr/common/main/teo_UG.xml make/data/cldr/common/main/tg.xml make/data/cldr/common/main/tg_TJ.xml make/data/cldr/common/main/th.xml make/data/cldr/common/main/th_TH.xml make/data/cldr/common/main/ti.xml make/data/cldr/common/main/ti_ER.xml make/data/cldr/common/main/ti_ET.xml make/data/cldr/common/main/tk.xml make/data/cldr/common/main/tk_TM.xml make/data/cldr/common/main/to.xml make/data/cldr/common/main/to_TO.xml make/data/cldr/common/main/tr.xml make/data/cldr/common/main/tr_CY.xml make/data/cldr/common/main/tr_TR.xml make/data/cldr/common/main/tt.xml make/data/cldr/common/main/tt_RU.xml make/data/cldr/common/main/twq.xml make/data/cldr/common/main/twq_NE.xml make/data/cldr/common/main/tzm.xml make/data/cldr/common/main/tzm_MA.xml make/data/cldr/common/main/ug.xml make/data/cldr/common/main/ug_CN.xml make/data/cldr/common/main/uk.xml make/data/cldr/common/main/uk_UA.xml make/data/cldr/common/main/ur.xml make/data/cldr/common/main/ur_IN.xml make/data/cldr/common/main/ur_PK.xml make/data/cldr/common/main/uz.xml make/data/cldr/common/main/uz_Arab.xml make/data/cldr/common/main/uz_Arab_AF.xml make/data/cldr/common/main/uz_Cyrl.xml make/data/cldr/common/main/uz_Cyrl_UZ.xml make/data/cldr/common/main/uz_Latn.xml make/data/cldr/common/main/uz_Latn_UZ.xml make/data/cldr/common/main/vai.xml make/data/cldr/common/main/vai_Latn.xml make/data/cldr/common/main/vai_Latn_LR.xml make/data/cldr/common/main/vai_Vaii.xml make/data/cldr/common/main/vai_Vaii_LR.xml make/data/cldr/common/main/vi.xml make/data/cldr/common/main/vi_VN.xml make/data/cldr/common/main/vo.xml make/data/cldr/common/main/vo_001.xml make/data/cldr/common/main/vun.xml make/data/cldr/common/main/vun_TZ.xml make/data/cldr/common/main/wae.xml make/data/cldr/common/main/wae_CH.xml make/data/cldr/common/main/wo.xml make/data/cldr/common/main/wo_SN.xml make/data/cldr/common/main/xh.xml make/data/cldr/common/main/xh_ZA.xml make/data/cldr/common/main/xog.xml make/data/cldr/common/main/xog_UG.xml make/data/cldr/common/main/yav.xml make/data/cldr/common/main/yav_CM.xml make/data/cldr/common/main/yi.xml make/data/cldr/common/main/yi_001.xml make/data/cldr/common/main/yo.xml make/data/cldr/common/main/yo_BJ.xml make/data/cldr/common/main/yo_NG.xml make/data/cldr/common/main/yue.xml make/data/cldr/common/main/yue_HK.xml make/data/cldr/common/main/yue_Hans.xml make/data/cldr/common/main/yue_Hans_CN.xml make/data/cldr/common/main/yue_Hant.xml make/data/cldr/common/main/yue_Hant_HK.xml make/data/cldr/common/main/zgh.xml make/data/cldr/common/main/zgh_MA.xml make/data/cldr/common/main/zh.xml make/data/cldr/common/main/zh_Hans.xml make/data/cldr/common/main/zh_Hans_CN.xml make/data/cldr/common/main/zh_Hans_HK.xml make/data/cldr/common/main/zh_Hans_MO.xml make/data/cldr/common/main/zh_Hans_SG.xml make/data/cldr/common/main/zh_Hant.xml make/data/cldr/common/main/zh_Hant_HK.xml make/data/cldr/common/main/zh_Hant_MO.xml make/data/cldr/common/main/zh_Hant_TW.xml make/data/cldr/common/main/zu.xml make/data/cldr/common/main/zu_ZA.xml make/data/cldr/common/supplemental/attributeValueValidity.xml make/data/cldr/common/supplemental/coverageLevels.xml make/data/cldr/common/supplemental/dayPeriods.xml make/data/cldr/common/supplemental/languageGroup.xml make/data/cldr/common/supplemental/languageInfo.xml make/data/cldr/common/supplemental/likelySubtags.xml make/data/cldr/common/supplemental/metaZones.xml make/data/cldr/common/supplemental/numberingSystems.xml make/data/cldr/common/supplemental/ordinals.xml make/data/cldr/common/supplemental/pluralRanges.xml make/data/cldr/common/supplemental/plurals.xml make/data/cldr/common/supplemental/subdivisions.xml make/data/cldr/common/supplemental/supplementalData.xml make/data/cldr/common/supplemental/supplementalMetadata.xml make/data/cldr/common/supplemental/telephoneCodeData.xml make/data/cldr/common/supplemental/windowsZones.xml make/data/cldr/unicode-license.txt make/jdk/src/classes/build/tools/cldrconverter/Bundle.java src/java.base/share/legal/cldr.md src/jdk.localedata/share/legal/cldr.md test/jdk/java/text/Format/CompactNumberFormat/TestUExtensionOverride.java test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java test/jdk/java/time/test/java/time/format/TestNonIsoFormatter.java test/jdk/java/util/Calendar/CalendarDataTest.java test/jdk/java/util/Calendar/JapaneseEraNameTest.java test/jdk/java/util/Formatter/Basic-X.java.template test/jdk/java/util/Formatter/Basic.sh test/jdk/java/util/Formatter/BasicBigDecimal.java test/jdk/java/util/Formatter/BasicBigInteger.java test/jdk/java/util/Formatter/BasicDouble.java test/jdk/java/util/Formatter/BasicDoubleObject.java test/jdk/java/util/Formatter/BasicFloat.java test/jdk/java/util/Formatter/BasicInt.java test/jdk/java/util/Formatter/BasicLong.java test/jdk/sun/text/resources/LocaleData.cldr test/jdk/sun/text/resources/LocaleDataTest.java test/jdk/sun/util/resources/cldr/Bug8145136.java test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
diffstat 806 files changed, 88846 insertions(+), 65459 deletions(-) [+]
line wrap: on
line diff
--- a/make/data/cldr/README	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/README	Wed May 08 12:45:02 2019 -0700
@@ -1,4 +1,4 @@
 CLDR - Unicode Common Locale Data Repository
 http://cldr.unicode.org
 
-CLDR version installed: 33
+CLDR version installed: 35.1
--- a/make/data/cldr/common/bcp47/timezone.xml	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/bcp47/timezone.xml	Wed May 08 12:45:02 2019 -0700
@@ -7,7 +7,7 @@
 -->
 
 <ldmlBCP47>
-    <version number="$Revision: 13421 $"/>
+    <version number="$Revision: 14742 $"/>
     <keyword>
         <key name="tz" description="Time zone key" alias="timezone">
             <type name="adalv" description="Andorra" alias="Europe/Andorra"/>
@@ -240,6 +240,7 @@
             <type name="kzakx" description="Aqtobe, Kazakhstan" alias="Asia/Aqtobe"/>
             <type name="kzala" description="Almaty, Kazakhstan" alias="Asia/Almaty"/>
             <type name="kzguw" description="Atyrau (Guryev), Kazakhstan" alias="Asia/Atyrau" since="31"/>
+            <type name="kzksn" description="Qostanay (Kostanay), Kazakhstan" alias="Asia/Qostanay" since="35"/>
             <type name="kzkzo" description="Kyzylorda, Kazakhstan" alias="Asia/Qyzylorda"/>
             <type name="kzura" description="Oral, Kazakhstan" alias="Asia/Oral"/>
             <type name="lavte" description="Vientiane, Laos" alias="Asia/Vientiane"/>
@@ -444,7 +445,7 @@
             <type name="utce10" description="10 hours ahead of UTC" alias="Etc/GMT-10"/>
             <type name="utce11" description="11 hours ahead of UTC" alias="Etc/GMT-11"/>
             <type name="utce12" description="12 hours ahead of UTC" alias="Etc/GMT-12"/>
-            <type name="utce13" description="13hours ahead of UTC" alias="Etc/GMT-13"/>
+            <type name="utce13" description="13 hours ahead of UTC" alias="Etc/GMT-13"/>
             <type name="utce14" description="14 hours ahead of UTC" alias="Etc/GMT-14"/>
             <type name="utcw01" description="1 hour behind UTC" alias="Etc/GMT+1"/>
             <type name="utcw02" description="2 hours behind UTC" alias="Etc/GMT+2"/>
--- a/make/data/cldr/common/dtd/ldml.dtd	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/dtd/ldml.dtd	Wed May 08 12:45:02 2019 -0700
@@ -1,12 +1,12 @@
 <!--
-Copyright © 2003-2017 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+Copyright © 2003-2019 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
 
 THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
 Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
-$Revision: 13905 $
+$Revision: 14983 $
 -->
 
 <!ELEMENT ldml ( identity, ( alias | ( fallback*, localeDisplayNames?, layout?, contextTransforms?, characters?, delimiters?, measurement?, dates?, numbers?, units?, listPatterns?, collations?, posix?, characterLabels?, segmentations?, rbnf?, typographicNames?, annotations?, metadata?, references?, special* ) ) ) >
@@ -29,10 +29,13 @@
 
 <!ELEMENT alias ( special* ) >
 <!ATTLIST alias source NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/locale-->
     <!--@VALUE-->
 <!ATTLIST alias path CDATA #IMPLIED >
+    <!--@MATCH:regex/\.\..*-->
     <!--@VALUE-->
 <!ATTLIST alias alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST alias draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -41,8 +44,10 @@
 
 <!ELEMENT version EMPTY >
 <!ATTLIST version number CDATA #REQUIRED >
-    <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "33" >
+    <!--@MATCH:regex/\$Revision.*\$-->
+    <!--@METADATA-->
+<!ATTLIST version cldrVersion CDATA #FIXED "35.1" >
+    <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -60,7 +65,9 @@
 
 <!ELEMENT language ( #PCDATA ) >
 <!ATTLIST language type NMTOKEN #REQUIRED >
+    <!--@MATCH:validity/locale-->
 <!ATTLIST language alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/long, secondary, short, variant-->
 <!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -69,7 +76,9 @@
 
 <!ELEMENT script ( #PCDATA ) >
 <!ATTLIST script type NMTOKEN #REQUIRED >
+    <!--@MATCH:validity/script-->
 <!ATTLIST script alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/secondary, short, stand-alone, variant-->
 <!ATTLIST script draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -78,7 +87,9 @@
 
 <!ELEMENT territory ( #PCDATA ) >
 <!ATTLIST territory type NMTOKEN #REQUIRED >
+    <!--@MATCH:validity/region-->
 <!ATTLIST territory alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/short, variant-->
 <!ATTLIST territory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -87,7 +98,9 @@
 
 <!ELEMENT variant ( #PCDATA ) >
 <!ATTLIST variant type NMTOKEN #REQUIRED >
+    <!--@MATCH:validity/variant-->
 <!ATTLIST variant alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/secondary, variant-->
 <!ATTLIST variant draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -99,6 +112,7 @@
 <!ELEMENT fallback ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST fallback alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST fallback draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -114,6 +128,7 @@
 
 <!ELEMENT localeDisplayPattern ( alias | ( localePattern*, localeSeparator*, localeKeyTypePattern*, special* ) ) >
 <!ATTLIST localeDisplayPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST localeDisplayPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -122,6 +137,7 @@
 
 <!ELEMENT localePattern ( #PCDATA ) >
 <!ATTLIST localePattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST localePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST localePattern references CDATA #IMPLIED >
@@ -129,6 +145,7 @@
 
 <!ELEMENT localeSeparator ( #PCDATA ) >
 <!ATTLIST localeSeparator alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST localeSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST localeSeparator references CDATA #IMPLIED >
@@ -136,6 +153,7 @@
 
 <!ELEMENT localeKeyTypePattern ( #PCDATA ) >
 <!ATTLIST localeKeyTypePattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST localeKeyTypePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST localeKeyTypePattern references CDATA #IMPLIED >
@@ -195,7 +213,9 @@
 
 <!ELEMENT subdivision ( #PCDATA ) >
 <!ATTLIST subdivision type NMTOKEN #REQUIRED >
+    <!--@MATCH:validity/subdivision-->
 <!ATTLIST subdivision alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST subdivision draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -231,7 +251,9 @@
 
 <!ELEMENT key ( #PCDATA ) >
 <!ATTLIST key type NMTOKEN #REQUIRED >
+    <!--@MATCH:bcp47/anykey-->
 <!ATTLIST key alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST key draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -255,8 +277,11 @@
 
 <!ELEMENT type ( #PCDATA ) >
 <!ATTLIST type key NMTOKEN #REQUIRED >
+    <!--@MATCH:bcp47/anykey-->
 <!ATTLIST type type NMTOKEN #REQUIRED >
+    <!--@MATCH:bcp47/anyvalue-->
 <!ATTLIST type alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/short, variant-->
 <!ATTLIST type draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -277,6 +302,7 @@
 <!ATTLIST transformName type NMTOKEN #REQUIRED >
     <!--@DEPRECATED-->
 <!ATTLIST transformName alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST transformName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -300,6 +326,7 @@
 <!ELEMENT measurementSystemName ( #PCDATA ) >
 <!ATTLIST measurementSystemName type (US | metric | UK) #REQUIRED >
 <!ATTLIST measurementSystemName alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST measurementSystemName draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -310,7 +337,9 @@
 
 <!ELEMENT codePattern ( #PCDATA ) >
 <!ATTLIST codePattern type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/language, script, territory-->
 <!ATTLIST codePattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST codePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST codePattern references CDATA #IMPLIED >
@@ -334,6 +363,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST orientation alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST orientation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -345,11 +375,13 @@
 
 <!ELEMENT characterOrder ( #PCDATA ) >
 <!ATTLIST characterOrder alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST characterOrder draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT lineOrder ( #PCDATA ) >
 <!ATTLIST lineOrder alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST lineOrder draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -359,6 +391,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST inList alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST inList draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -372,6 +405,7 @@
 <!ATTLIST inText type (languages | scripts | territories | variants | keys | types | measurementSystemNames | monthWidth | dayWidth | quarterWidth | long | fields | currency) #IMPLIED >
     <!--@DEPRECATED-->
 <!ATTLIST inText alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST inText draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -384,6 +418,7 @@
 
 <!ELEMENT contextTransforms ( alias | ( contextTransformUsage*, special* ) ) >
 <!ATTLIST contextTransforms alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST contextTransforms draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -395,7 +430,9 @@
 
 <!ELEMENT contextTransformUsage ( alias | ( contextTransform*, special* ) ) >
 <!ATTLIST contextTransformUsage type CDATA #REQUIRED >
+    <!--@MATCH:literal/calendar-field, currencyName, day-format-except-narrow, day-standalone-except-narrow, era-abbr, era-name, keyValue, languages, month-format-except-narrow, month-standalone-except-narrow, number-spellout, relative, script, typographicNames-->
 <!ATTLIST contextTransformUsage alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST contextTransformUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -408,6 +445,7 @@
 <!ELEMENT contextTransform ( #PCDATA ) >
 <!ATTLIST contextTransform type (uiListOrMenu | stand-alone) #REQUIRED >
 <!ATTLIST contextTransform alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST contextTransform draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST contextTransform references CDATA #IMPLIED >
@@ -424,6 +462,7 @@
 <!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index | numbers) #IMPLIED >
     <!--@DEPRECATED:currencySymbol-->
 <!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST exemplarCharacters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST exemplarCharacters standard CDATA #IMPLIED >
@@ -446,6 +485,7 @@
 <!ELEMENT ellipsis ( #PCDATA ) >
 <!ATTLIST ellipsis type (initial | medial | final | word-initial | word-medial | word-final) #IMPLIED >
 <!ATTLIST ellipsis alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST ellipsis draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST ellipsis references CDATA #IMPLIED >
@@ -453,6 +493,7 @@
 
 <!ELEMENT moreInformation ( #PCDATA ) >
 <!ATTLIST moreInformation alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST moreInformation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST moreInformation references CDATA #IMPLIED >
@@ -466,6 +507,7 @@
 <!ATTLIST stopwordList type NMTOKEN #REQUIRED >
     <!--@DEPRECATED-->
 <!ATTLIST stopwordList alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST stopwordList draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -480,6 +522,7 @@
 <!ELEMENT indexSeparator ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST indexSeparator alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -491,6 +534,7 @@
 <!ELEMENT compressedIndexSeparator ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST compressedIndexSeparator alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST compressedIndexSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -502,6 +546,7 @@
 <!ELEMENT indexRangePattern ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST indexRangePattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexRangePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -513,6 +558,7 @@
 <!ELEMENT indexLabelBefore ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelBefore alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelBefore draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -524,6 +570,7 @@
 <!ELEMENT indexLabelAfter ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelAfter alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelAfter draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -540,6 +587,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabel alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabel draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -580,7 +628,9 @@
 
 <!ELEMENT parseLenient ( #PCDATA ) >
 <!ATTLIST parseLenient sample CDATA #REQUIRED >
+    <!--@MATCH:any-->
 <!ATTLIST parseLenient alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST parseLenient draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -588,6 +638,7 @@
 
 <!ELEMENT delimiters ( alias | ( quotationStart*, quotationEnd*, alternateQuotationStart*, alternateQuotationEnd*, special* ) ) >
 <!ATTLIST delimiters alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST delimiters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -602,6 +653,7 @@
 
 <!ELEMENT quotationStart ( #PCDATA | cp )* >
 <!ATTLIST quotationStart alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST quotationStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST quotationStart references CDATA #IMPLIED >
@@ -609,6 +661,7 @@
 
 <!ELEMENT quotationEnd ( #PCDATA | cp )* >
 <!ATTLIST quotationEnd alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST quotationEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST quotationEnd references CDATA #IMPLIED >
@@ -616,6 +669,7 @@
 
 <!ELEMENT alternateQuotationStart ( #PCDATA | cp )* >
 <!ATTLIST alternateQuotationStart alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST alternateQuotationStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST alternateQuotationStart references CDATA #IMPLIED >
@@ -623,6 +677,7 @@
 
 <!ELEMENT alternateQuotationEnd ( #PCDATA | cp )* >
 <!ATTLIST alternateQuotationEnd alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST alternateQuotationEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST alternateQuotationEnd references CDATA #IMPLIED >
@@ -634,6 +689,7 @@
     <!-- use measurementData in supplemental instead -->
     <!--@DEPRECATED-->
 <!ATTLIST measurement alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST measurement draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -660,6 +716,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST measurementSystem alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST measurementSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -678,6 +735,7 @@
     <!-- use paperSize in supplemental instead -->
     <!--@DEPRECATED-->
 <!ATTLIST paperSize alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST paperSize draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -695,6 +753,7 @@
 <!ELEMENT height ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST height alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST height draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -706,6 +765,7 @@
 <!ELEMENT width ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST width alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST width draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -718,6 +778,7 @@
 
 <!ELEMENT dates ( alias | ( localizedPatternChars*, dateRangePattern*, calendars?, fields?, timeZoneNames?, special* ) ) >
 <!ATTLIST dates alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST dates draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -733,6 +794,7 @@
 <!ELEMENT localizedPatternChars ( #PCDATA | cp )* >
     <!--@DEPRECATED-->
 <!ATTLIST localizedPatternChars alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST localizedPatternChars draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -751,6 +813,7 @@
     <!-- use intervalFormats. -->
     <!--@DEPRECATED-->
 <!ATTLIST dateRangePattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST dateRangePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -783,6 +846,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST default alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST default draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -794,7 +858,9 @@
 <!ELEMENT calendar ( alias | ( months?, monthNames?, monthAbbr?, monthPatterns?, days?, dayNames?, dayAbbr?, quarters?, week?, am*, pm*, dayPeriods?, eras?, cyclicNameSets?, dateFormats?, timeFormats?, dateTimeFormats?, fields*, special* ) ) >
     <!-- use of fields is deprecated here -->
 <!ATTLIST calendar type NMTOKEN #REQUIRED >
+    <!--@MATCH:bcp47/ca-->
 <!ATTLIST calendar alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST calendar draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -809,6 +875,7 @@
 
 <!ELEMENT months ( alias | ( default*, monthContext*, special* ) ) >
 <!ATTLIST months alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST months draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -824,6 +891,7 @@
 <!ELEMENT monthContext ( alias | ( default*, monthWidth*, special* ) ) >
 <!ATTLIST monthContext type (format | stand-alone) #REQUIRED >
 <!ATTLIST monthContext alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST monthContext draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -839,6 +907,7 @@
 <!ELEMENT monthWidth ( alias | ( month*, special* ) ) >
 <!ATTLIST monthWidth type (abbreviated | narrow | wide) #REQUIRED >
 <!ATTLIST monthWidth alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST monthWidth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -855,6 +924,7 @@
 <!ATTLIST month type (1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13) #REQUIRED >
 <!ATTLIST month yeartype (standard | leap) #IMPLIED >
 <!ATTLIST month alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST month draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST month references CDATA #IMPLIED >
@@ -874,6 +944,7 @@
 
 <!ELEMENT monthPatterns ( alias | ( monthPatternContext*, special* ) ) >
 <!ATTLIST monthPatterns alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST monthPatterns draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -886,6 +957,7 @@
 <!ELEMENT monthPatternContext ( alias | ( monthPatternWidth*, special* ) ) >
 <!ATTLIST monthPatternContext type (format | stand-alone | numeric) #REQUIRED >
 <!ATTLIST monthPatternContext alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST monthPatternContext draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -898,6 +970,7 @@
 <!ELEMENT monthPatternWidth ( alias | ( monthPattern*, special* ) ) >
 <!ATTLIST monthPatternWidth type (abbreviated | narrow | wide | all) #REQUIRED >
 <!ATTLIST monthPatternWidth alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST monthPatternWidth draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -910,6 +983,7 @@
 <!ELEMENT monthPattern ( #PCDATA ) >
 <!ATTLIST monthPattern type (leap | standardAfterLeap | combined) #REQUIRED >
 <!ATTLIST monthPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST monthPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST monthPattern references CDATA #IMPLIED >
@@ -917,6 +991,7 @@
 
 <!ELEMENT days ( alias | ( default*, dayContext*, special* ) ) >
 <!ATTLIST days alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST days draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -932,6 +1007,7 @@
 <!ELEMENT dayContext ( alias | ( default*, dayWidth*, special* ) ) >
 <!ATTLIST dayContext type (format | stand-alone) #REQUIRED >
 <!ATTLIST dayContext alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST dayContext draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -947,6 +1023,7 @@
 <!ELEMENT dayWidth ( alias | ( day*, special* ) ) >
 <!ATTLIST dayWidth type (abbreviated | narrow | short | wide) #REQUIRED >
 <!ATTLIST dayWidth alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST dayWidth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -962,6 +1039,7 @@
 <!ELEMENT day ( #PCDATA ) >
 <!ATTLIST day type (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
 <!ATTLIST day alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST day draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -982,6 +1060,7 @@
 
 <!ELEMENT quarters ( alias | ( default*, quarterContext*, special* ) ) >
 <!ATTLIST quarters alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST quarters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -994,6 +1073,7 @@
 <!ELEMENT quarterContext ( alias | ( default*, quarterWidth*, special* ) ) >
 <!ATTLIST quarterContext type (format | stand-alone) #REQUIRED >
 <!ATTLIST quarterContext alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST quarterContext draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1006,6 +1086,7 @@
 <!ELEMENT quarterWidth ( alias | ( quarter*, special* ) ) >
 <!ATTLIST quarterWidth type (abbreviated | narrow | wide) #REQUIRED >
 <!ATTLIST quarterWidth alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST quarterWidth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1018,6 +1099,7 @@
 <!ELEMENT quarter ( #PCDATA ) >
 <!ATTLIST quarter type (1 | 2 | 3 | 4) #REQUIRED >
 <!ATTLIST quarter alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST quarter draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1028,6 +1110,7 @@
     <!-- use supplemental weekData -->
     <!--@DEPRECATED-->
 <!ATTLIST week alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST week draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1047,6 +1130,7 @@
 <!ATTLIST minDays count (1 | 2 | 3 | 4 | 5 | 6 | 7) #REQUIRED >
     <!--@DEPRECATED-->
 <!ATTLIST minDays alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST minDays draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1062,6 +1146,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST firstDay alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST firstDay draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1080,6 +1165,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendStart alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1098,6 +1184,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendEnd alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1110,6 +1197,7 @@
     <!-- use dayPeriods -->
     <!--@DEPRECATED-->
 <!ATTLIST am alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST am draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1125,6 +1213,7 @@
     <!-- use dayPeriods -->
     <!--@DEPRECATED-->
 <!ATTLIST pm alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST pm draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1145,6 +1234,7 @@
 
 <!ELEMENT dayPeriodContext ( alias | ( dayPeriodWidth*, special* ) ) >
 <!ATTLIST dayPeriodContext type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/format, stand-alone-->
 <!ATTLIST dayPeriodContext draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1161,7 +1251,9 @@
 
 <!ELEMENT dayPeriod ( #PCDATA ) >
 <!ATTLIST dayPeriod type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/afternoon1, afternoon2, am, evening1, evening2, midnight, morning1, morning2, night1, night2, noon, pm-->
 <!ATTLIST dayPeriod alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST dayPeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST dayPeriod references CDATA #IMPLIED >
@@ -1169,6 +1261,7 @@
 
 <!ELEMENT eras ( alias | ( eraNames?, eraAbbr?, eraNarrow?, special* ) ) >
 <!ATTLIST eras alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST eras draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1183,6 +1276,7 @@
 
 <!ELEMENT eraNames ( alias | ( era*, special* ) ) >
 <!ATTLIST eraNames alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST eraNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1194,7 +1288,9 @@
 
 <!ELEMENT era ( #PCDATA ) >
 <!ATTLIST era type NMTOKEN #REQUIRED >
+    <!--@MATCH:range/0~237-->
 <!ATTLIST era alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST era draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1203,6 +1299,7 @@
 
 <!ELEMENT eraAbbr ( alias | ( era*, special* ) ) >
 <!ATTLIST eraAbbr alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST eraAbbr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1214,6 +1311,7 @@
 
 <!ELEMENT eraNarrow ( alias | ( era*, special* ) ) >
 <!ATTLIST eraNarrow alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST eraNarrow draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1225,6 +1323,7 @@
 
 <!ELEMENT cyclicNameSets ( alias | ( cyclicNameSet*, special* ) ) >
 <!ATTLIST cyclicNameSets alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicNameSets draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1237,6 +1336,7 @@
 <!ELEMENT cyclicNameSet ( alias | ( cyclicNameContext*, special* ) ) >
 <!ATTLIST cyclicNameSet type (years | months | days | dayParts | zodiacs | solarTerms) #REQUIRED >
 <!ATTLIST cyclicNameSet alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicNameSet draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1249,6 +1349,7 @@
 <!ELEMENT cyclicNameContext ( alias | ( cyclicNameWidth*, special* ) ) >
 <!ATTLIST cyclicNameContext type (format | stand-alone) #REQUIRED >
 <!ATTLIST cyclicNameContext alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicNameContext draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1261,6 +1362,7 @@
 <!ELEMENT cyclicNameWidth ( alias | ( cyclicName*, special* ) ) >
 <!ATTLIST cyclicNameWidth type (abbreviated | narrow | wide) #REQUIRED >
 <!ATTLIST cyclicNameWidth alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicNameWidth draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1272,7 +1374,9 @@
 
 <!ELEMENT cyclicName ( #PCDATA ) >
 <!ATTLIST cyclicName type NMTOKEN #REQUIRED >
+    <!--@MATCH:range/1~60-->
 <!ATTLIST cyclicName alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST cyclicName references CDATA #IMPLIED >
@@ -1289,6 +1393,7 @@
 <!ELEMENT dateFormatLength ( alias | ( default*, dateFormat*, special* ) ) >
 <!ATTLIST dateFormatLength type (full | long | medium | short) #REQUIRED >
 <!ATTLIST dateFormatLength alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST dateFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1303,7 +1408,9 @@
 
 <!ELEMENT dateFormat ( alias | ( pattern*, displayName*, special* ) ) >
 <!ATTLIST dateFormat type NMTOKEN "standard" >
+    <!--@MATCH:literal/standard-->
 <!ATTLIST dateFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST dateFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1318,11 +1425,15 @@
 
 <!ELEMENT pattern ( #PCDATA ) >
 <!ATTLIST pattern type NMTOKEN "standard" >
+    <!--@MATCH:literal/1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000, 10000000000, 100000000000, 1000000000000, 10000000000000, 100000000000000, approximately, atLeast, atMost, range, standard-->
 <!ATTLIST pattern numbers CDATA #IMPLIED >
+    <!-- TODO: generalize this to be any (M=|d=)?<numberSystem> -->
+    <!--@MATCH:literal/M=romanlow, d=hanidays, hanidec, hebr, y=jpanyear-->
     <!--@VALUE-->
 <!ATTLIST pattern count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
     <!-- Only used for decimalFormats type="1000..." -->
 <!ATTLIST pattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST pattern draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1333,6 +1444,7 @@
 <!ATTLIST displayName count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
     <!-- only for currencies -->
 <!ATTLIST displayName alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST displayName draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1350,6 +1462,7 @@
 <!ELEMENT timeFormatLength ( alias | ( default*, timeFormat*, special* ) ) >
 <!ATTLIST timeFormatLength type (full | long | medium | short) #REQUIRED >
 <!ATTLIST timeFormatLength alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST timeFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1364,7 +1477,9 @@
 
 <!ELEMENT timeFormat ( alias | ( pattern*, displayName*, special* ) ) >
 <!ATTLIST timeFormat type NMTOKEN "standard" >
+    <!--@MATCH:literal/standard-->
 <!ATTLIST timeFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST timeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1388,6 +1503,7 @@
 <!ELEMENT dateTimeFormatLength ( alias | ( default*, dateTimeFormat*, special* ) ) >
 <!ATTLIST dateTimeFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST dateTimeFormatLength alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST dateTimeFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1402,7 +1518,9 @@
 
 <!ELEMENT dateTimeFormat ( alias | ( pattern*, displayName*, special* ) ) >
 <!ATTLIST dateTimeFormat type NMTOKEN "standard" >
+    <!--@MATCH:literal/standard-->
 <!ATTLIST dateTimeFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST dateTimeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1417,6 +1535,7 @@
 
 <!ELEMENT availableFormats ( alias | ( dateFormatItem*, special* ) ) >
 <!ATTLIST availableFormats alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST availableFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1428,8 +1547,11 @@
 
 <!ELEMENT dateFormatItem ( #PCDATA ) >
 <!ATTLIST dateFormatItem id CDATA #REQUIRED >
+    <!-- TODO rationalize this list -->
+    <!--@MATCH:literal/Bh, Bhm, Bhms, E, EBhm, EBhms, EEEEd, EHm, EHms, Ed, Ehm, Ehms, Gy, GyM, GyMMM, GyMMMEEEEd, GyMMMEd, GyMMMM, GyMMMMEd, GyMMMMd, GyMMMd, GyMd, H, HHmm, HHmmZ, HHmmss, Hm, HmZ, Hmm, Hms, Hmsv, Hmsvvvv, Hmv, M, MEEEEd, MEd, MMM, MMMEEEEd, MMMEd, MMMM, MMMMEEEEd, MMMMEd, MMMMW, MMMMd, MMMMdd, MMMd, MMMdd, MMd, MMdd, Md, Mdd, UM, UMMM, UMMMd, UMd, d, h, hhmm, hhmmss, hm, hms, hmsv, hmsvvvv, hmv, mmss, ms, y, yM, yMEEEEd, yMEd, yMM, yMMM, yMMMEEEEd, yMMMEd, yMMMM, yMMMMEEEEd, yMMMMEd, yMMMMccccd, yMMMMd, yMMMd, yMMdd, yMd, yQ, yQQQ, yQQQQ, yw, yyyy, yyyyM, yyyyMEEEEd, yyyyMEd, yyyyMM, yyyyMMM, yyyyMMMEEEEd, yyyyMMMEd, yyyyMMMM, yyyyMMMMEd, yyyyMMMMccccd, yyyyMMMMd, yyyyMMMd, yyyyMMdd, yyyyMd, yyyyQQQ, yyyyQQQQ-->
 <!ATTLIST dateFormatItem count (zero | one | two | few | many | other) #IMPLIED >
 <!ATTLIST dateFormatItem alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST dateFormatItem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1438,6 +1560,7 @@
 
 <!ELEMENT appendItems ( alias | ( appendItem*, special* ) ) >
 <!ATTLIST appendItems alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST appendItems draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1449,7 +1572,9 @@
 
 <!ELEMENT appendItem ( #PCDATA ) >
 <!ATTLIST appendItem request CDATA #REQUIRED >
+    <!--@MATCH:literal/Day, Day-Of-Week, Era, Hour, Minute, Month, Quarter, Second, Timezone, Week, Year-->
 <!ATTLIST appendItem alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST appendItem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1458,6 +1583,7 @@
 
 <!ELEMENT intervalFormats ( alias | ( intervalFormatFallback*, intervalFormatItem*, special* ) ) >
 <!ATTLIST intervalFormats alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST intervalFormats draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1469,6 +1595,7 @@
 
 <!ELEMENT intervalFormatFallback ( #PCDATA ) >
 <!ATTLIST intervalFormatFallback alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST intervalFormatFallback draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST intervalFormatFallback references CDATA #IMPLIED >
@@ -1479,7 +1606,10 @@
 
 <!ELEMENT intervalFormatItem ( alias | ( greatestDifference*, special* ) ) >
 <!ATTLIST intervalFormatItem id NMTOKEN #REQUIRED >
+    <!-- TODO: check to see if this should be minimized -->
+    <!--@MATCH:literal/Bh, Bhm, Gy, GyM, GyMEd, GyMMM, GyMMMEd, GyMMMd, GyMd, H, Hm, Hmv, Hv, M, MEd, MMM, MMMEEEEd, MMMEd, MMMM, MMMMEd, MMMMd, MMMd, Md, d, h, hm, hmv, hv, y, yM, yMEd, yMMM, yMMMEEEEd, yMMMEd, yMMMM, yMMMMEEEEd, yMMMMEd, yMMMMd, yMMMd, yMd-->
 <!ATTLIST intervalFormatItem alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST intervalFormatItem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1491,7 +1621,9 @@
 
 <!ELEMENT greatestDifference ( #PCDATA ) >
 <!ATTLIST greatestDifference id NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/B, G, H, M, a, d, h, m, y-->
 <!ATTLIST greatestDifference alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST greatestDifference draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST greatestDifference references CDATA #IMPLIED >
@@ -1502,6 +1634,7 @@
 
 <!ELEMENT fields ( alias | ( field*, special* ) ) >
 <!ATTLIST fields alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST fields draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1517,6 +1650,7 @@
 <!ELEMENT field ( alias | ( displayName*, relative*, relativeTime*, relativePeriod*, special* ) ) >
 <!ATTLIST field type (era | era-short | era-narrow | year | year-short | year-narrow | quarter | quarter-short | quarter-narrow | month | month-short | month-narrow | week | week-short | week-narrow | weekOfMonth | weekOfMonth-short | weekOfMonth-narrow | day | day-short | day-narrow | dayOfYear | dayOfYear-short | dayOfYear-narrow | weekday | weekday-short | weekday-narrow | weekdayOfMonth | weekdayOfMonth-short | weekdayOfMonth-narrow | sun | sun-short | sun-narrow | mon | mon-short | mon-narrow | tue | tue-short | tue-narrow | wed | wed-short | wed-narrow | thu | thu-short | thu-narrow | fri | fri-short | fri-narrow | sat | sat-short | sat-narrow | dayperiod | dayperiod-short | dayperiod-narrow | hour | hour-short | hour-narrow | minute | minute-short | minute-narrow | second | second-short | second-narrow | zone | zone-short | zone-narrow) #IMPLIED >
 <!ATTLIST field alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST field draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1531,7 +1665,10 @@
 
 <!ELEMENT relative ( #PCDATA ) >
 <!ATTLIST relative type NMTOKEN #IMPLIED >
+    <!-- TODO: determine whether to allow 3 -->
+    <!--@MATCH:range/-2~3-->
 <!ATTLIST relative alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST relative draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1543,7 +1680,9 @@
 
 <!ELEMENT relativeTime ( alias | ( relativeTimePattern*, special* ) ) >
 <!ATTLIST relativeTime type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/future, past-->
 <!ATTLIST relativeTime alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST relativeTime draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1556,6 +1695,7 @@
 <!ELEMENT relativeTimePattern ( #PCDATA ) >
 <!ATTLIST relativeTimePattern count (zero | one | two | few | many | other) #REQUIRED >
 <!ATTLIST relativeTimePattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST relativeTimePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST relativeTimePattern references CDATA #IMPLIED >
@@ -1566,6 +1706,7 @@
 
 <!ELEMENT relativePeriod ( #PCDATA ) >
 <!ATTLIST relativePeriod alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST relativePeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -1579,6 +1720,7 @@
 
 <!ELEMENT hourFormat ( #PCDATA ) >
 <!ATTLIST hourFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST hourFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1588,6 +1730,7 @@
 <!ELEMENT hoursFormat ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST hoursFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST hoursFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1598,6 +1741,7 @@
 
 <!ELEMENT gmtFormat ( #PCDATA ) >
 <!ATTLIST gmtFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST gmtFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1606,6 +1750,7 @@
 
 <!ELEMENT gmtZeroFormat ( #PCDATA ) >
 <!ATTLIST gmtZeroFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST gmtZeroFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1615,6 +1760,7 @@
 <!ELEMENT regionFormat ( #PCDATA ) >
 <!ATTLIST regionFormat type (standard | daylight) #IMPLIED >
 <!ATTLIST regionFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST regionFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1623,6 +1769,7 @@
 
 <!ELEMENT fallbackFormat ( #PCDATA ) >
 <!ATTLIST fallbackFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST fallbackFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1632,6 +1779,7 @@
 <!ELEMENT fallbackRegionFormat ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST fallbackRegionFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST fallbackRegionFormat draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -1651,6 +1799,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST abbreviationFallback alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST abbreviationFallback draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1671,6 +1820,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST preferenceOrdering alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST preferenceOrdering draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1685,6 +1835,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST singleCountries alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST singleCountries draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1695,7 +1846,9 @@
 
 <!ELEMENT zone ( alias | ( long*, short*, commonlyUsed*, exemplarCity*, special* ) ) >
 <!ATTLIST zone type CDATA #REQUIRED >
+    <!--@MATCH:bcp47/tz-->
 <!ATTLIST zone alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST zone draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1710,6 +1863,7 @@
 
 <!ELEMENT long ( alias | ( generic*, standard*, daylight*, special* ) ) >
 <!ATTLIST long alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST long draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1721,6 +1875,7 @@
 
 <!ELEMENT generic ( #PCDATA ) >
 <!ATTLIST generic alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST generic draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1729,6 +1884,7 @@
 
 <!ELEMENT standard ( #PCDATA ) >
 <!ATTLIST standard alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST standard draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1737,6 +1893,7 @@
 
 <!ELEMENT daylight ( #PCDATA ) >
 <!ATTLIST daylight alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST daylight draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1745,6 +1902,7 @@
 
 <!ELEMENT short ( alias | ( generic*, standard*, daylight*, special* ) ) >
 <!ATTLIST short alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST short draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1760,6 +1918,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST commonlyUsed alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST commonlyUsed draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1770,6 +1929,7 @@
 
 <!ELEMENT exemplarCity ( #PCDATA ) >
 <!ATTLIST exemplarCity alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/formal, secondary-->
 <!ATTLIST exemplarCity draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1778,7 +1938,9 @@
 
 <!ELEMENT metazone ( alias | ( long*, short*, commonlyUsed*, special* ) ) >
 <!ATTLIST metazone type CDATA #REQUIRED >
+    <!--@MATCH:metazone-->
 <!ATTLIST metazone alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST metazone draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1795,6 +1957,7 @@
 
 <!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
 <!ATTLIST numbers alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST numbers draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1809,6 +1972,7 @@
 
 <!ELEMENT defaultNumberingSystem ( #PCDATA ) >
 <!ATTLIST defaultNumberingSystem alt NMTOKENS #IMPLIED >
+    <!--@MATCH:bcp47/nu-->
 <!ATTLIST defaultNumberingSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1817,30 +1981,35 @@
 
 <!ELEMENT otherNumberingSystems ( alias | ( native*, traditional*, finance*, special* ) ) >
 <!ATTLIST otherNumberingSystems alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST otherNumberingSystems draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT native ( #PCDATA ) >
 <!ATTLIST native alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST native draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 
 <!ELEMENT traditional ( #PCDATA ) >
 <!ATTLIST traditional alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST traditional draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 
 <!ELEMENT finance ( #PCDATA ) >
 <!ATTLIST finance alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST finance draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 
 <!ELEMENT minimumGroupingDigits ( #PCDATA ) >
 <!ATTLIST minimumGroupingDigits alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST minimumGroupingDigits draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST minimumGroupingDigits references CDATA #IMPLIED >
@@ -1848,6 +2017,7 @@
 
 <!ELEMENT symbols ( alias | ( decimal*, group*, list*, percentSign*, nativeZeroDigit*, patternDigit*, plusSign*, minusSign*, exponential*, superscriptingExponent*, perMille*, infinity*, nan*, currencyDecimal*, currencyGroup*, timeSeparator*, special* ) ) >
 <!ATTLIST symbols alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST symbols draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1860,9 +2030,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST symbols numberSystem CDATA #IMPLIED >
+    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT decimal ( #PCDATA ) >
 <!ATTLIST decimal alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST decimal draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1873,6 +2045,7 @@
 
 <!ELEMENT group ( #PCDATA ) >
 <!ATTLIST group alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST group draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1883,6 +2056,7 @@
 
 <!ELEMENT list ( #PCDATA ) >
 <!ATTLIST list alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST list draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1893,6 +2067,7 @@
 
 <!ELEMENT percentSign ( #PCDATA ) >
 <!ATTLIST percentSign alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST percentSign draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1904,6 +2079,7 @@
 <!ELEMENT nativeZeroDigit ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST nativeZeroDigit alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST nativeZeroDigit draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1917,6 +2093,7 @@
 <!ELEMENT patternDigit ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST patternDigit alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST patternDigit draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -1929,6 +2106,7 @@
 
 <!ELEMENT plusSign ( #PCDATA ) >
 <!ATTLIST plusSign alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST plusSign draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1939,6 +2117,7 @@
 
 <!ELEMENT minusSign ( #PCDATA ) >
 <!ATTLIST minusSign alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST minusSign draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1949,6 +2128,7 @@
 
 <!ELEMENT exponential ( #PCDATA ) >
 <!ATTLIST exponential alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST exponential draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1959,6 +2139,7 @@
 
 <!ELEMENT superscriptingExponent ( #PCDATA ) >
 <!ATTLIST superscriptingExponent alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST superscriptingExponent draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST superscriptingExponent references CDATA #IMPLIED >
@@ -1966,6 +2147,7 @@
 
 <!ELEMENT perMille ( #PCDATA ) >
 <!ATTLIST perMille alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST perMille draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1976,6 +2158,7 @@
 
 <!ELEMENT infinity ( #PCDATA ) >
 <!ATTLIST infinity alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST infinity draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1986,6 +2169,7 @@
 
 <!ELEMENT nan ( #PCDATA ) >
 <!ATTLIST nan alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST nan draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1996,6 +2180,7 @@
 
 <!ELEMENT currencyDecimal ( #PCDATA ) >
 <!ATTLIST currencyDecimal alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyDecimal draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2006,6 +2191,7 @@
 
 <!ELEMENT currencyGroup ( #PCDATA ) >
 <!ATTLIST currencyGroup alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyGroup draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2016,6 +2202,7 @@
 
 <!ELEMENT timeSeparator ( #PCDATA ) >
 <!ATTLIST timeSeparator alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST timeSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST timeSeparator references CDATA #IMPLIED >
@@ -2029,10 +2216,12 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST decimalFormats numberSystem CDATA #IMPLIED >
+    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT decimalFormatLength ( alias | ( default*, decimalFormat*, special* ) ) >
 <!ATTLIST decimalFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST decimalFormatLength alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST decimalFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2047,7 +2236,9 @@
 
 <!ELEMENT decimalFormat ( alias | ( pattern*, special* ) ) >
 <!ATTLIST decimalFormat type NMTOKEN "standard" >
+    <!--@MATCH:literal/standard-->
 <!ATTLIST decimalFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST decimalFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2068,10 +2259,12 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST scientificFormats numberSystem CDATA #IMPLIED >
+    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT scientificFormatLength ( alias | ( default*, scientificFormat*, special* ) ) >
 <!ATTLIST scientificFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST scientificFormatLength alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST scientificFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2086,7 +2279,9 @@
 
 <!ELEMENT scientificFormat ( alias | ( pattern*, special* ) ) >
 <!ATTLIST scientificFormat type NMTOKEN "standard" >
+    <!--@MATCH:literal/standard-->
 <!ATTLIST scientificFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST scientificFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2107,10 +2302,12 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST percentFormats numberSystem CDATA #IMPLIED >
+    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT percentFormatLength ( alias | ( default*, percentFormat*, special* ) ) >
 <!ATTLIST percentFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST percentFormatLength alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST percentFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2125,7 +2322,9 @@
 
 <!ELEMENT percentFormat ( alias | ( pattern*, special* ) ) >
 <!ATTLIST percentFormat type NMTOKEN "standard" >
+    <!--@MATCH:literal/standard-->
 <!ATTLIST percentFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST percentFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2146,6 +2345,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST currencyFormats numberSystem CDATA #IMPLIED >
+    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT currencySpacing ( alias | ( beforeCurrency*, afterCurrency*, special* ) ) >
 
@@ -2153,6 +2353,7 @@
 
 <!ELEMENT currencyMatch ( #PCDATA ) >
 <!ATTLIST currencyMatch alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyMatch draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2161,6 +2362,7 @@
 
 <!ELEMENT surroundingMatch ( #PCDATA ) >
 <!ATTLIST surroundingMatch alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST surroundingMatch draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2169,6 +2371,7 @@
 
 <!ELEMENT insertBetween ( #PCDATA ) >
 <!ATTLIST insertBetween alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST insertBetween draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2180,6 +2383,7 @@
 <!ELEMENT currencyFormatLength ( alias | ( default*, currencyFormat*, special* ) ) >
 <!ATTLIST currencyFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST currencyFormatLength alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2194,7 +2398,9 @@
 
 <!ELEMENT currencyFormat ( alias | ( pattern*, special* ) ) >
 <!ATTLIST currencyFormat type NMTOKEN "standard" >
+    <!--@MATCH:literal/accounting, standard-->
 <!ATTLIST currencyFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2210,6 +2416,7 @@
 <!ELEMENT unitPattern ( #PCDATA ) >
 <!ATTLIST unitPattern count (0 | 1 | zero | one | two | few | many | other) #REQUIRED >
 <!ATTLIST unitPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST unitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST unitPattern references CDATA #IMPLIED >
@@ -2231,7 +2438,9 @@
 <!-- # warning: pattern appears twice in the above. The first is for consistency with all other cases of
     pattern + displayName; the second is for backwards compatibility -->
 <!ATTLIST currency type NMTOKEN "standard" >
+    <!--@MATCH:validity/currency-->
 <!ATTLIST currency alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST currency draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2246,6 +2455,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST symbol alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/formal, narrow, variant-->
 <!ATTLIST symbol draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2257,22 +2467,28 @@
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST miscPatterns numberSystem CDATA #IMPLIED >
+    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT minimalPairs ( alias | ( pluralMinimalPairs*, ordinalMinimalPairs*, special* ) ) >
 <!ATTLIST minimalPairs alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST minimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT pluralMinimalPairs ( #PCDATA ) >
 <!ATTLIST pluralMinimalPairs count NMTOKEN #IMPLIED >
+    <!--@MATCH:literal/few, many, one, other, two, zero-->
 <!ATTLIST pluralMinimalPairs alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST pluralMinimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT ordinalMinimalPairs ( #PCDATA ) >
 <!ATTLIST ordinalMinimalPairs ordinal NMTOKEN #IMPLIED >
+    <!--@MATCH:literal/few, many, one, other, two, zero-->
 <!ATTLIST ordinalMinimalPairs alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST ordinalMinimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -2280,6 +2496,7 @@
 
 <!ELEMENT units ( alias | ( unit*, unitLength*, durationUnit*, special* ) ) >
 <!ATTLIST units alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST units draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2291,7 +2508,9 @@
 
 <!ELEMENT unit ( alias | ( displayName*, unitPattern*, perUnitPattern*, special* ) ) >
 <!ATTLIST unit type NMTOKEN #REQUIRED >
+    <!--@MATCH:validity/unit-->
 <!ATTLIST unit alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST unit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2303,6 +2522,7 @@
 
 <!ELEMENT perUnitPattern ( #PCDATA ) >
 <!ATTLIST perUnitPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST perUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST perUnitPattern references CDATA #IMPLIED >
@@ -2311,6 +2531,7 @@
 <!ELEMENT unitLength ( alias | ( compoundUnit*, unit*, coordinateUnit*, special* ) ) >
 <!ATTLIST unitLength type (long | short | narrow) #REQUIRED >
 <!ATTLIST unitLength alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST unitLength draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2322,7 +2543,9 @@
 
 <!ELEMENT compoundUnit ( alias | ( compoundUnitPattern*, special* ) ) >
 <!ATTLIST compoundUnit type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/per-->
 <!ATTLIST compoundUnit alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST compoundUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2334,6 +2557,7 @@
 
 <!ELEMENT compoundUnitPattern ( #PCDATA ) >
 <!ATTLIST compoundUnitPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST compoundUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST compoundUnitPattern references CDATA #IMPLIED >
@@ -2342,8 +2566,9 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
-<!ELEMENT coordinateUnit ( alias | ( coordinateUnitPattern*, special* ) ) >
+<!ELEMENT coordinateUnit ( alias | ( displayName*, coordinateUnitPattern*, special* ) ) >
 <!ATTLIST coordinateUnit alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST coordinateUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2351,12 +2576,15 @@
 <!ELEMENT coordinateUnitPattern ( #PCDATA ) >
 <!ATTLIST coordinateUnitPattern type (north | east | south | west) #REQUIRED >
 <!ATTLIST coordinateUnitPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST coordinateUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT durationUnit ( alias | ( durationUnitPattern*, special* ) ) >
 <!ATTLIST durationUnit type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/hm, hms, ms-->
 <!ATTLIST durationUnit alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST durationUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2365,6 +2593,7 @@
 
 <!ELEMENT durationUnitPattern ( #PCDATA ) >
 <!ATTLIST durationUnitPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST durationUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST durationUnitPattern references CDATA #IMPLIED >
@@ -2375,6 +2604,7 @@
 
 <!ELEMENT listPatterns ( alias | ( listPattern*, special* ) ) >
 <!ATTLIST listPatterns alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST listPatterns draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2386,7 +2616,9 @@
 
 <!ELEMENT listPattern ( alias | ( listPatternPart*, special* ) ) >
 <!ATTLIST listPattern type NMTOKEN #IMPLIED >
+    <!--@MATCH:literal/or, or-narrow, or-short, standard-narrow, standard-short, unit, unit-narrow, unit-short-->
 <!ATTLIST listPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST listPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2399,6 +2631,7 @@
 <!ELEMENT listPatternPart ( #PCDATA ) >
 <!ATTLIST listPatternPart type (start | middle | end | 2 | 3) #REQUIRED >
 <!ATTLIST listPatternPart alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST listPatternPart draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST listPatternPart references CDATA #IMPLIED >
@@ -2422,21 +2655,25 @@
 
 <!ELEMENT defaultCollation ( #PCDATA ) >
 <!ATTLIST defaultCollation alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST defaultCollation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT collation ( alias | ( base?, import*, settings?, suppress_contractions?, optimize?, ( cr* | rules? ), special* ) ) >
 <!ATTLIST collation type NMTOKEN "standard" >
+    <!--@MATCH:or/bcp47/co||regex/private-.*||literal/digits-after-->
 <!ATTLIST collation visibility (internal | external) #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST collation alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/proposed, short, variant-->
 <!ATTLIST collation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST collation standard CDATA #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST collation references CDATA #IMPLIED >
+    <!--@MATCH:any-->
     <!--@METADATA-->
 <!ATTLIST collation validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
@@ -2517,6 +2754,7 @@
 
 <!ELEMENT cr ( #PCDATA ) >
 <!ATTLIST cr alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST cr draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST cr references CDATA #IMPLIED >
@@ -2638,6 +2876,7 @@
 
 <!ELEMENT messages ( alias | ( yesstr*, nostr*, yesexpr*, noexpr*, special* ) ) >
 <!ATTLIST messages alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST messages draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2649,6 +2888,7 @@
 
 <!ELEMENT yesstr ( #PCDATA ) >
 <!ATTLIST yesstr alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST yesstr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2657,6 +2897,7 @@
 
 <!ELEMENT nostr ( #PCDATA ) >
 <!ATTLIST nostr alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST nostr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2666,6 +2907,7 @@
 <!ELEMENT yesexpr ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST yesexpr alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST yesexpr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -2677,6 +2919,7 @@
 <!ELEMENT noexpr ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST noexpr alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST noexpr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -2689,20 +2932,25 @@
 
 <!ELEMENT characterLabelPattern ( #PCDATA ) >
 <!ATTLIST characterLabelPattern type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/all, category-list, compatibility, enclosed, extended, historic, miscellaneous, other, scripts, strokes-->
 <!ATTLIST characterLabelPattern count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
     <!-- count only used for certain patterns" -->
 <!ATTLIST characterLabelPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST characterLabelPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT characterLabel ( #PCDATA ) >
 <!ATTLIST characterLabel type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/activities, african_scripts, american_scripts, animal, animals_nature, arrows, body, box_drawing, braille, building, bullets_stars, consonantal_jamo, currency_symbols, dash_connector, digits, dingbats, divination_symbols, downwards_arrows, downwards_upwards_arrows, east_asian_scripts, emoji, european_scripts, female, flag, flags, food_drink, format, format_whitespace, full_width_form_variant, geometric_shapes, half_width_form_variant, han_characters, han_radicals, hanja, hanzi_simplified, hanzi_traditional, heart, historic_scripts, ideographic_desc_characters, japanese_kana, kanbun, kanji, keycap, leftwards_arrows, leftwards_rightwards_arrows, letterlike_symbols, limited_use, male, math_symbols, middle_eastern_scripts, miscellaneous, modern_scripts, modifier, musical_symbols, nature, nonspacing, numbers, objects, other, paired, person, phonetic_alphabet, pictographs, place, plant, punctuation, rightwards_arrows, sign_standard_symbols, small_form_variant, smiley, smileys_people, south_asian_scripts, southeast_asian_scripts, spacing, sport, symbols, technical_symbols, tone_marks, travel, travel_places, upwards_arrows, variant_forms, vocalic_jamo, weather, western_asian_scripts, whitespace-->
 <!ATTLIST characterLabel alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST characterLabel draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT segmentations ( alias | ( segmentation*, special* ) ) >
 <!ATTLIST segmentations alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST segmentations draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2714,7 +2962,9 @@
 
 <!ELEMENT segmentation ( alias | ( variables?, segmentRules?, exceptions?, suppressions? ) | special* ) >
 <!ATTLIST segmentation type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/GraphemeClusterBreak, LineBreak, SentenceBreak, WordBreak-->
 <!ATTLIST segmentation alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST segmentation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2729,7 +2979,9 @@
 <!ELEMENT variable ( #PCDATA ) >
     <!--@ORDERED-->
 <!ATTLIST variable id CDATA #REQUIRED >
+    <!--@MATCH:regex/\$[a-zA-Z0-9_]+-->
 <!ATTLIST variable alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST variable draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2740,7 +2992,9 @@
 
 <!ELEMENT rule ( #PCDATA ) >
 <!ATTLIST rule id NMTOKEN #REQUIRED >
+    <!--@MATCH:range/0.0~9999.0-->
 <!ATTLIST rule alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST rule draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2760,6 +3014,7 @@
 
 <!ELEMENT suppressions ( alias | ( suppression*, special* ) ) >
 <!ATTLIST suppressions type NMTOKEN "standard" >
+    <!--@MATCH:literal/standard-->
 <!ATTLIST suppressions draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2767,6 +3022,7 @@
 <!ELEMENT suppression ( #PCDATA ) >
     <!--@ORDERED-->
 <!ATTLIST suppression alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST suppression draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -2774,6 +3030,7 @@
 
 <!ELEMENT rulesetGrouping ( alias | ( ruleset*, special* ) ) >
 <!ATTLIST rulesetGrouping type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/NumberingSystemRules, OrdinalRules, SpelloutRules-->
 <!ATTLIST rulesetGrouping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -2781,6 +3038,7 @@
 <!ELEMENT ruleset ( alias | ( rbnfrule*, special* ) ) >
     <!--@ORDERED-->
 <!ATTLIST ruleset type NMTOKEN #REQUIRED >
+    <!--@MATCH:regex/(ord-M-)?[\-0-9a-z]+-->
 <!ATTLIST ruleset access (public | private) #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST ruleset allowsParsing (true | false) #IMPLIED >
@@ -2792,12 +3050,15 @@
 <!ELEMENT rbnfrule ( #PCDATA ) >
     <!--@ORDERED-->
 <!ATTLIST rbnfrule value CDATA #REQUIRED >
+    <!--@MATCH:or/range/-1.0E20~1.0E20||literal/-x, 0, 0.x, NaN, -Inf, Inf, x,x, x.x-->
     <!--@VALUE-->
 <!ATTLIST rbnfrule radix CDATA #IMPLIED >
+    <!--@MATCH:literal/1,000, 100, 1000, 100000, 20-->
     <!--@VALUE-->
 <!ATTLIST rbnfrule decexp CDATA #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST rbnfrule alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST rbnfrule draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -2807,19 +3068,23 @@
 <!ELEMENT axisName ( #PCDATA ) >
 <!ATTLIST axisName type (ital | opsz | slnt | wdth | wght) #REQUIRED >
 <!ATTLIST axisName alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST axisName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT styleName ( #PCDATA ) >
 <!ATTLIST styleName type (ital | opsz | slnt | wdth | wght) #REQUIRED >
 <!ATTLIST styleName subtype NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/-12, 0, 1, 100, 112.5, 12, 125, 144, 150, 18, 200, 24, 300, 350, 380, 400, 50, 500, 600, 62.5, 700, 72, 75, 8, 800, 87.5, 900, 950-->
 <!ATTLIST styleName alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/compressed, demi, extended, heavy, narrow, short, ultra, ultrablack, ultraheavy, wide-->
 <!ATTLIST styleName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT featureName ( #PCDATA ) >
 <!ATTLIST featureName type (afrc | cpsp | dlig | frac | lnum | onum | ordn | pnum | smcp | tnum | zero) #REQUIRED >
 <!ATTLIST featureName alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/short, variant-->
 <!ATTLIST featureName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -2827,11 +3092,13 @@
 
 <!ELEMENT annotation ( #PCDATA ) >
 <!ATTLIST annotation cp CDATA #REQUIRED >
+    <!--@MATCH:any-->
 <!ATTLIST annotation tts CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST annotation type (tts) #IMPLIED >
 <!ATTLIST annotation alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST annotation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -2846,11 +3113,13 @@
 
 <!ELEMENT casingItem ( #PCDATA ) >
 <!ATTLIST casingItem type CDATA #REQUIRED >
+    <!--@MATCH:any-->
 <!ATTLIST casingItem override (true | false) #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST casingItem forceError (true | false) #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST casingItem alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 <!ATTLIST casingItem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -2867,6 +3136,7 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST reference alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST reference draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
--- a/make/data/cldr/common/dtd/ldmlBCP47.dtd	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/dtd/ldmlBCP47.dtd	Wed May 08 12:45:02 2019 -0700
@@ -1,12 +1,12 @@
 <!--
-Copyright © 2003-2017 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+Copyright © 2003-2019 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
 
 THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
 Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
-$Revision: 13784 $
+$Revision: 14983 $
 -->
 
 <!ELEMENT ldmlBCP47 ( version, generation?, cldrVersion?, keyword*, attribute* ) >
@@ -14,8 +14,10 @@
 <!ELEMENT version EMPTY >
     <!--@METADATA-->
 <!ATTLIST version number CDATA #REQUIRED >
+	<!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "33" >
+<!ATTLIST version cldrVersion CDATA #FIXED "35.1" >
+	<!--@MATCH:version-->
     <!--@VALUE-->
 
 <!ELEMENT generation EMPTY >
@@ -35,31 +37,41 @@
 
 <!ELEMENT key ( type* ) >
 <!ATTLIST key extension NMTOKEN #IMPLIED >
+	<!--@MATCH:any-->
 <!ATTLIST key name NMTOKEN #REQUIRED >
+	<!--@MATCH:regex/[a-z0-9]{2}-->
 <!ATTLIST key description CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST key deprecated (true | false) "false" >
     <!--@VALUE-->
 <!ATTLIST key preferred NMTOKEN #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST key alias NMTOKEN #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST key valueType (single | multiple | incremental | any) #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST key since CDATA #IMPLIED >
+	<!--@MATCH:version-->
     <!--@METADATA-->
 
 <!ELEMENT type EMPTY >
 <!ATTLIST type name NMTOKEN #REQUIRED >
+	<!--@MATCH:any-->
 <!ATTLIST type description CDATA #REQUIRED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST type deprecated (true | false) "false" >
     <!--@VALUE-->
 <!ATTLIST type preferred NMTOKEN #IMPLIED >
+	<!--@MATCH:bcp47/anyvalue-->
     <!--@VALUE-->
 <!ATTLIST type alias CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST type since CDATA #IMPLIED >
+	<!--@MATCH:version-->
     <!--@METADATA-->
 
 <!ELEMENT attribute EMPTY >
--- a/make/data/cldr/common/dtd/ldmlSupplemental.dtd	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/dtd/ldmlSupplemental.dtd	Wed May 08 12:45:02 2019 -0700
@@ -1,5 +1,5 @@
 <!--
-Copyright © 2003-2017 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+Copyright © 2003-2019 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
 
@@ -7,7 +7,7 @@
 
 Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
 
-    $Revision: 13905 $
+    $Revision: 14983 $
 -->
 
 <!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups? ) >
@@ -15,10 +15,13 @@
 <!ELEMENT version EMPTY >
     <!--@METADATA-->
 <!ATTLIST version number CDATA #REQUIRED >
+	<!--@MATCH:any-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "33" >
+<!ATTLIST version cldrVersion CDATA #FIXED "35.1" >
+	<!--@MATCH:version-->
     <!--@VALUE-->
-<!ATTLIST version unicodeVersion CDATA #FIXED "10.0.0" >
+<!ATTLIST version unicodeVersion CDATA #FIXED "12.1.0" >
+	<!--@MATCH:version-->
     <!--@VALUE-->
 
 <!ELEMENT generation EMPTY >
@@ -46,13 +49,18 @@
 
 <!ELEMENT info EMPTY >
 <!ATTLIST info iso4217 NMTOKEN #REQUIRED >
+	<!--@MATCH:or/validity/currency||literal/DEFAULT-->
 <!ATTLIST info digits NMTOKEN #IMPLIED >
+	<!--@MATCH:range/0~5-->
     <!--@VALUE-->
 <!ATTLIST info rounding NMTOKEN #IMPLIED >
+	<!--@MATCH:range/0~5-->
     <!--@VALUE-->
 <!ATTLIST info cashDigits NMTOKEN #IMPLIED >
+	<!--@MATCH:range/0~100-->
     <!--@VALUE-->
 <!ATTLIST info cashRounding NMTOKEN #IMPLIED >
+	<!--@MATCH:literal/0, 5, 50-->
     <!--@VALUE-->
 <!ATTLIST info draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -62,6 +70,7 @@
 
 <!ELEMENT region ( currency* ) >
 <!ATTLIST region iso3166 NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/region-->
 <!ATTLIST region draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -72,8 +81,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST currency from NMTOKEN #IMPLIED >
+	<!--@MATCH:time/yyyy-MM-dd-->
 <!ATTLIST currency to NMTOKEN #IMPLIED >
+	<!--@MATCH:time/yyyy-MM-dd-->
 <!ATTLIST currency iso4217 NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/currency-->
 <!ATTLIST currency digits NMTOKEN #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST currency rounding NMTOKEN #IMPLIED >
@@ -98,7 +110,9 @@
 
 <!ELEMENT group EMPTY >
 <!ATTLIST group type NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/region-->
 <!ATTLIST group contains NMTOKENS #IMPLIED >
+	<!--@MATCH:set/validity/region-->
     <!--@VALUE-->
 <!ATTLIST group grouping (true | false) #IMPLIED >
     <!--@VALUE-->
@@ -113,18 +127,23 @@
 
 <!ELEMENT subgroup EMPTY >
 <!ATTLIST subgroup type NMTOKEN #REQUIRED >
+	<!--@MATCH:or/validity/region||validity/subdivision-->
 <!ATTLIST subgroup subtype NMTOKEN #IMPLIED >
     <!--@DEPRECATED-->
 <!ATTLIST subgroup contains NMTOKENS #IMPLIED >
+	<!--@MATCH:set/validity/subdivision-->
     <!--@VALUE-->
 
 <!ELEMENT languageData ( language* ) >
 
 <!ELEMENT language EMPTY >
 <!ATTLIST language type NMTOKEN #REQUIRED >
+	<!--@MATCH:set/validity/language-->
 <!ATTLIST language scripts NMTOKENS #IMPLIED >
+	<!--@MATCH:set/validity/script-->
     <!--@VALUE-->
 <!ATTLIST language territories NMTOKENS #IMPLIED >
+	<!--@MATCH:set/validity/region-->
     <!--@VALUE-->
 <!ATTLIST language variants NMTOKENS #IMPLIED >
     <!--@VALUE-->
@@ -134,6 +153,7 @@
 <!ATTLIST language references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST language alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/secondary, variant-->
 
 <!ELEMENT territoryInfo ( territory* ) >
 <!ATTLIST territoryInfo draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -142,29 +162,40 @@
 <!ATTLIST territoryInfo references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST territoryInfo alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT territory ( languagePopulation* ) >
 <!ATTLIST territory type NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/region-->
 <!ATTLIST territory gdp NMTOKEN #REQUIRED >
+	<!--@MATCH:range/0~100000000000000-->
     <!--@VALUE-->
 <!ATTLIST territory literacyPercent NMTOKEN #REQUIRED >
+	<!--@MATCH:range/0.0~100.0-->
     <!--@VALUE-->
 <!ATTLIST territory population NMTOKEN #REQUIRED >
+	<!--@MATCH:range/0~10000000000-->
     <!--@VALUE-->
 <!ATTLIST territory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST territory references CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@METADATA-->
 <!ATTLIST territory alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT languagePopulation EMPTY >
 <!ATTLIST languagePopulation type NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/locale-->
 <!ATTLIST languagePopulation literacyPercent NMTOKEN #IMPLIED >
+	<!--@MATCH:range/0~100-->
     <!--@VALUE-->
 <!ATTLIST languagePopulation writingPercent NMTOKEN #IMPLIED >
+	<!--@MATCH:range/0~100-->
     <!--@VALUE-->
 <!ATTLIST languagePopulation populationPercent NMTOKEN #REQUIRED >
+	<!--@MATCH:range/0.0~100.0-->
     <!--@VALUE-->
 <!ATTLIST languagePopulation officialStatus (de_facto_official | official | official_regional | official_minority) #IMPLIED >
     <!--@VALUE-->
@@ -172,8 +203,10 @@
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST languagePopulation references CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@METADATA-->
 <!ATTLIST languagePopulation alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT postalCodeData ( postCodeRegex* ) >
     <!--@DEPRECATED-->
@@ -190,6 +223,7 @@
 
 <!ELEMENT calendar ( calendarSystem?, eras? ) >
 <!ATTLIST calendar type NMTOKEN #REQUIRED >
+	<!--@MATCH:bcp47/ca-->
 <!ATTLIST calendar territories NMTOKENS #IMPLIED >
     <!-- use ordering attribute in calendarPreference element instead. -->
     <!--@VALUE-->
@@ -200,6 +234,7 @@
 <!ATTLIST calendar references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST calendar alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT calendarSystem EMPTY >
 <!ATTLIST calendarSystem type (solar | lunar | lunisolar | other) #REQUIRED >
@@ -213,16 +248,23 @@
 
 <!ELEMENT era EMPTY >
 <!ATTLIST era type NMTOKEN #REQUIRED >
+	<!--@MATCH:range/0~250-->
 <!ATTLIST era start CDATA #IMPLIED >
+	<!--@MATCH:time/yyyy-MM-dd-->
     <!--@VALUE-->
 <!ATTLIST era end CDATA #IMPLIED >
+	<!--@MATCH:time/yyyy-MM-dd-->
+    <!--@VALUE-->
+<!ATTLIST era named (true | false) #IMPLIED >
     <!--@VALUE-->
 
 <!ELEMENT calendarPreferenceData ( calendarPreference* ) >
 
 <!ELEMENT calendarPreference EMPTY >
 <!ATTLIST calendarPreference territories NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/region-->
 <!ATTLIST calendarPreference ordering NMTOKENS #REQUIRED >
+	<!--@MATCH:set/bcp47/ca-->
     <!--@VALUE-->
 
 <!ELEMENT weekData ( minDays*, firstDay*, weekendStart*, weekendEnd*, weekOfPreference* ) >
@@ -230,6 +272,7 @@
 <!ELEMENT minDays EMPTY >
 <!ATTLIST minDays count (1 | 2 | 3 | 4 | 5 | 6 | 7) #REQUIRED >
 <!ATTLIST minDays territories NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/region-->
     <!--@VALUE-->
 <!ATTLIST minDays draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -237,21 +280,26 @@
 <!ATTLIST minDays references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST minDays alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT firstDay EMPTY >
 <!ATTLIST firstDay day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
 <!ATTLIST firstDay territories NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/region-->
     <!--@VALUE-->
 <!ATTLIST firstDay draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST firstDay references CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@METADATA-->
 <!ATTLIST firstDay alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT weekendStart EMPTY >
 <!ATTLIST weekendStart day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
 <!ATTLIST weekendStart territories NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/region-->
     <!--@VALUE-->
 <!ATTLIST weekendStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -259,10 +307,12 @@
 <!ATTLIST weekendStart references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST weekendStart alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT weekendEnd EMPTY >
 <!ATTLIST weekendEnd day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
 <!ATTLIST weekendEnd territories NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/region-->
     <!--@VALUE-->
 <!ATTLIST weekendEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -270,18 +320,24 @@
 <!ATTLIST weekendEnd references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST weekendEnd alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT weekOfPreference EMPTY >
 <!ATTLIST weekOfPreference locales NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/locale-->
 <!ATTLIST weekOfPreference ordering NMTOKENS #REQUIRED >
+	<!--@MATCH:set/literal/weekOfDate, weekOfInterval, weekOfMonth, weekOfYear-->
     <!--@VALUE-->
 
 <!ELEMENT timeData ( hours* ) >
 
 <!ELEMENT hours EMPTY >
 <!ATTLIST hours allowed NMTOKENS #REQUIRED >
+	<!--@MATCH:set/literal/H, h, K, k, hB, hb-->
 <!ATTLIST hours preferred NMTOKEN #REQUIRED >
+	<!--@MATCH:literal/H, h-->
 <!ATTLIST hours regions NMTOKENS #REQUIRED >
+	<!--@MATCH:set/or/validity/region||validity/locale-->
     <!--@VALUE-->
 <!ATTLIST hours draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -294,6 +350,7 @@
 <!ATTLIST measurementSystem type (metric | US | UK) #REQUIRED >
 <!ATTLIST measurementSystem category (temperature) #IMPLIED >
 <!ATTLIST measurementSystem territories NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/region-->
     <!--@VALUE-->
 <!ATTLIST measurementSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -301,10 +358,12 @@
 <!ATTLIST measurementSystem references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST measurementSystem alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT paperSize EMPTY >
 <!ATTLIST paperSize type (A4 | US-Letter) #REQUIRED >
 <!ATTLIST paperSize territories NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/region-->
     <!--@VALUE-->
 <!ATTLIST paperSize draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -312,40 +371,53 @@
 <!ATTLIST paperSize references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST paperSize alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT unitPreferenceData ( unitPreferences* ) >
 
 <!ELEMENT unitPreferences ( unitPreference* ) >
 <!ATTLIST unitPreferences category NMTOKEN #REQUIRED >
+	<!--@MATCH:literal/area, concentr, consumption, duration, energy, length, mass, pressure, speed, temperature, volume-->
 <!ATTLIST unitPreferences usage NMTOKENS #REQUIRED >
+	<!--@MATCH:literal/baromtrc, blood-glucose, food, land-agricult, land-commercl, land-residntl, music-track, person, person-age, person-usage, rainfall, road, road-travel, snowfall, tv-program, vehicle, vehicle-fuel, visiblty, weather, wind-->
 <!ATTLIST unitPreferences scope (small) #IMPLIED >
 
 <!ELEMENT unitPreference ( #PCDATA ) >
 <!ATTLIST unitPreference regions NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/region-->
 <!ATTLIST unitPreference draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST unitPreference references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST unitPreference alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/informal, variant-->
 
 <!ELEMENT timezoneData ( mapTimezones*, zoneFormatting* ) >
     <!--@DEPRECATED-->
 
 <!ELEMENT mapTimezones ( mapZone* ) >
 <!ATTLIST mapTimezones type NMTOKEN #IMPLIED >
+	<!--@MATCH:literal/metazones-->
 <!ATTLIST mapTimezones otherVersion CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@METADATA-->
 <!ATTLIST mapTimezones typeVersion CDATA #IMPLIED >
+	<!--@MATCH:regex/[0-9]{4}[a-z]+-->
     <!--@METADATA-->
 <!ATTLIST mapTimezones references CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@METADATA-->
 
 <!ELEMENT mapZone EMPTY >
 <!ATTLIST mapZone type CDATA #REQUIRED >
+	<!--@MATCH:set/bcp47/tz-->
     <!--@VALUE-->
 <!ATTLIST mapZone other CDATA #REQUIRED >
+	<!--@MATCH:any-->
 <!ATTLIST mapZone territory CDATA #IMPLIED >
+	<!--@MATCH:validity/region-->
 <!ATTLIST mapZone references CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@METADATA-->
 
 <!ELEMENT zoneFormatting ( zoneItem* ) >
@@ -383,6 +455,7 @@
 
 <!ELEMENT character ( substitute* ) >
 <!ATTLIST character value CDATA #REQUIRED >
+	<!--@MATCH:any-->
 <!ATTLIST character draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -392,6 +465,7 @@
 <!ATTLIST character references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST character alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT substitute ( #PCDATA ) >
     <!--@ORDERED-->
@@ -404,17 +478,23 @@
 <!ATTLIST substitute references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST substitute alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT transforms ( transform* ) >
 
 <!ELEMENT transform ( ( comment | tRule )* ) >
 <!ATTLIST transform source CDATA #IMPLIED >
+	<!--@MATCH:any/TODO-->
 <!ATTLIST transform target CDATA #IMPLIED >
+	<!--@MATCH:any/TODO-->
 <!ATTLIST transform variant CDATA #IMPLIED >
+	<!--@MATCH:any/TODO-->
 <!ATTLIST transform direction (forward | backward | both) "both" >
 <!ATTLIST transform alias CDATA #IMPLIED >
+	<!--@MATCH:any/TODO-->
     <!--@VALUE-->
 <!ATTLIST transform backwardAlias CDATA #IMPLIED >
+	<!--@MATCH:any/TODO-->
     <!--@VALUE-->
 <!ATTLIST transform visibility (internal | external) "external" >
     <!--@VALUE-->
@@ -423,6 +503,7 @@
 <!ATTLIST transform references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST transform alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT comment ( #PCDATA ) >
     <!--@ORDERED-->
@@ -463,10 +544,13 @@
 <!ELEMENT attributes EMPTY >
     <!--@ORDERED-->
 <!ATTLIST attributes element NMTOKENS #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST attributes attribute NMTOKENS #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST attributes attributeValue CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST attributes draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -481,8 +565,10 @@
 <!ELEMENT variable ( #PCDATA ) >
     <!--@ORDERED-->
 <!ATTLIST variable type NMTOKEN #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST variable id CDATA #REQUIRED >
+	<!--@MATCH:any-->
 <!ATTLIST variable draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -490,12 +576,17 @@
 <!ELEMENT attributeValues ( #PCDATA ) >
     <!--@ORDERED-->
 <!ATTLIST attributeValues dtds NMTOKEN #IMPLIED >
+	<!--@MATCH:any-->
 <!ATTLIST attributeValues type NMTOKEN #IMPLIED >
+	<!--@MATCH:any-->
 <!ATTLIST attributeValues elements NMTOKENS #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST attributeValues attributes NMTOKENS #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST attributeValues order NMTOKEN #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST attributeValues draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -508,42 +599,54 @@
 
 <!ELEMENT languageAlias EMPTY >
 <!ATTLIST languageAlias type NMTOKEN #REQUIRED >
+	<!--@MATCH:or/validity/locale||literal/aa_SAAHO, aar, abk, afr, aka, alb, amh, ara, arg, arm, art_lojban, asm, ava, ave, aym, aze, bak, bam, baq, bel, ben, bih, bis, bod, bos, bre, bul, bur, cat, ces, cha, che, chi, chu, chv, cor, cos, cre, cym, cze, dan, deu, div, dut, dzo, ell, eng, epo, est, eus, ewe, fao, fas, fij, fin, fra, fre, fry, ful, geo, ger, gla, gle, glg, glv, gre, grn, guj, hat, hau, hbs, heb, her, hin, hmo, hrv, hun, hye, i_ami, i_bnn, i_hak, i_klingon, i_lux, i_navajo, i_pwn, i_tao, i_tay, i_tsu, ibo, ice, ido, iii, iku, ile, ina, ind, ipk, isl, ita, jav, jpn, kal, kan, kas, kat, kau, kaz, khm, kik, kin, kir, kom, kon, kor, kua, kur, lao, lat, lav, lim, lin, lit, ltz, lub, lug, mac, mah, mal, mao, mar, may, mkd, mlg, mlt, mol, mon, mri, msa, mya, nau, nav, nbl, nde, ndo, nep, nld, nno, no_BOKMAL, no_NYNORSK, no_bok, no_nyn, nob, nor, nya, oci, oji, ori, orm, oss, pan, per, pli, pol, por, pus, que, roh, ron, rum, run, rus, sag, san, scc, scr, sgn_BE_FR, sgn_BE_NL, sgn_CH_DE, sin, slk, slo, slv, sme, smo, sna, snd, som, sot, spa, sqi, srd, srp, ssw, sun, swa, swe, tah, tam, tat, tel, tgk, tgl, tha, tib, tir, ton, tsn, tso, tuk, tur, twi, uig, ukr, urd, uzb, ven, vie, vol, wel, wln, wol, xho, yid, yor, zh_guoyu, zh_hakka, zh_min_nan, zh_xiang, zha, zho, zul-->
 <!ATTLIST languageAlias replacement NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/locale-->
     <!--@VALUE-->
 <!ATTLIST languageAlias reason (deprecated | overlong | macrolanguage | legacy | bibliographic) #IMPLIED >
     <!--@VALUE-->
 
 <!ELEMENT scriptAlias EMPTY >
 <!ATTLIST scriptAlias type NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/script-->
 <!ATTLIST scriptAlias replacement NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/script-->
     <!--@VALUE-->
 <!ATTLIST scriptAlias reason (deprecated | overlong) #IMPLIED >
     <!--@VALUE-->
 
 <!ELEMENT territoryAlias EMPTY >
 <!ATTLIST territoryAlias type NMTOKEN #REQUIRED >
+	<!--@MATCH:set/or/validity/region||regex/[0-9]{3}|[A-Z]{3}||literal/CT, DY, FQ, HV, JT, MI, NH, NQ, PC, PU, PZ, RH, UK, VD, WK-->
 <!ATTLIST territoryAlias replacement NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/region-->
     <!--@VALUE-->
 <!ATTLIST territoryAlias reason (deprecated | overlong) #IMPLIED >
     <!--@VALUE-->
 
 <!ELEMENT subdivisionAlias EMPTY >
 <!ATTLIST subdivisionAlias type NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/subdivision-->
 <!ATTLIST subdivisionAlias replacement NMTOKENS #REQUIRED >
+	<!--@MATCH:set/or/validity/region||validity/subdivision-->
     <!--@VALUE-->
 <!ATTLIST subdivisionAlias reason (deprecated | overlong) #IMPLIED >
     <!--@VALUE-->
 
 <!ELEMENT variantAlias EMPTY >
 <!ATTLIST variantAlias type NMTOKEN #REQUIRED >
+	<!--@MATCH:or/validity/variant||literal/AALAND, POLYTONI-->
 <!ATTLIST variantAlias replacement NMTOKEN #REQUIRED >
+	<!--@MATCH:or/validity/variant||validity/region-->
     <!--@VALUE-->
 <!ATTLIST variantAlias reason (deprecated | overlong) #IMPLIED >
     <!--@VALUE-->
 
 <!ELEMENT zoneAlias EMPTY >
 <!ATTLIST zoneAlias type CDATA #REQUIRED >
+	<!--@MATCH:or/bcp47/tz||literal/SystemV/AST4, SystemV/AST4ADT, SystemV/CST6, SystemV/CST6CDT, SystemV/EST5, SystemV/EST5EDT, SystemV/HST10, SystemV/MST7, SystemV/MST7MDT, SystemV/PST8, SystemV/PST8PDT, SystemV/YST9, SystemV/YST9YDT-->
 <!ATTLIST zoneAlias replacement CDATA #REQUIRED >
+	<!--@MATCH:bcp47/tz-->
     <!--@VALUE-->
 <!ATTLIST zoneAlias reason (deprecated | overlong) #IMPLIED >
     <!--@VALUE-->
@@ -675,6 +778,7 @@
 
 <!ELEMENT defaultContent EMPTY >
 <!ATTLIST defaultContent locales NMTOKENS #IMPLIED >
+	<!--@MATCH:set/validity/locale-->
     <!--@VALUE-->
 
 <!ELEMENT codeMappings ( languageCodes*, territoryCodes*, currencyCodes* ) >
@@ -689,18 +793,25 @@
 
 <!ELEMENT territoryCodes EMPTY >
 <!ATTLIST territoryCodes type NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/region-->
 <!ATTLIST territoryCodes numeric NMTOKEN #IMPLIED >
+	<!--@MATCH:range/1~999-->
     <!--@VALUE-->
 <!ATTLIST territoryCodes alpha3 NMTOKEN #IMPLIED >
+	<!--@MATCH:regex/[A-Z]{3}-->
     <!--@VALUE-->
 <!ATTLIST territoryCodes fips10 NMTOKEN #IMPLIED >
+	<!--@MATCH:regex/[A-Z]{2}-->
     <!--@VALUE-->
 <!ATTLIST territoryCodes internet NMTOKENS #IMPLIED >
     <!--@VALUE-->
+    <!--@DEPRECATED-->
 
 <!ELEMENT currencyCodes EMPTY >
 <!ATTLIST currencyCodes type NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/currency-->
 <!ATTLIST currencyCodes numeric NMTOKEN #REQUIRED >
+	<!--@MATCH:range/1~999-->
     <!--@VALUE-->
 
 <!-- # Parent locales -->
@@ -709,25 +820,32 @@
 
 <!ELEMENT parentLocale EMPTY >
 <!ATTLIST parentLocale parent NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/locale-->
 <!ATTLIST parentLocale locales NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/locale-->
     <!--@VALUE-->
 
 <!ELEMENT likelySubtags ( likelySubtag* ) >
 
 <!ELEMENT likelySubtag EMPTY >
 <!ATTLIST likelySubtag from NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/locale-->
 <!ATTLIST likelySubtag to NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/locale-->
     <!--@VALUE-->
 
 <!ELEMENT metazoneInfo ( timezone* ) >
 
 <!ELEMENT timezone ( usesMetazone* ) >
 <!ATTLIST timezone type CDATA #REQUIRED >
-
+	<!--@MATCH:bcp47/tz-->
 <!ELEMENT usesMetazone EMPTY >
 <!ATTLIST usesMetazone from CDATA #IMPLIED >
+	<!--@MATCH:time/yyyy-MM-dd HH:mm-->
 <!ATTLIST usesMetazone to CDATA #IMPLIED >
+	<!--@MATCH:time/yyyy-MM-dd HH:mm-->
 <!ATTLIST usesMetazone mzone NMTOKEN #REQUIRED >
+	<!--@MATCH:metazone-->
     <!--@VALUE-->
 
 <!ELEMENT plurals ( pluralRules*, pluralRanges* ) >
@@ -741,6 +859,7 @@
 
 <!ELEMENT pluralRules ( pluralRule* ) >
 <!ATTLIST pluralRules locales NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/locale-->
 <!ATTLIST pluralRules draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -758,6 +877,7 @@
 
 <!ELEMENT pluralRanges ( pluralRange* ) >
 <!ATTLIST pluralRanges locales NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/locale-->
 <!ATTLIST pluralRanges draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -778,27 +898,38 @@
     <!--@METADATA-->
 
 <!ELEMENT telephoneCodeData ( codesByTerritory* ) >
+    <!--@DEPRECATED-->
 
 <!ELEMENT codesByTerritory ( telephoneCountryCode+ ) >
+    <!--@DEPRECATED-->
 <!ATTLIST codesByTerritory territory NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
 <!ATTLIST codesByTerritory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST codesByTerritory references CDATA #IMPLIED >
     <!--@METADATA-->
+    <!--@DEPRECATED-->
 
 <!ELEMENT telephoneCountryCode EMPTY >
+    <!--@DEPRECATED-->
 <!ATTLIST telephoneCountryCode code NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
 <!ATTLIST telephoneCountryCode from NMTOKEN #IMPLIED >
     <!--@VALUE-->
+    <!--@DEPRECATED-->
 <!ATTLIST telephoneCountryCode to NMTOKEN #IMPLIED >
     <!--@VALUE-->
+    <!--@DEPRECATED-->
 <!ATTLIST telephoneCountryCode draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
-    <!--@DEPRECATED:true, false-->
+    <!--@DEPRECATED-->
 <!ATTLIST telephoneCountryCode references CDATA #IMPLIED >
     <!--@METADATA-->
+    <!--@DEPRECATED-->
 <!ATTLIST telephoneCountryCode alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+    <!--@DEPRECATED-->
 
 <!ELEMENT numberingSystems ( numberingSystem* ) >
 
@@ -806,11 +937,14 @@
 <!ATTLIST numberingSystem type (numeric | algorithmic) #REQUIRED >
     <!--@VALUE-->
 <!ATTLIST numberingSystem id NMTOKEN #REQUIRED >
+	<!--@MATCH:bcp47/nu-->
 <!ATTLIST numberingSystem radix NMTOKEN #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST numberingSystem digits CDATA #IMPLIED >
+	<!--@MATCH:unicodeset/[\p{Nd}[\u3007\u4E00\u4E03\u4E09\u4E5D\u4E8C\u4E94\u516B\u516D\u56DB][\U0001E140-\U0001E149][\U0001E2F0-\U0001E2F9]]-->
     <!--@VALUE-->
 <!ATTLIST numberingSystem rules CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST numberingSystem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -849,6 +983,7 @@
 <!ELEMENT personList EMPTY >
 <!ATTLIST personList type (neutral | mixedNeutral | maleTaints) #REQUIRED >
 <!ATTLIST personList locales NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/locale-->
     <!--@VALUE-->
 
 <!ELEMENT references ( reference* ) >
@@ -857,7 +992,9 @@
 <!ELEMENT reference ( #PCDATA ) >
     <!--@METADATA-->
 <!ATTLIST reference type NMTOKEN #REQUIRED >
+	<!--@MATCH:any-->
 <!ATTLIST reference uri CDATA #IMPLIED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST reference draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -866,28 +1003,37 @@
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST reference alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
 
 <!ELEMENT languageMatching ( languageMatches* ) >
 
 <!ELEMENT languageMatches ( paradigmLocales*, matchVariable*, languageMatch* ) >
 <!ATTLIST languageMatches type NMTOKEN #REQUIRED >
+	<!--@MATCH:literal/written, written_new-->
 
 <!ELEMENT paradigmLocales EMPTY >
 <!ATTLIST paradigmLocales locales NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/locale-->
     <!--@VALUE-->
 
 <!ELEMENT matchVariable EMPTY >
 <!ATTLIST matchVariable id CDATA #REQUIRED >
+	<!--@MATCH:regex/\$[a-zA-Z0-9_]+-->
 <!ATTLIST matchVariable value CDATA #REQUIRED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 
 <!ELEMENT languageMatch EMPTY >
     <!--@ORDERED-->
 <!ATTLIST languageMatch desired CDATA #REQUIRED >
+	<!--@MATCH:any/TODO-->
 <!ATTLIST languageMatch supported CDATA #REQUIRED >
+	<!--@MATCH:any/TODO-->
 <!ATTLIST languageMatch percent NMTOKEN #IMPLIED >
+	<!--@MATCH:range/0~100-->
     <!--@VALUE-->
 <!ATTLIST languageMatch distance NMTOKEN #IMPLIED >
+	<!--@MATCH:range/0~100-->
     <!--@VALUE-->
 <!ATTLIST languageMatch oneway (true | false) #IMPLIED >
     <!--@VALUE-->
@@ -896,6 +1042,7 @@
 
 <!ELEMENT dayPeriodRuleSet ( dayPeriodRules* ) >
 <!ATTLIST dayPeriodRuleSet type NMTOKEN #IMPLIED >
+	<!--@MATCH:literal/selection-->
 <!ATTLIST dayPeriodRuleSet draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -904,6 +1051,7 @@
 
 <!ELEMENT dayPeriodRules ( dayPeriodRule* ) >
 <!ATTLIST dayPeriodRules locales NMTOKENS #REQUIRED >
+	<!--@MATCH:set/validity/locale-->
 <!ATTLIST dayPeriodRules draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -912,16 +1060,22 @@
 
 <!ELEMENT dayPeriodRule EMPTY >
 <!ATTLIST dayPeriodRule type NMTOKEN #REQUIRED >
+	<!--@MATCH:literal/afternoon1, afternoon2, am, evening1, evening2, midnight, morning1, morning2, night1, night2, noon, pm-->
 <!ATTLIST dayPeriodRule at NMTOKEN #IMPLIED >
+	<!--@MATCH:time/HH:mm-->
     <!--@VALUE-->
 <!ATTLIST dayPeriodRule after NMTOKEN #IMPLIED >
+	<!--@MATCH:time/HH:mm-->
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST dayPeriodRule before NMTOKEN #IMPLIED >
+	<!--@MATCH:time/HH:mm-->
     <!--@VALUE-->
 <!ATTLIST dayPeriodRule from NMTOKEN #IMPLIED >
+	<!--@MATCH:time/HH:mm-->
     <!--@VALUE-->
 <!ATTLIST dayPeriodRule to NMTOKEN #IMPLIED >
+	<!--@MATCH:time/HH:mm-->
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST dayPeriodRule draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
@@ -935,6 +1089,7 @@
 
 <!ELEMENT primaryZone ( #PCDATA ) >
 <!ATTLIST primaryZone iso3166 NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/region-->
 
 <!-- # Time Zones -->
 
@@ -949,35 +1104,48 @@
 
 <!ELEMENT approvalRequirement EMPTY >
 <!ATTLIST approvalRequirement votes CDATA #REQUIRED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST approvalRequirement locales CDATA #REQUIRED >
+	<!--@MATCH:any-->
 <!ATTLIST approvalRequirement paths CDATA #REQUIRED >
+	<!--@MATCH:any-->
 
 <!ELEMENT coverageVariable EMPTY >
     <!--@ORDERED-->
 <!ATTLIST coverageVariable key CDATA #REQUIRED >
+	<!--@MATCH:any-->
 <!ATTLIST coverageVariable value CDATA #REQUIRED >
+	<!--@MATCH:any-->
     <!--@VALUE-->
 
 <!ELEMENT coverageLevel EMPTY >
     <!--@ORDERED-->
 <!ATTLIST coverageLevel inLanguage CDATA #IMPLIED >
+	<!--@MATCH:any-->
 <!ATTLIST coverageLevel inScript CDATA #IMPLIED >
+	<!--@MATCH:validity/script-->
 <!ATTLIST coverageLevel inTerritory CDATA #IMPLIED >
+	<!--@MATCH:any-->
 <!ATTLIST coverageLevel value CDATA #REQUIRED >
+	<!--@MATCH:literal/basic, core, minimal, moderate, modern, posix-->
     <!--@VALUE-->
 <!ATTLIST coverageLevel match CDATA #REQUIRED >
+	<!--@MATCH:any-->
 
 <!ELEMENT idValidity ( id* ) >
 
 <!ELEMENT id ( #PCDATA ) >
 <!ATTLIST id type NMTOKEN #REQUIRED >
+	<!--@MATCH:literal/currency, language, region, script, subdivision, unit, variant-->
 <!ATTLIST id idStatus NMTOKEN #REQUIRED >
+	<!--@MATCH:literal/deprecated, macroregion, private_use, regular, reserved, special, unknown-->
 
 <!ELEMENT rgScope ( rgPath* ) >
 
 <!ELEMENT rgPath EMPTY >
 <!ATTLIST rgPath path CDATA #REQUIRED >
+	<!--@MATCH:any-->
 <!ATTLIST rgPath draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
@@ -985,3 +1153,4 @@
 
 <!ELEMENT languageGroup ( #PCDATA ) >
 <!ATTLIST languageGroup parent NMTOKEN #REQUIRED >
+	<!--@MATCH:validity/language-->
--- a/make/data/cldr/common/main/af.xml	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/main/af.xml	Wed May 08 12:45:02 2019 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2018 Unicode, Inc.
+<!-- Copyright © 1991-2019 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/)
@@ -9,7 +9,7 @@
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 13911 $"/>
+		<version number="$Revision: 14817 $"/>
 		<language type="af"/>
 	</identity>
 	<localeDisplayNames>
@@ -93,7 +93,7 @@
 			<language type="de_CH">Switserse hoog-Duits</language>
 			<language type="dgr">Dogrib</language>
 			<language type="dje">Zarma</language>
-			<language type="dsb">Lae Sorbies</language>
+			<language type="dsb">Benedesorbies</language>
 			<language type="dua">Duala</language>
 			<language type="dv">Divehi</language>
 			<language type="dyo">Jola-Fonyi</language>
@@ -144,7 +144,7 @@
 			<language type="gwi">Gwichʼin</language>
 			<language type="ha">Hausa</language>
 			<language type="hak">Hakka-Sjinees</language>
-			<language type="haw">Hawaiies</language>
+			<language type="haw">Hawais</language>
 			<language type="he">Hebreeus</language>
 			<language type="hi">Hindi</language>
 			<language type="hil">Hiligaynon</language>
@@ -261,7 +261,7 @@
 			<language type="ms">Maleis</language>
 			<language type="mt">Maltees</language>
 			<language type="mua">Mundang</language>
-			<language type="mul">Veelvuldige tale</language>
+			<language type="mul">Verskeie tale</language>
 			<language type="mus">Kreek</language>
 			<language type="mwl">Mirandees</language>
 			<language type="my">Birmaans</language>
@@ -271,7 +271,7 @@
 			<language type="nan">Min Nan-Sjinees</language>
 			<language type="nap">Neapolitaans</language>
 			<language type="naq">Nama</language>
-			<language type="nb">Noorse Bokmål</language>
+			<language type="nb">Boeknoors</language>
 			<language type="nd">Noord-Ndebele</language>
 			<language type="nds">Lae Duits</language>
 			<language type="nds_NL">Nedersaksies</language>
@@ -283,7 +283,7 @@
 			<language type="nl">Nederlands</language>
 			<language type="nl_BE">Vlaams</language>
 			<language type="nmg">Kwasio</language>
-			<language type="nn">Noorweegse Nynorsk</language>
+			<language type="nn">Nuwe Noors</language>
 			<language type="nnh">Ngiemboon</language>
 			<language type="no">Noors</language>
 			<language type="nog">Nogai</language>
@@ -317,7 +317,6 @@
 			<language type="rm">Reto-Romaans</language>
 			<language type="rn">Rundi</language>
 			<language type="ro">Roemeens</language>
-			<language type="ro_MD">Moldawies</language>
 			<language type="rof">Rombo</language>
 			<language type="root">Root</language>
 			<language type="ru">Russies</language>
@@ -364,7 +363,6 @@
 			<language type="suk">Sukuma</language>
 			<language type="sv">Sweeds</language>
 			<language type="sw">Swahili</language>
-			<language type="sw_CD">Swahili (Kongo)</language>
 			<language type="swb">Comoraans</language>
 			<language type="syr">Siries</language>
 			<language type="ta">Tamil</language>
@@ -372,7 +370,7 @@
 			<language type="tem">Timne</language>
 			<language type="teo">Teso</language>
 			<language type="tet">Tetoem</language>
-			<language type="tg">Tadzjieks</language>
+			<language type="tg">Tadjiks</language>
 			<language type="th">Thai</language>
 			<language type="ti">Tigrinya</language>
 			<language type="tig">Tigre</language>
@@ -498,7 +496,7 @@
 			<territory type="018">Suider-Afrika</territory>
 			<territory type="019">Amerikas</territory>
 			<territory type="021">Noordelike Amerika</territory>
-			<territory type="029">Karibies</territory>
+			<territory type="029">Karibiese streek</territory>
 			<territory type="030">Oos-Asië</territory>
 			<territory type="034">Suid-Asië</territory>
 			<territory type="035">Suidoos-Asië</territory>
@@ -719,7 +717,7 @@
 			<territory type="PW">Palau</territory>
 			<territory type="PY">Paraguay</territory>
 			<territory type="QA">Katar</territory>
-			<territory type="QO">Omliggende Oseanië</territory>
+			<territory type="QO">Afgeleë Oseanië</territory>
 			<territory type="RE">Réunion</territory>
 			<territory type="RO">Roemenië</territory>
 			<territory type="RS">Serwië</territory>
@@ -803,14 +801,14 @@
 			<key type="colBackwards">Omgekeerde aksentsortering</key>
 			<key type="colCaseFirst">Hoofletters/kleinletters-sortering</key>
 			<key type="colCaseLevel">Kassensitiewe sortering</key>
-			<key type="collation">Sorteervolgorde</key>
+			<key type="collation">Rangskikvolgorde</key>
 			<key type="colNormalization">Genormaliseerde sortering</key>
 			<key type="colNumeric">Numeriese sortering</key>
 			<key type="colStrength">Sorteringssterkte</key>
 			<key type="currency">Geldeenheid</key>
 			<key type="hc">Uursiklus (12 vs 24)</key>
-			<key type="lb">Reëlbreek-styl</key>
-			<key type="ms">Meetstelsel</key>
+			<key type="lb">Reëlafbreek-styl</key>
+			<key type="ms">Maatstelsel</key>
 			<key type="numbers">Syfers</key>
 			<key type="timezone">Tydsone</key>
 			<key type="va">Lokaalvariant</key>
@@ -821,9 +819,9 @@
 			<type key="calendar" type="chinese">Sjinese kalender</type>
 			<type key="calendar" type="coptic">Koptiese kalender</type>
 			<type key="calendar" type="dangi">Dangi-kalender</type>
-			<type key="calendar" type="ethiopic">Ethiopiese kalender</type>
+			<type key="calendar" type="ethiopic">Etiopiese kalender</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etiopiese Amete Alem-kalender</type>
-			<type key="calendar" type="gregorian">Gregoriese kalender</type>
+			<type key="calendar" type="gregorian">Gregoriaanse kalender</type>
 			<type key="calendar" type="hebrew">Hebreeuse kalender</type>
 			<type key="calendar" type="indian">Indiese nasionale kalender</type>
 			<type key="calendar" type="islamic">Islamitiese kalender</type>
@@ -833,7 +831,7 @@
 			<type key="calendar" type="persian">Persiese kalender</type>
 			<type key="calendar" type="roc">Minguo-kalender</type>
 			<type key="cf" type="account">Rekeningkundige geldeenheidformaat</type>
-			<type key="cf" type="standard">Standaard Geldeenheidformaat</type>
+			<type key="cf" type="standard">Standaard geldeenheidformaat</type>
 			<type key="colAlternate" type="non-ignorable">Sorteer simbole</type>
 			<type key="colAlternate" type="shifted">Sorteer ignoreersimbole</type>
 			<type key="colBackwards" type="no">Sorteer aksente gewoonweg</type>
@@ -845,7 +843,7 @@
 			<type key="colCaseLevel" type="yes">Sorteer kassensitief</type>
 			<type key="collation" type="big5han">Tradisionele Chinese sorteervolgorde - Groot5</type>
 			<type key="collation" type="dictionary">Woordeboek-sorteervolgorde</type>
-			<type key="collation" type="ducet">Verstek Unicode-sorteervolgorde</type>
+			<type key="collation" type="ducet">Verstek Unicode-rangskikvolgorde</type>
 			<type key="collation" type="gb2312han">Vereenvoudigde Chinese sorteervolgorde - GB2312</type>
 			<type key="collation" type="phonebook">Foonboek-sorteervolgorde</type>
 			<type key="collation" type="phonetic">Fonetiese sorteerorde</type>
@@ -853,7 +851,7 @@
 			<type key="collation" type="reformed">Gereformeerde sorteervolgorde</type>
 			<type key="collation" type="search">Algemenedoel-soektog</type>
 			<type key="collation" type="searchjl">Soek volgens Hangul-beginkonsonant</type>
-			<type key="collation" type="standard">Standaard sorteervolgorde</type>
+			<type key="collation" type="standard">Standaard rangskikvolgorde</type>
 			<type key="collation" type="stroke">Slag-sorteervolgorde</type>
 			<type key="collation" type="traditional">Tradisionele sorteervolgorde</type>
 			<type key="collation" type="unihan">Radikale-slag-sorteervolgorde</type>
@@ -867,27 +865,27 @@
 			<type key="colStrength" type="secondary">Sorteer aksente</type>
 			<type key="colStrength" type="tertiary">Sorteer aksente/kas/breedte</type>
 			<type key="d0" type="fwidth">Vollewydte</type>
-			<type key="d0" type="hwidth">halfwydte</type>
+			<type key="d0" type="hwidth">Halfwydte</type>
 			<type key="d0" type="npinyin">Numeries</type>
 			<type key="hc" type="h11">12-uur-stelsel (0-11)</type>
 			<type key="hc" type="h12">12-uur-stelsel (1-12)</type>
 			<type key="hc" type="h23">24-uur-stelsel (0-23)</type>
 			<type key="hc" type="h24">24-uur-stelsel (1-24)</type>
-			<type key="lb" type="loose">Los reëlbreek-styl</type>
-			<type key="lb" type="normal">Normale reëlbreek-styl</type>
-			<type key="lb" type="strict">Streng reëlbreek-styl</type>
-			<type key="m0" type="bgn">BGN</type>
-			<type key="m0" type="ungegn">UNGEGN</type>
+			<type key="lb" type="loose">Losse reëlafbreek-styl</type>
+			<type key="lb" type="normal">Normale reëlafbreek-styl</type>
+			<type key="lb" type="strict">Streng reëlafbreek-styl</type>
+			<type key="m0" type="bgn">BGN-transliterasie</type>
+			<type key="m0" type="ungegn">UNGEGN-transliterasie</type>
 			<type key="ms" type="metric">Metrieke stelsel</type>
-			<type key="ms" type="uksystem">Imperiale meetstelsel</type>
-			<type key="ms" type="ussystem">VS-meetstelsel</type>
+			<type key="ms" type="uksystem">Imperiale maatstelsel</type>
+			<type key="ms" type="ussystem">VSA-maatstelsel</type>
 			<type key="numbers" type="arab">Arabies-Indiese syfers</type>
 			<type key="numbers" type="arabext">Uitgebreide Arabies-Indiese syfers</type>
 			<type key="numbers" type="armn">Armeense syfers</type>
 			<type key="numbers" type="armnlow">Armeense kleinletter-syfers</type>
 			<type key="numbers" type="beng">Bengaalse syfers</type>
 			<type key="numbers" type="deva">Devanagari-syfers</type>
-			<type key="numbers" type="ethi">Ethiopiese syfers</type>
+			<type key="numbers" type="ethi">Etiopiese syfers</type>
 			<type key="numbers" type="finance">Finansiële syfers</type>
 			<type key="numbers" type="fullwide">Vollewydte-syfers</type>
 			<type key="numbers" type="geor">Georgiese syfers</type>
@@ -923,7 +921,7 @@
 			<type key="numbers" type="vaii">Vai-syfers</type>
 		</types>
 		<measurementSystemNames>
-			<measurementSystemName type="metric">Metriek</measurementSystemName>
+			<measurementSystemName type="metric">Metrieke stelsel</measurementSystemName>
 			<measurementSystemName type="UK">VK</measurementSystemName>
 			<measurementSystemName type="US">VSA</measurementSystemName>
 		</measurementSystemNames>
@@ -1024,30 +1022,77 @@
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E M/d</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMd">d/M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, 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="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>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">h B – h B</greatestDifference>
+							<greatestDifference id="h">h–h B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm B</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">y-M GGGGG – y-M GGGGG</greatestDifference>
+							<greatestDifference id="M">y-M – y-M GGGGG</greatestDifference>
+							<greatestDifference id="y">y-M – y-M GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">d-M-y – d-M-y GGGGG</greatestDifference>
+							<greatestDifference id="G">d-M-y GGGGG – d-M-y GGGGG</greatestDifference>
+							<greatestDifference id="M">d-M-y – d-M-y GGGGG</greatestDifference>
+							<greatestDifference id="y">d-M-y – d-M-y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E d-M-y – E d-M-y GGGGG</greatestDifference>
+							<greatestDifference id="G">E d-M-y GGGGG – E d-M-y GGGGG</greatestDifference>
+							<greatestDifference id="M">E d-M-y – E d-M-y GGGGG</greatestDifference>
+							<greatestDifference id="y">E d-M-y – E d-M-y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="G">E d MMM y G – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h–h a</greatestDifference>
@@ -1434,7 +1479,7 @@
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, dd MMMM y</pattern>
+							<pattern>EEEE dd MMMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -1498,12 +1543,12 @@
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h B</dateFormatItem>
-						<dateFormatItem id="Bhm" draft="provisional">h:mm B</dateFormatItem>
-						<dateFormatItem id="Bhms" draft="provisional">h:mm:ss 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" draft="provisional">E h:mm B</dateFormatItem>
-						<dateFormatItem id="EBhms" draft="provisional">E h:mm:ss B</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 hh:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
@@ -1512,7 +1557,7 @@
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">dd MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, dd MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E dd MMM y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
@@ -1525,14 +1570,14 @@
 						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">dd-MM</dateFormatItem>
-						<dateFormatItem id="MEd">E, 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 MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="one">'week' W 'van' MMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other">'week' W 'van' MMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">'week' W 'van' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">'week' W 'van' MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">MM-y</dateFormatItem>
@@ -1540,7 +1585,7 @@
 						<dateFormatItem id="yMEd">E y-MM-dd</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, 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>
@@ -1552,9 +1597,56 @@
 					</appendItems>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">h B – h B</greatestDifference>
+							<greatestDifference id="h">h–h B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">hh:mm B – hh:mm B</greatestDifference>
+							<greatestDifference id="h">hh:mm B – hh:mm B</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">y-M GGGGG – y-M GGGGG</greatestDifference>
+							<greatestDifference id="M">y-M – y-M GGGGG</greatestDifference>
+							<greatestDifference id="y">y-M – y-M GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">y-M-d – y-M-d GGGGG</greatestDifference>
+							<greatestDifference id="G">y-M-d GGGGG – y-M-d GGGGG</greatestDifference>
+							<greatestDifference id="M">y-M-d – y-M-d GGGGG</greatestDifference>
+							<greatestDifference id="y">y-M-d – y-M-d GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E y-M-d – E y-M-d GGGGG</greatestDifference>
+							<greatestDifference id="G">E y-M-d GGGGG – E y-M-d GGGGG</greatestDifference>
+							<greatestDifference id="M">E y-M-d – E y-M-d GGGGG</greatestDifference>
+							<greatestDifference id="y">E y-M-d – E y-M-d GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="G">E d MMM y G – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
@@ -1595,8 +1687,8 @@
 							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
+							<greatestDifference id="M">E d/M – E d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
@@ -1606,8 +1698,8 @@
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="d">E d MMM – E d MMM</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
@@ -1622,9 +1714,9 @@
 							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
-							<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
-							<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="d">E d/M/y – E d/M/y</greatestDifference>
+							<greatestDifference id="M">E d/M/y – E d/M/y</greatestDifference>
+							<greatestDifference id="y">E d/M/y – E d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y</greatestDifference>
@@ -1636,9 +1728,9 @@
 							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<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>
+							<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">MMMM – MMMM y</greatestDifference>
@@ -1675,28 +1767,28 @@
 			<field type="year-short">
 				<displayName>j.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} jaar</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} j.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} j.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} jaar gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} jaar gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} j. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} j. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
 				<displayName>j.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} jaar</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} j.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} j.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} jaar gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} jaar gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} j. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} j. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>kwartaal</displayName>
-				<relative type="-1">vorige kwartaal</relative>
+				<relative type="-1">verlede kwartaal</relative>
 				<relative type="0">hierdie kwartaal</relative>
 				<relative type="1">volgende kwartaal</relative>
 				<relativeTime type="future">
@@ -1711,23 +1803,23 @@
 			<field type="quarter-short">
 				<displayName>kw.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} kwartaal</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} kwartale</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} kw.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} kw.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} kwartaal gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} kwartale gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} kw. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kw. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
 				<displayName>kw.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} kwartale</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} kwartale</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} kw.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} kw.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} kwartale gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} kwartale gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} kw. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kw. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -1736,8 +1828,8 @@
 				<relative type="0">vandeesmaand</relative>
 				<relative type="1">volgende maand</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} minuut</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} minuut</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} maand</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} maande</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} maand gelede</relativeTimePattern>
@@ -1769,7 +1861,7 @@
 			<field type="week">
 				<displayName>week</displayName>
 				<relative type="-1">verlede week</relative>
-				<relative type="0">vandeesweek</relative>
+				<relative type="0">hierdie week</relative>
 				<relative type="1">volgende week</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">oor {0} week</relativeTimePattern>
@@ -1903,25 +1995,25 @@
 				</relativeTime>
 			</field>
 			<field type="sun-short">
-				<relative type="-1">verlede Son.</relative>
-				<relative type="0">hierdie Son.</relative>
-				<relative type="1">volgende Son.</relative>
+				<relative type="-1">verlede So.</relative>
+				<relative type="0">hierdie So.</relative>
+				<relative type="1">volgende So.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Sondae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Sondae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} So.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} So.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} Sondae gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} Sondae gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} So. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} So. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sun-narrow">
 				<relative type="-1">verlede Son.</relative>
-				<relative type="0">hierdie Son.</relative>
-				<relative type="1">volgende Son.</relative>
+				<relative type="0">dié So.</relative>
+				<relative type="1">vlg. So.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Sondae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Sondae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} So.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} So.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} Sondae gelede</relativeTimePattern>
@@ -1946,12 +2038,12 @@
 				<relative type="0">hierdie Ma.</relative>
 				<relative type="1">volgende Ma.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Maandae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Maandae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Ma.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Ma.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} Maandae gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} Maandae gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} Ma. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} Ma. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon-narrow">
@@ -1959,8 +2051,8 @@
 				<relative type="0">hierdie Ma.</relative>
 				<relative type="1">volgende Ma.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Maandae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Maandae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Ma.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Ma.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} Maandae gelede</relativeTimePattern>
@@ -1985,21 +2077,21 @@
 				<relative type="0">hierdie Di.</relative>
 				<relative type="1">volgende Di.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Dinsdae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Dinsdae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Di.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Di.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} Dinsdae gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} Dinsdae gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} Di. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} Di. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="tue-narrow">
 				<relative type="-1">verlede Di.</relative>
-				<relative type="0">hierdie Di.</relative>
+				<relative type="0">dié Di.</relative>
 				<relative type="1">volgende Di.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Dinsdae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Dinsdae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Di.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Di.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} Dinsdae gelede</relativeTimePattern>
@@ -2024,21 +2116,21 @@
 				<relative type="0">hierdie Wo.</relative>
 				<relative type="1">volgende Wo.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Woensdae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Woensdae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Wo.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Wo.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} Woensdae gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} Woensdae gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} Wo. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} Wo. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="wed-narrow">
 				<relative type="-1">verlede Wo.</relative>
-				<relative type="0">hierdie Wo.</relative>
-				<relative type="1">volgende Wo.</relative>
+				<relative type="0">dié Wo.</relative>
+				<relative type="1">vlg. Wo.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Woensdae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Woensdae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Wo.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Wo.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} Woensdae gelede</relativeTimePattern>
@@ -2063,21 +2155,21 @@
 				<relative type="0">hierdie Do.</relative>
 				<relative type="1">volgende Do.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Donderdae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Donderdae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Do.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Do.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} Donderdae gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} Donderdae gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} Do. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} Do. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="thu-narrow">
 				<relative type="-1">verlede Do.</relative>
-				<relative type="0">hierdie Do.</relative>
-				<relative type="1">volgende Do.</relative>
+				<relative type="0">dié Do.</relative>
+				<relative type="1">vlg. Do.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Donderdae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Donderdae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Do.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Do.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} Donderdae gelede</relativeTimePattern>
@@ -2102,12 +2194,12 @@
 				<relative type="0">dié Vr.</relative>
 				<relative type="1">vlg. Vr.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Vrydae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Vrydae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Vr.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Vr.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} Vrydae gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} Vrydae gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} Vr. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} Vr. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri-narrow">
@@ -2115,8 +2207,8 @@
 				<relative type="0">dié Vr.</relative>
 				<relative type="1">vlg. Vr.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Vrydae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Vrydae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Vr.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Vr.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} Vrydae gelede</relativeTimePattern>
@@ -2141,12 +2233,12 @@
 				<relative type="0">dié Sa.</relative>
 				<relative type="1">vlg. Sa.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Saterdae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Saterdae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Sa.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Sa.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} Saterdae gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} Saterdae gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} Sa. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} Sa. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat-narrow">
@@ -2154,8 +2246,8 @@
 				<relative type="0">dié Sa.</relative>
 				<relative type="1">vlg. Sa.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} Saterdae</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} Saterdae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} Sa.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} Sa.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} Saterdae gelede</relativeTimePattern>
@@ -2166,7 +2258,7 @@
 				<displayName>vm./nm.</displayName>
 			</field>
 			<field type="dayperiod">
-				<displayName>VM/NM</displayName>
+				<displayName>vm./nm.</displayName>
 			</field>
 			<field type="dayperiod-narrow">
 				<displayName>vm./nm.</displayName>
@@ -2186,23 +2278,23 @@
 			<field type="hour-short">
 				<displayName>u.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} uur</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} uur</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} u.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} u.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} uur gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} uur gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} u. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} u. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
 				<displayName>u.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} uur</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} uur</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} u.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} u.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} uur gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} uur gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} u. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} u. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
@@ -2210,7 +2302,7 @@
 				<relative type="0">hierdie minuut</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">oor {0} minuut</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} minuut</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} minute</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} minuut gelede</relativeTimePattern>
@@ -2252,25 +2344,25 @@
 				</relativeTime>
 			</field>
 			<field type="second-short">
-				<displayName>sek.</displayName>
+				<displayName>s.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} sek.</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} s.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} s.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} sek. gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} sek. gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} s. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} s. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
 				<displayName>s.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">oor {0} sek.</relativeTimePattern>
-					<relativeTimePattern count="other">oor {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} s.</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} s.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} sek. gelede</relativeTimePattern>
-					<relativeTimePattern count="other">{0} sek. gelede</relativeTimePattern>
+					<relativeTimePattern count="one">{0} s. gelede</relativeTimePattern>
+					<relativeTimePattern count="other">{0} s. gelede</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
@@ -3335,7 +3427,7 @@
 				<exemplarCity>Singapoer</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity>St. Helena</exemplarCity>
+				<exemplarCity>Sint Helena</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
 				<exemplarCity>Ljubljana</exemplarCity>
@@ -3563,7 +3655,7 @@
 				<exemplarCity>Efate</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity>Wallis</exemplarCity>
+				<exemplarCity>Mata-Utu</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
 				<exemplarCity>Apia</exemplarCity>
@@ -4500,18 +4592,12 @@
 		</timeZoneNames>
 	</dates>
 	<numbers>
-		<defaultNumberingSystem>latn</defaultNumberingSystem>
-		<otherNumberingSystems>
-			<native draft="contributed">latn</native>
-		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group> </group>
 			<list>;</list>
 			<percentSign>%</percentSign>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
 			<exponential>E</exponential>
 			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
@@ -4520,11 +4606,6 @@
 			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
 			<decimalFormatLength type="long">
 				<decimalFormat>
 					<pattern type="1000" count="one">0 duisend</pattern>
@@ -4641,331 +4722,252 @@
 				<displayName>Verenigde Arabiese Emirate dirham</displayName>
 				<displayName count="one">Verenigde Arabiese Emirate dirham</displayName>
 				<displayName count="other">Verenigde Arabiese Emirate dirham</displayName>
-				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFN">
 				<displayName>Afgaanse afgani</displayName>
 				<displayName count="one">Afgaanse afgani</displayName>
 				<displayName count="other">Afgaanse afgani</displayName>
-				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALL">
 				<displayName>Albanese lek</displayName>
 				<displayName count="one">Albanese lek</displayName>
 				<displayName count="other">Albanese lek</displayName>
-				<symbol>ALL</symbol>
 			</currency>
 			<currency type="AMD">
 				<displayName>Armeense dram</displayName>
 				<displayName count="one">Armeense dram</displayName>
 				<displayName count="other">Armeense dram</displayName>
-				<symbol>AMD</symbol>
 			</currency>
 			<currency type="ANG">
 				<displayName>Nederlands-Antilliaanse gulde</displayName>
 				<displayName count="one">Nederlands-Antilliaanse gulde</displayName>
 				<displayName count="other">Nederlands-Antilliaanse gulde</displayName>
-				<symbol>ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>Angolese kwanza</displayName>
 				<displayName count="one">Angolese kwanza</displayName>
 				<displayName count="other">Angolese kwanza</displayName>
-				<symbol>AOA</symbol>
-				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>Argentynse peso</displayName>
 				<displayName count="one">Argentynse peso</displayName>
 				<displayName count="other">Argentynse peso</displayName>
-				<symbol>ARS</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AUD">
 				<displayName>Australiese dollar</displayName>
 				<displayName count="one">Australiese dollar</displayName>
 				<displayName count="other">Australiese dollar</displayName>
-				<symbol>A$</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName>Arubaanse floryn</displayName>
 				<displayName count="one">Arubaanse floryn</displayName>
 				<displayName count="other">Arubaanse floryn</displayName>
-				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZN">
 				<displayName>Azerbeidjaanse manat</displayName>
 				<displayName count="one">Azerbeidjaanse manat</displayName>
 				<displayName count="other">Azerbeidjaanse manat</displayName>
-				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAM">
 				<displayName>Bosnies-Herzegowiniese omskakelbare marka</displayName>
 				<displayName count="one">Bosnies-Herzegowiniese omskakelbare marka</displayName>
 				<displayName count="other">Bosnies-Herzegowiniese omskakelbare marka</displayName>
-				<symbol>BAM</symbol>
-				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Barbados-dollar</displayName>
 				<displayName count="one">Barbados-dollar</displayName>
 				<displayName count="other">Barbados-dollar</displayName>
-				<symbol>BBD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>Bangladesjiese taka</displayName>
 				<displayName count="one">Bangladesjiese taka</displayName>
 				<displayName count="other">Bangladesjiese taka</displayName>
-				<symbol>BDT</symbol>
-				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BGN">
 				<displayName>Bulgaarse lev</displayName>
 				<displayName count="one">Bulgaarse lev</displayName>
 				<displayName count="other">Bulgaarse lev</displayName>
-				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BHD">
 				<displayName>Bahreinse dinar</displayName>
 				<displayName count="one">Bahreinse dinar</displayName>
 				<displayName count="other">Bahreinse dinar</displayName>
-				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>Burundiese frank</displayName>
 				<displayName count="one">Burundiese frank</displayName>
 				<displayName count="other">Burundiese frank</displayName>
-				<symbol>BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>Bermuda-dollar</displayName>
 				<displayName count="one">Bermuda-dollar</displayName>
 				<displayName count="other">Bermuda-dollar</displayName>
-				<symbol>BMD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>Broeneise dollar</displayName>
 				<displayName count="one">Broeneise dollar</displayName>
 				<displayName count="other">Broeneise dollar</displayName>
-				<symbol>BND</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>Boliviaanse boliviano</displayName>
 				<displayName count="one">Boliviaanse boliviano</displayName>
 				<displayName count="other">Boliviaanse boliviano</displayName>
-				<symbol>BOB</symbol>
-				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>Brasilliaanse reaal</displayName>
 				<displayName count="one">Brasillianse reaal</displayName>
 				<displayName count="other">Brasillianse reaal</displayName>
-				<symbol>R$</symbol>
-				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
 			<currency type="BSD">
 				<displayName>Bahamiaanse dollar</displayName>
 				<displayName count="one">Bahamiaanse dollar</displayName>
 				<displayName count="other">Bahamiaanse dollar</displayName>
-				<symbol>BSD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>Bhoetanese ngoeltroem</displayName>
 				<displayName count="one">Bhoetanese ngoeltroem</displayName>
 				<displayName count="other">Bhoetanese ngoeltroem</displayName>
-				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BWP">
 				<displayName>Botswana pula</displayName>
 				<displayName count="one">Botswana pula</displayName>
 				<displayName count="other">Botswana pula</displayName>
-				<symbol>BWP</symbol>
-				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYN">
 				<displayName>Belo-Russiese roebel</displayName>
 				<displayName count="one">Belo-Russiese roebel</displayName>
 				<displayName count="other">Belo-Russiese roebel</displayName>
-				<symbol>BYN</symbol>
-				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>Belo-Russiese roebel (2000–2016)</displayName>
 				<displayName count="one">Belo-Russiese roebel (2000–2016)</displayName>
 				<displayName count="other">Belo-Russiese roebel (2000–2016)</displayName>
-				<symbol>BYR</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>Beliziese dollar</displayName>
 				<displayName count="one">Beliziese dollar</displayName>
 				<displayName count="other">Beliziese dollar</displayName>
-				<symbol>BZD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>Kanadese dollar</displayName>
 				<displayName count="one">Kanadese dollar</displayName>
 				<displayName count="other">Kanadese dollar</displayName>
-				<symbol>CA$</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>Kongolese frank</displayName>
 				<displayName count="one">Kongolese frank</displayName>
 				<displayName count="other">Kongolese frank</displayName>
-				<symbol>CDF</symbol>
 			</currency>
 			<currency type="CHF">
 				<displayName>Switserse frank</displayName>
 				<displayName count="one">Switserse frank</displayName>
 				<displayName count="other">Switserse frank</displayName>
-				<symbol>CHF</symbol>
 			</currency>
 			<currency type="CLP">
 				<displayName>Chileense peso</displayName>
 				<displayName count="one">Chileense peso</displayName>
 				<displayName count="other">Chileense peso</displayName>
-				<symbol>CLP</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNH">
 				<displayName>Chinese joean</displayName>
 				<displayName count="one">Chinese joean (buiteland)</displayName>
 				<displayName count="other">Chinese joean (buiteland)</displayName>
-				<symbol draft="contributed">CNH</symbol>
 			</currency>
 			<currency type="CNY">
 				<displayName>Sjinese joean renminbi</displayName>
 				<displayName count="one">Sjinese joean renminbi</displayName>
 				<displayName count="other">Sjinese joean renminbi</displayName>
-				<symbol>CN¥</symbol>
-				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>Colombiaanse peso</displayName>
 				<displayName count="one">Colombiaanse peso</displayName>
 				<displayName count="other">Colombiaanse peso</displayName>
-				<symbol>COP</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CRC">
 				<displayName>Costa Ricaanse colón</displayName>
 				<displayName count="one">Costa Ricaanse colón</displayName>
 				<displayName count="other">Costa Ricaanse colón</displayName>
-				<symbol>CRC</symbol>
-				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
 			<currency type="CUC">
 				<displayName>Kubaanse omskakelbare peso</displayName>
 				<displayName count="one">Kubaanse omskakelbare peso</displayName>
 				<displayName count="other">Kubaanse omskakelbare peso</displayName>
-				<symbol>CUC</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kubaanse peso</displayName>
 				<displayName count="one">Kubaanse peso</displayName>
 				<displayName count="other">Kubaanse peso</displayName>
-				<symbol>CUP</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>Kaap Verdiese escudo</displayName>
 				<displayName count="one">Kaap Verdiese escudo</displayName>
 				<displayName count="other">Kaap Verdiese escudo</displayName>
-				<symbol>CVE</symbol>
 			</currency>
 			<currency type="CZK">
 				<displayName>Tsjeggiese kroon</displayName>
 				<displayName count="one">Tsjeggiese kroon</displayName>
 				<displayName count="other">Tsjeggiese kroon</displayName>
-				<symbol>CZK</symbol>
-				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>Djiboeti frank</displayName>
 				<displayName count="one">Djiboeti frank</displayName>
 				<displayName count="other">Djiboeti frank</displayName>
-				<symbol>DJF</symbol>
 			</currency>
 			<currency type="DKK">
 				<displayName>Deense kroon</displayName>
 				<displayName count="one">Deense kroon</displayName>
 				<displayName count="other">Deense kroon</displayName>
-				<symbol>DKK</symbol>
-				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikaanse peso</displayName>
 				<displayName count="one">Dominikaanse peso</displayName>
 				<displayName count="other">Dominikaanse peso</displayName>
-				<symbol>DOP</symbol>
-				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>Algeriese dinar</displayName>
 				<displayName count="one">Algeriese dinar</displayName>
 				<displayName count="other">Algeriese dinar</displayName>
-				<symbol>DZD</symbol>
 			</currency>
 			<currency type="EGP">
 				<displayName>Egiptiese pond</displayName>
 				<displayName count="one">Egiptiese pond</displayName>
 				<displayName count="other">Egiptiese pond</displayName>
-				<symbol>EGP</symbol>
-				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrese nakfa</displayName>
 				<displayName count="one">Eritrese nakfa</displayName>
 				<displayName count="other">Eritrese nakfa</displayName>
-				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ETB">
 				<displayName>Etiopiese birr</displayName>
 				<displayName count="one">Etiopiese birr</displayName>
 				<displayName count="other">Etiopiese birr</displayName>
-				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
-				<displayName>Euro</displayName>
+				<displayName>euro</displayName>
 				<displayName count="one">euro</displayName>
 				<displayName count="other">euro</displayName>
-				<symbol>€</symbol>
 				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
 			<currency type="FJD">
 				<displayName>Fidjiaanse dollar</displayName>
 				<displayName count="one">Fidjiaanse dollar</displayName>
 				<displayName count="other">Fidjiaanse dollar</displayName>
-				<symbol>FJD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>Falkland-eilande pond</displayName>
 				<displayName count="one">Falkland-eilande pond</displayName>
 				<displayName count="other">Falkland-eilande pond</displayName>
-				<symbol>FKP</symbol>
-				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>Britse pond</displayName>
 				<displayName count="one">Britse pond</displayName>
 				<displayName count="other">Britse pond</displayName>
-				<symbol>£</symbol>
-				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GEL">
 				<displayName>Georgiese lari</displayName>
 				<displayName count="one">Georgiese lari</displayName>
 				<displayName count="other">Georgiese lari</displayName>
-				<symbol>GEL</symbol>
-				<symbol alt="narrow" draft="contributed">₾</symbol>
 				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
@@ -4975,27 +4977,21 @@
 				<displayName>Ghanese cedi</displayName>
 				<displayName count="one">Ghanese cedi</displayName>
 				<displayName count="other">Ghanese cedi</displayName>
-				<symbol>GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>Gibraltarese pond</displayName>
 				<displayName count="one">Gibraltarese pond</displayName>
 				<displayName count="other">Gibraltarese pond</displayName>
-				<symbol>GIP</symbol>
-				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>Gambiese dalasi</displayName>
 				<displayName count="one">Gambiese dalasi</displayName>
 				<displayName count="other">Gambiese dalasi</displayName>
-				<symbol>GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>Guinese frank</displayName>
 				<displayName count="one">Guinese frank</displayName>
 				<displayName count="other">Guinese frank</displayName>
-				<symbol>GNF</symbol>
-				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guinese syli</displayName>
@@ -5004,89 +5000,66 @@
 				<displayName>Guatemalaanse quetzal</displayName>
 				<displayName count="one">Guatemalaanse quetzal</displayName>
 				<displayName count="other">Guatemalaanse quetzal</displayName>
-				<symbol>GTQ</symbol>
-				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>Guyanese dollar</displayName>
 				<displayName count="one">Guyanese dollar</displayName>
 				<displayName count="other">Guyanese dollar</displayName>
-				<symbol>GYD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>Hong Kong dollar</displayName>
 				<displayName count="one">Hong Kong dollar</displayName>
 				<displayName count="other">Hong Kong dollar</displayName>
-				<symbol>HK$</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>Hondurese lempira</displayName>
 				<displayName count="one">Hondurese lempira</displayName>
 				<displayName count="other">Hondurese lempira</displayName>
-				<symbol>HNL</symbol>
-				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>Kroatiese kuna</displayName>
 				<displayName count="one">Kroatiese kuna</displayName>
 				<displayName count="other">Kroatiese kuna</displayName>
-				<symbol>HRK</symbol>
-				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haïtiaanse gourde</displayName>
 				<displayName count="one">Haïtiaanse gourde</displayName>
 				<displayName count="other">Haïtiaanse gourde</displayName>
-				<symbol>HTG</symbol>
 			</currency>
 			<currency type="HUF">
 				<displayName>Hongaarse florint</displayName>
 				<displayName count="one">Hongaarse florint</displayName>
 				<displayName count="other">Hongaarse florint</displayName>
-				<symbol>HUF</symbol>
-				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonesiese roepia</displayName>
 				<displayName count="one">Indonesiese roepia</displayName>
 				<displayName count="other">Indonesiese roepia</displayName>
-				<symbol>IDR</symbol>
-				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>Israeliese nuwe sikkel</displayName>
 				<displayName count="one">Israeliese nuwe sikkel</displayName>
 				<displayName count="other">Israeliese nuwe sikkel</displayName>
-				<symbol>₪</symbol>
-				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>Indiese roepee</displayName>
 				<displayName count="one">Indiese rupee</displayName>
 				<displayName count="other">Indiese rupee</displayName>
-				<symbol>₹</symbol>
-				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
 				<displayName>Irakse dinar</displayName>
 				<displayName count="one">Irakse dinar</displayName>
 				<displayName count="other">Irakse dinar</displayName>
-				<symbol>IQD</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>Iranse rial</displayName>
 				<displayName count="one">Iranse rial</displayName>
 				<displayName count="other">Iranse rial</displayName>
-				<symbol>IRR</symbol>
 			</currency>
 			<currency type="ISK">
 				<displayName>Yslandse kroon</displayName>
 				<displayName count="one">Yslandse kroon</displayName>
 				<displayName count="other">Yslandse kroon</displayName>
-				<symbol>ISK</symbol>
-				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName draft="contributed">Italiaanse lier</displayName>
@@ -5095,109 +5068,81 @@
 				<displayName>Jamaikaanse dollar</displayName>
 				<displayName count="one">Jamaikaanse dollar</displayName>
 				<displayName count="other">Jamaikaanse dollar</displayName>
-				<symbol>JMD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>Jordaniese dinar</displayName>
 				<displayName count="one">Jordaniese dinar</displayName>
 				<displayName count="other">Jordaniese dinar</displayName>
-				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>Japannese jen</displayName>
 				<displayName count="one">Japannese jen</displayName>
 				<displayName count="other">Japannese jen</displayName>
-				<symbol>JP¥</symbol>
-				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>Keniaanse sjieling</displayName>
 				<displayName count="one">Keniaanse sjieling</displayName>
 				<displayName count="other">Keniaanse sjieling</displayName>
-				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>Kirgisiese som</displayName>
 				<displayName count="one">Kirgisiese som</displayName>
 				<displayName count="other">Kirgisiese som</displayName>
-				<symbol>KGS</symbol>
 			</currency>
 			<currency type="KHR">
 				<displayName>Kambodjaanse riel</displayName>
 				<displayName count="one">Kambodjaanse riel</displayName>
 				<displayName count="other">Kambodjaanse riel</displayName>
-				<symbol>KHR</symbol>
-				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
 				<displayName>Comoraanse frank</displayName>
 				<displayName count="one">Comoraanse frank</displayName>
 				<displayName count="other">Comoraanse frank</displayName>
-				<symbol>KMF</symbol>
-				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Noord-Koreaanse won</displayName>
 				<displayName count="one">Noord-Koreaanse won</displayName>
 				<displayName count="other">Noord-Koreaanse won</displayName>
-				<symbol>KPW</symbol>
-				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Suid-Koreaanse won</displayName>
 				<displayName count="one">Suid-Koreaanse won</displayName>
 				<displayName count="other">Suid-Koreaanse won</displayName>
-				<symbol>₩</symbol>
-				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>Koeweitse dinar</displayName>
 				<displayName count="one">Koeweitse dinar</displayName>
 				<displayName count="other">Koeweitse dinar</displayName>
-				<symbol>KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>Cayman-eilande dollar</displayName>
 				<displayName count="one">Cayman-eilande dollar</displayName>
 				<displayName count="other">Cayman-eilande dollar</displayName>
-				<symbol>KYD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
 				<displayName>Kazakse tenge</displayName>
 				<displayName count="one">Kazakse tenge</displayName>
 				<displayName count="other">Kazakse tenge</displayName>
-				<symbol>KZT</symbol>
-				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>Laosiaanse kip</displayName>
 				<displayName count="one">Laosiaanse kip</displayName>
 				<displayName count="other">Laosiaanse kip</displayName>
-				<symbol>LAK</symbol>
-				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
 				<displayName>Lebanese pond</displayName>
 				<displayName count="one">Lebanese pond</displayName>
 				<displayName count="other">Lebanese pond</displayName>
-				<symbol>LBP</symbol>
-				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lankaanse roepee</displayName>
 				<displayName count="one">Sri Lankaanse roepee</displayName>
 				<displayName count="other">Sri Lankaanse roepee</displayName>
-				<symbol>LKR</symbol>
-				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberiese dollar</displayName>
 				<displayName count="one">Liberiese dollar</displayName>
 				<displayName count="other">Liberiese dollar</displayName>
-				<symbol>LRD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="LSL">
 				<displayName>Lesotho loti</displayName>
@@ -5206,7 +5151,6 @@
 				<displayName>Litause litas</displayName>
 				<displayName count="one">Litause litas</displayName>
 				<displayName count="other">Litause litas</displayName>
-				<symbol>LTL</symbol>
 			</currency>
 			<currency type="LVL">
 				<displayName>Lettiese lats</displayName>
@@ -5215,58 +5159,46 @@
 				<displayName>Libiese dinar</displayName>
 				<displayName count="one">Libiese dinar</displayName>
 				<displayName count="other">Libiese dinar</displayName>
-				<symbol>LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>Marokkaanse dirham</displayName>
 				<displayName count="one">Marokkaanse dirham</displayName>
 				<displayName count="other">Marokkaanse dirham</displayName>
-				<symbol>MAD</symbol>
 			</currency>
 			<currency type="MDL">
 				<displayName>Moldowiese leu</displayName>
 				<displayName count="one">Moldowiese leu</displayName>
 				<displayName count="other">Moldowiese leu</displayName>
-				<symbol>MDL</symbol>
 			</currency>
 			<currency type="MGA">
 				<displayName>Malgassiese ariary</displayName>
 				<displayName count="one">Malgassiese ariary</displayName>
 				<displayName count="other">Malgassiese ariary</displayName>
-				<symbol>MGA</symbol>
-				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>Macedoniese denar</displayName>
 				<displayName count="one">Macedoniese denar</displayName>
 				<displayName count="other">Macedoniese denar</displayName>
-				<symbol>MKD</symbol>
 			</currency>
 			<currency type="MMK">
 				<displayName>Mianmese kyat</displayName>
 				<displayName count="one">Mianmese kyat</displayName>
 				<displayName count="other">Mianmese kyat</displayName>
-				<symbol>MMK</symbol>
-				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongoolse toegrik</displayName>
 				<displayName count="one">Mongoolse toegrik</displayName>
 				<displayName count="other">Mongoolse toegrik</displayName>
-				<symbol>MNT</symbol>
-				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>Macaose pataca</displayName>
 				<displayName count="one">Macaose pataca</displayName>
 				<displayName count="other">Macaose pataca</displayName>
-				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>Mauritaniese ouguiya (1973–2017)</displayName>
 				<displayName count="one">Mauritaniese ouguiya (1973–2017)</displayName>
 				<displayName count="other">Mauritaniese ouguiya (1973–2017)</displayName>
-				<symbol>MRO</symbol>
 			</currency>
 			<currency type="MRU">
 				<displayName>Mauritaniese ouguiya</displayName>
@@ -5277,34 +5209,27 @@
 				<displayName>Mauritiaanse rupee</displayName>
 				<displayName count="one">Mauritiaanse rupee</displayName>
 				<displayName count="other">Mauritiaanse rupee</displayName>
-				<symbol>MUR</symbol>
-				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Malediviese rufia</displayName>
 				<displayName count="one">Malediviese rufia</displayName>
 				<displayName count="other">Malediviese rufia</displayName>
-				<symbol>MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>Malawiese kwacha</displayName>
 				<displayName count="one">Malawiese kwacha</displayName>
 				<displayName count="other">Malawiese kwacha</displayName>
-				<symbol>MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>Meksikaanse peso</displayName>
 				<displayName count="one">Meksikaanse peso</displayName>
 				<displayName count="other">Meksikaanse peso</displayName>
 				<symbol>MXN</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="MYR">
 				<displayName>Maleisiese ringgit</displayName>
 				<displayName count="one">Maleisiese ringgit</displayName>
 				<displayName count="other">Maleisiese ringgit</displayName>
-				<symbol>MYR</symbol>
-				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZM">
 				<displayName>Mosambiekse metical (1980–2006)</displayName>
@@ -5313,160 +5238,123 @@
 				<displayName>Mosambiekse metical</displayName>
 				<displayName count="one">Mosambiekse metical</displayName>
 				<displayName count="other">Mosambiekse metical</displayName>
-				<symbol>MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>Namibiese dollar</displayName>
 				<displayName count="one">Namibiese dollar</displayName>
 				<displayName count="other">Namibiese dollar</displayName>
-				<symbol>NAD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>Nigeriese naira</displayName>
 				<displayName count="one">Nigeriese naira</displayName>
 				<displayName count="other">Nigeriese naira</displayName>
-				<symbol>NGN</symbol>
-				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIO">
 				<displayName>Nicaraguaanse córdoba</displayName>
 				<displayName count="one">Nicaraguaanse córdoba</displayName>
 				<displayName count="other">Nicaraguaanse córdoba</displayName>
-				<symbol>NIO</symbol>
-				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>Noorse kroon</displayName>
 				<displayName count="one">Noorse kroon</displayName>
 				<displayName count="other">Noorse kroon</displayName>
-				<symbol>NOK</symbol>
-				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalese roepee</displayName>
 				<displayName count="one">Nepalese roepee</displayName>
 				<displayName count="other">Nepalese roepee</displayName>
-				<symbol>NPR</symbol>
-				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Nieu-Seeland dollar</displayName>
 				<displayName count="one">Nieu-Seeland dollar</displayName>
 				<displayName count="other">Nieu-Seeland dollar</displayName>
-				<symbol>NZ$</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>Omaanse rial</displayName>
 				<displayName count="one">Omaanse rial</displayName>
 				<displayName count="other">Omaanse rial</displayName>
-				<symbol>OMR</symbol>
 			</currency>
 			<currency type="PAB">
 				<displayName>Panamese balboa</displayName>
 				<displayName count="one">Panamese balboa</displayName>
 				<displayName count="other">Panamese balboa</displayName>
-				<symbol>PAB</symbol>
 			</currency>
 			<currency type="PEN">
 				<displayName>Peruaanse sol</displayName>
 				<displayName count="one">Peruaanse sol</displayName>
 				<displayName count="other">Peruaanse sol</displayName>
-				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PGK">
 				<displayName>Papoea-Nieu-Guinese kina</displayName>
 				<displayName count="one">Papoea-Nieu-Guinese kina</displayName>
 				<displayName count="other">Papoea-Nieu-Guinese kina</displayName>
-				<symbol>PGK</symbol>
 			</currency>
 			<currency type="PHP">
 				<displayName>Filippynse peso</displayName>
 				<displayName count="one">Filippynse peso</displayName>
 				<displayName count="other">Filippynse peso</displayName>
-				<symbol>PHP</symbol>
-				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>Pakistanse roepee</displayName>
 				<displayName count="one">Pakistanse roepee</displayName>
 				<displayName count="other">Pakistanse roepee</displayName>
-				<symbol>PKR</symbol>
-				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Poolse zloty</displayName>
 				<displayName count="one">Poolse zloty</displayName>
 				<displayName count="other">Poolse zloty</displayName>
-				<symbol>PLN</symbol>
-				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>Paraguaanse guarani</displayName>
 				<displayName count="one">Paraguaanse guarani</displayName>
 				<displayName count="other">Paraguaanse guarani</displayName>
-				<symbol>PYG</symbol>
-				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>Katarrese rial</displayName>
 				<displayName count="one">Katarese rial</displayName>
 				<displayName count="other">Katarese rial</displayName>
-				<symbol>QAR</symbol>
 			</currency>
 			<currency type="RON">
 				<displayName>Roemeense leu</displayName>
 				<displayName count="one">Roemeense leu</displayName>
 				<displayName count="other">Roemeense leu</displayName>
-				<symbol>RON</symbol>
 				<symbol alt="narrow" draft="contributed">leu</symbol>
 			</currency>
 			<currency type="RSD">
 				<displayName>Serbiese dinar</displayName>
 				<displayName count="one">Serbiese dinar</displayName>
 				<displayName count="other">Serbiese dinar</displayName>
-				<symbol>RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>Russiese roebel</displayName>
 				<displayName count="one">Russiese roebel</displayName>
 				<displayName count="other">Russiese roebel</displayName>
-				<symbol>RUB</symbol>
-				<symbol alt="narrow" draft="contributed">₽</symbol>
 				<symbol alt="variant">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>Rwandiese frank</displayName>
 				<displayName count="one">Rwandiese frank</displayName>
 				<displayName count="other">Rwandiese frank</displayName>
-				<symbol>RWF</symbol>
-				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saoedi-Arabiese riyal</displayName>
 				<displayName count="one">Saoedi-Arabiese riyal</displayName>
 				<displayName count="other">Saoedi-Arabiese riyal</displayName>
-				<symbol>SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>Salomonseilande dollar</displayName>
 				<displayName count="one">Salomonseilande dollar</displayName>
 				<displayName count="other">Salomonseilande dollar</displayName>
-				<symbol>SBD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>Seychellese rupee</displayName>
 				<displayName count="one">Seychellese rupee</displayName>
 				<displayName count="other">Seychellese rupee</displayName>
-				<symbol>SCR</symbol>
 			</currency>
 			<currency type="SDG">
 				<displayName>Soedannese pond</displayName>
 				<displayName count="one">Soedannese pond</displayName>
 				<displayName count="other">Soedannese pond</displayName>
-				<symbol>SDG</symbol>
 			</currency>
 			<currency type="SDP">
 				<displayName>Soedannese pond (1957–1998)</displayName>
@@ -5475,54 +5363,41 @@
 				<displayName>Sweedse kroon</displayName>
 				<displayName count="one">Sweedse kroon</displayName>
 				<displayName count="other">Sweedse kroon</displayName>
-				<symbol>SEK</symbol>
-				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapoer dollar</displayName>
 				<displayName count="one">Singapoer dollar</displayName>
 				<displayName count="other">Singapoer dollar</displayName>
-				<symbol>SGD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>Sint Helena pond</displayName>
 				<displayName count="one">Sint Helena pond</displayName>
 				<displayName count="other">Sint Helena pond</displayName>
-				<symbol>SHP</symbol>
-				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>Sierra Leoniese leone</displayName>
 				<displayName count="one">Sierra Leoniese leone</displayName>
 				<displayName count="other">Sierra Leoniese leone</displayName>
-				<symbol>SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>Somaliese sjieling</displayName>
 				<displayName count="one">Somaliese sjieling</displayName>
 				<displayName count="other">Somaliese sjieling</displayName>
-				<symbol>SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>Surinaamse dollar</displayName>
 				<displayName count="one">Surinaamse dollar</displayName>
 				<displayName count="other">Surinaamse dollar</displayName>
-				<symbol>SRD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SSP">
 				<displayName>Suid-Soedanese pond</displayName>
 				<displayName count="one">Suid-Soedanese pond</displayName>
 				<displayName count="other">Suid-Soedanese pond</displayName>
-				<symbol>SSP</symbol>
-				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>São Tomé en Príncipe dobra (1977–2017)</displayName>
 				<displayName count="one">São Tomé en Príncipe dobra (1977–2017)</displayName>
 				<displayName count="other">São Tomé en Príncipe dobra (1977–2017)</displayName>
-				<symbol>STD</symbol>
 			</currency>
 			<currency type="STN">
 				<displayName>São Tomé en Príncipe dobra</displayName>
@@ -5534,46 +5409,37 @@
 				<displayName>Siriese pond</displayName>
 				<displayName count="one">Siriese pond</displayName>
 				<displayName count="other">Siriese pond</displayName>
-				<symbol>SYP</symbol>
-				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Swazilandse lilangeni</displayName>
 				<displayName count="one">Swazilandse lilangeni</displayName>
 				<displayName count="other">Swazilandse lilangeni</displayName>
-				<symbol>SZL</symbol>
 			</currency>
 			<currency type="THB">
 				<displayName>Thaise baht</displayName>
 				<displayName count="one">Thaise baht</displayName>
 				<displayName count="other">Thaise baht</displayName>
 				<symbol>฿</symbol>
-				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Tadjikse roebel</displayName>
 				<displayName count="one">Tadjikse roebel</displayName>
 				<displayName count="other">Tadjikse roebel</displayName>
-				<symbol>TJS</symbol>
 			</currency>
 			<currency type="TMT">
 				<displayName>Turkmeense manat</displayName>
 				<displayName count="one">Turkmeense manat</displayName>
 				<displayName count="other">Turkmeense manat</displayName>
-				<symbol>TMT</symbol>
 			</currency>
 			<currency type="TND">
 				<displayName>Tunisiese dinar</displayName>
 				<displayName count="one">Tunisiese dinar</displayName>
 				<displayName count="other">Tunisiese dinar</displayName>
-				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>Tongaanse pa’anga</displayName>
 				<displayName count="one">Tongaanse pa’anga</displayName>
 				<displayName count="other">Tongaanse pa’anga</displayName>
-				<symbol>TOP</symbol>
-				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRL">
 				<displayName>Turkse lier (1922–2005)</displayName>
@@ -5582,116 +5448,95 @@
 				<displayName>Turkse lier</displayName>
 				<displayName count="one">Turkse lier</displayName>
 				<displayName count="other">Turkse lier</displayName>
-				<symbol>TRY</symbol>
-				<symbol alt="narrow" draft="contributed">₺</symbol>
-				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad en Tobago dollar</displayName>
 				<displayName count="one">Trinidad en Tobago dollar</displayName>
 				<displayName count="other">Trinidad en Tobago dollar</displayName>
-				<symbol>TTD</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>Nuwe Taiwanese dollar</displayName>
 				<displayName count="one">Nuwe Taiwanese dollar</displayName>
 				<displayName count="other">Nuwe Taiwanese dollar</displayName>
-				<symbol>NT$</symbol>
 				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>Tanzaniese sjieling</displayName>
 				<displayName count="one">Tanzaniese sjieling</displayName>
 				<displayName count="other">Tanzaniese sjieling</displayName>
-				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>Oekraïnse hriwna</displayName>
 				<displayName count="one">Oekraïnse hriwna</displayName>
 				<displayName count="other">Oekraïnse hriwna</displayName>
-				<symbol>UAH</symbol>
-				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
 			<currency type="UGX">
 				<displayName>Ugandese sjieling</displayName>
 				<displayName count="one">Ugandese sjieling</displayName>
 				<displayName count="other">Ugandese sjieling</displayName>
-				<symbol>UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>Amerikaanse dollar</displayName>
 				<displayName count="one">Amerikaanse dollar</displayName>
 				<displayName count="other">Amerikaanse dollar</displayName>
-				<symbol>US$</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UYU">
 				<displayName>Uruguaanse peso</displayName>
 				<displayName count="one">Uruguaanse peso</displayName>
 				<displayName count="other">Uruguaanse peso</displayName>
-				<symbol>UYU</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>Oezbekiese som</displayName>
 				<displayName count="one">Oezbekiese som</displayName>
 				<displayName count="other">Oezbekiese som</displayName>
-				<symbol>UZS</symbol>
 			</currency>
 			<currency type="VEF">
 				<displayName>Venezolaanse bolivar</displayName>
-				<displayName count="one">Venezolaanse bolivar</displayName>
-				<displayName count="other">Venezolaanse bolivar</displayName>
-				<symbol>VEF</symbol>
-				<symbol alt="narrow" draft="contributed">Bs</symbol>
+				<displayName count="one">Venezolaanse bolívar (2008–2018)</displayName>
+				<displayName count="other">Venezolaanse bolívare (2008–2018)</displayName>
+			</currency>
+			<currency type="VES">
+				<displayName>Venezolaanse Bolívar</displayName>
+				<displayName count="one">Venezolaanse bolívar</displayName>
+				<displayName count="other">Venezolaanse bolívare</displayName>
 			</currency>
 			<currency type="VND">
 				<displayName>Viëtnamese dong</displayName>
 				<displayName count="one">Viëtnamese dong</displayName>
 				<displayName count="other">Viëtnamese dong</displayName>
-				<symbol>₫</symbol>
-				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
 				<displayName>Vanuatuse vatu</displayName>
 				<displayName count="one">Vanuatuse vatu</displayName>
 				<displayName count="other">Vanuatuse vatu</displayName>
-				<symbol>VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>Samoaanse tala</displayName>
 				<displayName count="one">Samoaanse tala</displayName>
 				<displayName count="other">Samoaanse tala</displayName>
-				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
 				<displayName>CFA frank BEAC</displayName>
 				<displayName count="one">CFA frank BEAC</displayName>
 				<displayName count="other">CFA frank BEAC</displayName>
-				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XCD">
 				<displayName>Oos-Karibbiese dollar</displayName>
 				<displayName count="one">Oos-Karibbiese dollar</displayName>
 				<displayName count="other">Oos-Karibbiese dollar</displayName>
-				<symbol>EC$</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>CFA frank BCEAO</displayName>
 				<displayName count="one">CFA frank BCEAO</displayName>
 				<displayName count="other">CFA frank BCEAO</displayName>
-				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
 				<displayName>CFP-frank</displayName>
 				<displayName count="one">CFP-frank</displayName>
 				<displayName count="other">CFP-frank</displayName>
-				<symbol>CFPF</symbol>
 			</currency>
 			<currency type="XXX">
-				<displayName>Onbekende geldeenheid</displayName>
+				<displayName>onbekende geldeenheid</displayName>
 				<displayName count="one">(onbekende geldeenheid)</displayName>
 				<displayName count="other">(onbekende geldeenheid)</displayName>
 			</currency>
@@ -5699,14 +5544,12 @@
 				<displayName>Jemenitiese rial</displayName>
 				<displayName count="one">Jemenitiese rial</displayName>
 				<displayName count="other">Jemenitiese rial</displayName>
-				<symbol>YER</symbol>
 			</currency>
 			<currency type="ZAR">
 				<displayName>Suid-Afrikaanse rand</displayName>
 				<displayName count="one">Suid-Afrikaanse rand</displayName>
 				<displayName count="other">Suid-Afrikaanse rand</displayName>
 				<symbol>R</symbol>
-				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambiese kwacha (1968–2012)</displayName>
@@ -5715,15 +5558,15 @@
 				<displayName>Zambiese kwacha</displayName>
 				<displayName count="one">Zambiese kwacha</displayName>
 				<displayName count="other">Zambiese kwacha</displayName>
-				<symbol>ZMW</symbol>
-				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZWD">
 				<displayName>Zimbabwiese dollar</displayName>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
+			<pattern type="approximately">~{0}</pattern>
 			<pattern type="atLeast">{0}+</pattern>
+			<pattern type="atMost">≤{0}</pattern>
 			<pattern type="range">{0}–{1}</pattern>
 		</miscPatterns>
 		<minimalPairs>
@@ -5822,6 +5665,11 @@
 				<unitPattern count="other">{0} vierkante duim</unitPattern>
 				<perUnitPattern>{0} per vierkante duim</perUnitPattern>
 			</unit>
+			<unit type="area-dunam">
+				<displayName>donums</displayName>
+				<unitPattern count="one">{0} donum</unitPattern>
+				<unitPattern count="other">{0} donums</unitPattern>
+			</unit>
 			<unit type="concentr-karat">
 				<displayName>karaat</displayName>
 				<unitPattern count="one">{0} karaat</unitPattern>
@@ -5842,6 +5690,26 @@
 				<unitPattern count="one">{0} dele per miljoen</unitPattern>
 				<unitPattern count="other">{0} dele per miljoen</unitPattern>
 			</unit>
+			<unit type="concentr-percent">
+				<displayName>persent</displayName>
+				<unitPattern count="one">{0} persent</unitPattern>
+				<unitPattern count="other">{0} persent</unitPattern>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>per mille</displayName>
+				<unitPattern count="one">{0} per mille</unitPattern>
+				<unitPattern count="other">{0} per mille</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<displayName>permiriade</displayName>
+				<unitPattern count="one">{0} permiriade</unitPattern>
+				<unitPattern count="other">{0} permiriade</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>mol</displayName>
+				<unitPattern count="one" draft="contributed">{0} mol</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mol</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter per kilometer</displayName>
 				<unitPattern count="one">{0} liter per kilometer</unitPattern>
@@ -5862,6 +5730,11 @@
 				<unitPattern count="one">{0} myl per imp. gelling</unitPattern>
 				<unitPattern count="other">{0} myl per imp. gelling</unitPattern>
 			</unit>
+			<unit type="digital-petabyte">
+				<displayName>petagrepe</displayName>
+				<unitPattern count="one">{0} petagreep</unitPattern>
+				<unitPattern count="other">{0} petagrepe</unitPattern>
+			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
@@ -6024,6 +5897,26 @@
 				<unitPattern count="one">{0} kWh</unitPattern>
 				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>elektronvolt</displayName>
+				<unitPattern count="one">{0} elektronvolt</unitPattern>
+				<unitPattern count="other">{0} elektronvolt</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit">
+				<displayName>Britse termiese eenhede</displayName>
+				<unitPattern count="one">{0} Britse termiese eenheid</unitPattern>
+				<unitPattern count="other">{0} Britse termiese eenhede</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>pondkrag</displayName>
+				<unitPattern count="one">{0} pondkrag</unitPattern>
+				<unitPattern count="other">{0} pondkrag</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>newton</displayName>
+				<unitPattern count="one">{0} newton</unitPattern>
+				<unitPattern count="other">{0} newton</unitPattern>
+			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>GHz</displayName>
 				<unitPattern count="one">{0} GHz</unitPattern>
@@ -6139,11 +6032,21 @@
 				<unitPattern count="one">{0} punt</unitPattern>
 				<unitPattern count="other">{0} punte</unitPattern>
 			</unit>
+			<unit type="length-solar-radius">
+				<displayName>sonradiusse</displayName>
+				<unitPattern count="one">{0} sonradius</unitPattern>
+				<unitPattern count="other">{0} sonradiusse</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>sonligkrag</displayName>
+				<unitPattern count="one">{0} sonligkrag</unitPattern>
+				<unitPattern count="other">{0} sonligkrag</unitPattern>
+			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metrieke ton</displayName>
 				<unitPattern count="one">{0} metrieke ton</unitPattern>
@@ -6198,6 +6101,21 @@
 				<unitPattern count="one">{0} karaat</unitPattern>
 				<unitPattern count="other">{0} karaat</unitPattern>
 			</unit>
+			<unit type="mass-dalton">
+				<displayName>daltons</displayName>
+				<unitPattern count="one">{0} dalton</unitPattern>
+				<unitPattern count="other">{0} daltons</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>Aardmassas</displayName>
+				<unitPattern count="one">{0} aardmassa</unitPattern>
+				<unitPattern count="other">{0} aardmassas</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>sonmassas</displayName>
+				<unitPattern count="one">{0} sonmassa</unitPattern>
+				<unitPattern count="other">{0} sonmassas</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
@@ -6253,6 +6171,21 @@
 				<unitPattern count="one">{0} millibar</unitPattern>
 				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>atmosfere</displayName>
+				<unitPattern count="one">{0} atmosfeer</unitPattern>
+				<unitPattern count="other">{0} atmosfere</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<displayName>kilopascal</displayName>
+				<unitPattern count="one">{0} kilopascal</unitPattern>
+				<unitPattern count="other">{0} kilopascal</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<displayName>megapascal</displayName>
+				<unitPattern count="one">{0} megapascal</unitPattern>
+				<unitPattern count="other">{0} megapascal</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometer per uur</displayName>
 				<unitPattern count="one">{0} kilometer per uur</unitPattern>
@@ -6293,6 +6226,16 @@
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
+			<unit type="torque-pound-foot">
+				<displayName>pondvoet</displayName>
+				<unitPattern count="one">{0} pondvoet</unitPattern>
+				<unitPattern count="other">{0} pondvoet</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<displayName>newtonmeter</displayName>
+				<unitPattern count="one">{0} newtonmeter</unitPattern>
+				<unitPattern count="other">{0} newtonmeter</unitPattern>
+			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubieke kilometer</displayName>
 				<unitPattern count="one">{0} kubieke kilometer</unitPattern>
@@ -6408,6 +6351,11 @@
 				<unitPattern count="one">{0} vloeistofons</unitPattern>
 				<unitPattern count="other">{0} vloeistofonse</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-imperial">
+				<displayName>Imperiale vloeistofonse</displayName>
+				<unitPattern count="one">{0} imperiale vloeistofons</unitPattern>
+				<unitPattern count="other">{0}imperiale vloeistofonse</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>eetlepel</displayName>
 				<unitPattern count="one">{0} eetlepel</unitPattern>
@@ -6418,7 +6366,13 @@
 				<unitPattern count="one">{0} teelepel</unitPattern>
 				<unitPattern count="other">{0} teelepels</unitPattern>
 			</unit>
+			<unit type="volume-barrel">
+				<displayName>vate</displayName>
+				<unitPattern count="one">{0} vat</unitPattern>
+				<unitPattern count="other">{0} vate</unitPattern>
+			</unit>
 			<coordinateUnit>
+				<displayName>kardinale rigting</displayName>
 				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
 				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
@@ -6514,6 +6468,11 @@
 				<unitPattern count="other">{0} dm.²</unitPattern>
 				<perUnitPattern>{0}/dm.²</perUnitPattern>
 			</unit>
+			<unit type="area-dunam">
+				<displayName>donums</displayName>
+				<unitPattern count="one">{0} donum</unitPattern>
+				<unitPattern count="other">{0} donum</unitPattern>
+			</unit>
 			<unit type="concentr-karat">
 				<displayName>karaat</displayName>
 				<unitPattern count="one">{0} kar.</unitPattern>
@@ -6534,6 +6493,26 @@
 				<unitPattern count="one">{0} d.p.m.</unitPattern>
 				<unitPattern count="other">{0} d.p.m.</unitPattern>
 			</unit>
+			<unit type="concentr-percent">
+				<displayName>percent</displayName>
+				<unitPattern count="one">{0}%</unitPattern>
+				<unitPattern count="other">{0}%</unitPattern>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>per mille</displayName>
+				<unitPattern count="one">{0}‰</unitPattern>
+				<unitPattern count="other">{0}‰</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<displayName>permiriade</displayName>
+				<unitPattern count="one">{0} ‱</unitPattern>
+				<unitPattern count="other">{0} ‱</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>mol</displayName>
+				<unitPattern count="one" draft="contributed">{0} mol</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mol</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 				<unitPattern count="one">{0} ℓ/km</unitPattern>
@@ -6554,6 +6533,11 @@
 				<unitPattern count="one">{0} m.p.imp.g.</unitPattern>
 				<unitPattern count="other">{0} m.p.imp.g.</unitPattern>
 			</unit>
+			<unit type="digital-petabyte">
+				<displayName>PGrepe</displayName>
+				<unitPattern count="one">{0} PB</unitPattern>
+				<unitPattern count="other">{0} PB</unitPattern>
+			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
@@ -6716,6 +6700,26 @@
 				<unitPattern count="one">{0} kWh</unitPattern>
 				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>elektronvolt</displayName>
+				<unitPattern count="one" draft="contributed">{0} eV</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} eV</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit">
+				<displayName>BTE</displayName>
+				<unitPattern count="one">{0} BTE</unitPattern>
+				<unitPattern count="other">{0} BTE</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>pondkrag</displayName>
+				<unitPattern count="one" draft="contributed">{0} lbf</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lbf</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>newton</displayName>
+				<unitPattern count="one" draft="contributed">{0} N</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} N</unitPattern>
+			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>GHz</displayName>
 				<unitPattern count="one">{0} GHz</unitPattern>
@@ -6831,11 +6835,21 @@
 				<unitPattern count="one">{0} pt.</unitPattern>
 				<unitPattern count="other">{0} pt.</unitPattern>
 			</unit>
+			<unit type="length-solar-radius">
+				<displayName>sonradiusse</displayName>
+				<unitPattern count="one" draft="contributed">{0} R☉</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} R☉</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>sonligkrag</displayName>
+				<unitPattern count="one" draft="contributed">{0} L☉</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} L☉</unitPattern>
+			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
@@ -6890,6 +6904,21 @@
 				<unitPattern count="one">{0} kar.</unitPattern>
 				<unitPattern count="other">{0} kar.</unitPattern>
 			</unit>
+			<unit type="mass-dalton">
+				<displayName>daltons</displayName>
+				<unitPattern count="one">{0} D</unitPattern>
+				<unitPattern count="other">{0} D</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>Aardmassas</displayName>
+				<unitPattern count="one" draft="contributed">{0} M⊕</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} M⊕</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>sonmassas</displayName>
+				<unitPattern count="one" draft="contributed">{0} M☉</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} M☉</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
@@ -6945,6 +6974,21 @@
 				<unitPattern count="one">{0} mbar</unitPattern>
 				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>atm</displayName>
+				<unitPattern count="one">{0} atm</unitPattern>
+				<unitPattern count="other">{0} atm</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<displayName>kPa</displayName>
+				<unitPattern count="one" draft="contributed">{0} kPa</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kPa</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<displayName>MPa</displayName>
+				<unitPattern count="one" draft="contributed">{0} MPa</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MPa</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/uur</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
@@ -6985,6 +7029,16 @@
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
+			<unit type="torque-pound-foot">
+				<displayName>lb.vt.</displayName>
+				<unitPattern count="one">{0} lb.vt.</unitPattern>
+				<unitPattern count="other">{0} lb.vt.</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<displayName>Nm</displayName>
+				<unitPattern count="one">{0} Nm</unitPattern>
+				<unitPattern count="other">{0} Nm</unitPattern>
+			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7097,8 +7151,13 @@
 			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>vloz.</displayName>
-				<unitPattern count="one">{0} vloz.</unitPattern>
-				<unitPattern count="other">{0} vloz.</unitPattern>
+				<unitPattern count="one">{0} vl.oz.</unitPattern>
+				<unitPattern count="other">{0} vl.oz.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-imperial">
+				<displayName>Imp. vl.oz.</displayName>
+				<unitPattern count="one">{0} vl.oz. Imp.</unitPattern>
+				<unitPattern count="other">{0} vl.oz. Imp.</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>eetl.</displayName>
@@ -7110,7 +7169,13 @@
 				<unitPattern count="one">{0} teel.</unitPattern>
 				<unitPattern count="other">{0} teel.</unitPattern>
 			</unit>
+			<unit type="volume-barrel">
+				<displayName>vat</displayName>
+				<unitPattern count="one">{0} bbl</unitPattern>
+				<unitPattern count="other">{0} bbl</unitPattern>
+			</unit>
 			<coordinateUnit>
+				<displayName>rigting</displayName>
 				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
 				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
@@ -7161,6 +7226,11 @@
 				<unitPattern count="one">{0} vt.²</unitPattern>
 				<unitPattern count="other">{0} vt.²</unitPattern>
 			</unit>
+			<unit type="concentr-percent">
+				<displayName>%</displayName>
+				<unitPattern count="one">{0}%</unitPattern>
+				<unitPattern count="other">{0}%</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100kilometers">
 				<displayName>ℓ/100km</displayName>
 				<unitPattern count="one">{0} ℓ/100km</unitPattern>
@@ -7328,6 +7398,7 @@
 				<unitPattern count="other">{0} ℓ</unitPattern>
 			</unit>
 			<coordinateUnit>
+				<displayName>rigting</displayName>
 				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
 				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
@@ -7487,4 +7558,74 @@
 		<characterLabel type="western_asian_scripts">Wes-Asiese skrifte</characterLabel>
 		<characterLabel type="whitespace">Witspasie</characterLabel>
 	</characterLabels>
+	<typographicNames>
+		<axisName type="ital">skuinsdruk</axisName>
+		<axisName type="opsz">optiese grootte</axisName>
+		<axisName type="slnt">skuins</axisName>
+		<axisName type="wdth">wydte</axisName>
+		<axisName type="wght">gewig</axisName>
+		<styleName type="ital" subtype="1">kursief</styleName>
+		<styleName type="opsz" subtype="8">onderskrif</styleName>
+		<styleName type="opsz" subtype="12">teks</styleName>
+		<styleName type="opsz" subtype="18">kantel</styleName>
+		<styleName type="opsz" subtype="72">vertoon</styleName>
+		<styleName type="opsz" subtype="144">plakkaat</styleName>
+		<styleName type="slnt" subtype="-12">skuins na agtertoe</styleName>
+		<styleName type="slnt" subtype="0">regop</styleName>
+		<styleName type="slnt" subtype="12">skuins</styleName>
+		<styleName type="slnt" subtype="24">ekstra skuins</styleName>
+		<styleName type="wdth" subtype="50">ultragekondenseerd</styleName>
+		<styleName type="wdth" subtype="50" alt="compressed">ultrasaamgepers</styleName>
+		<styleName type="wdth" subtype="50" alt="narrow">ultranou</styleName>
+		<styleName type="wdth" subtype="62.5">ekstra gekondenseerd</styleName>
+		<styleName type="wdth" subtype="62.5" alt="compressed">ekstra saamgepers</styleName>
+		<styleName type="wdth" subtype="62.5" alt="narrow">ekstra nou</styleName>
+		<styleName type="wdth" subtype="75">gekondenseerd</styleName>
+		<styleName type="wdth" subtype="75" alt="compressed">saamgepers</styleName>
+		<styleName type="wdth" subtype="75" alt="narrow">saamgepers</styleName>
+		<styleName type="wdth" subtype="87.5">semigekondenseerd</styleName>
+		<styleName type="wdth" subtype="87.5" alt="compressed">semisaamgepers</styleName>
+		<styleName type="wdth" subtype="87.5" alt="narrow">seminou</styleName>
+		<styleName type="wdth" subtype="100">normaal</styleName>
+		<styleName type="wdth" subtype="112.5">semi-uitgesit</styleName>
+		<styleName type="wdth" subtype="112.5" alt="extended">semi-uitgebrei</styleName>
+		<styleName type="wdth" subtype="112.5" alt="wide">semiwyd</styleName>
+		<styleName type="wdth" subtype="125">uitgesit</styleName>
+		<styleName type="wdth" subtype="125" alt="extended">uitgebrei</styleName>
+		<styleName type="wdth" subtype="125" alt="wide">wyd</styleName>
+		<styleName type="wdth" subtype="150">ekstra uitgesit</styleName>
+		<styleName type="wdth" subtype="150" alt="extended">ekstra uitgebrei</styleName>
+		<styleName type="wdth" subtype="150" alt="wide">ekstra wyd</styleName>
+		<styleName type="wdth" subtype="200">ultra-uitgesit</styleName>
+		<styleName type="wdth" subtype="200" alt="extended">ultra-uitgebrei</styleName>
+		<styleName type="wdth" subtype="200" alt="wide">ultrawyd</styleName>
+		<styleName type="wght" subtype="100">dun</styleName>
+		<styleName type="wght" subtype="200">ekstra lig</styleName>
+		<styleName type="wght" subtype="200" alt="ultra">ultralig</styleName>
+		<styleName type="wght" subtype="300">lig</styleName>
+		<styleName type="wght" subtype="350">semilig</styleName>
+		<styleName type="wght" subtype="380">boek</styleName>
+		<styleName type="wght" subtype="400">gewoon</styleName>
+		<styleName type="wght" subtype="500">medium</styleName>
+		<styleName type="wght" subtype="600">semivetdruk</styleName>
+		<styleName type="wght" subtype="600" alt="demi">halfvetdruk</styleName>
+		<styleName type="wght" subtype="700">vetdruk</styleName>
+		<styleName type="wght" subtype="800">ekstra vetdruk</styleName>
+		<styleName type="wght" subtype="900">swart</styleName>
+		<styleName type="wght" subtype="900" alt="heavy">swaar</styleName>
+		<styleName type="wght" subtype="950">ekstra swart</styleName>
+		<styleName type="wght" subtype="950" alt="ultrablack">ultraswart</styleName>
+		<styleName type="wght" subtype="950" alt="ultraheavy">ultraswaar</styleName>
+		<featureName type="afrc">vertikale breukdele</featureName>
+		<featureName type="cpsp">hoofletterspasiëring</featureName>
+		<featureName type="dlig">opsionele koppelletters</featureName>
+		<featureName type="frac">diagonale breukdele</featureName>
+		<featureName type="lnum">liniëringnommers</featureName>
+		<featureName type="onum">oudstylfigure</featureName>
+		<featureName type="ordn">rangtelwoorde</featureName>
+		<featureName type="pnum">proporsionele nommers</featureName>
+		<featureName type="smcp">klein hoofletters</featureName>
+		<featureName type="tnum">tabelvormige nommers</featureName>
+		<featureName type="zero">deurkruisde nul</featureName>
+	</typographicNames>
 </ldml>
--- a/make/data/cldr/common/main/af_NA.xml	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/main/af_NA.xml	Wed May 08 12:45:02 2019 -0700
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2018 Unicode, Inc.
+<!-- Copyright © 1991-2019 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/)
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 13869 $"/>
+		<version number="$Revision: 14822 $"/>
 		<language type="af"/>
 		<territory type="NA"/>
 	</identity>
@@ -50,6 +50,28 @@
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 			</calendar>
 		</calendars>
 	</dates>
--- a/make/data/cldr/common/main/af_ZA.xml	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/main/af_ZA.xml	Wed May 08 12:45:02 2019 -0700
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2018 Unicode, Inc.
+<!-- Copyright © 1991-2019 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/)
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 13869 $"/>
+		<version number="$Revision: 14769 $"/>
 		<language type="af"/>
 		<territory type="ZA"/>
 	</identity>
--- a/make/data/cldr/common/main/agq.xml	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/main/agq.xml	Wed May 08 12:45:02 2019 -0700
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2018 Unicode, Inc.
+<!-- Copyright © 1991-2019 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/)
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 13911 $"/>
+		<version number="$Revision: 14782 $"/>
 		<language type="agq"/>
 	</identity>
 	<localeDisplayNames>
--- a/make/data/cldr/common/main/agq_CM.xml	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/main/agq_CM.xml	Wed May 08 12:45:02 2019 -0700
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2018 Unicode, Inc.
+<!-- Copyright © 1991-2019 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/)
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 13869 $"/>
+		<version number="$Revision: 14782 $"/>
 		<language type="agq"/>
 		<territory type="CM"/>
 	</identity>
--- a/make/data/cldr/common/main/ak.xml	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/main/ak.xml	Wed May 08 12:45:02 2019 -0700
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2018 Unicode, Inc.
+<!-- Copyright © 1991-2019 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/)
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 13911 $"/>
+		<version number="$Revision: 14782 $"/>
 		<language type="ak"/>
 	</identity>
 	<localeDisplayNames>
--- a/make/data/cldr/common/main/ak_GH.xml	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/main/ak_GH.xml	Wed May 08 12:45:02 2019 -0700
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2018 Unicode, Inc.
+<!-- Copyright © 1991-2019 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/)
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 13869 $"/>
+		<version number="$Revision: 14782 $"/>
 		<language type="ak"/>
 		<territory type="GH"/>
 	</identity>
--- a/make/data/cldr/common/main/am.xml	Wed May 08 21:32:38 2019 +0200
+++ b/make/data/cldr/common/main/am.xml	Wed May 08 12:45:02 2019 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2018 Unicode, Inc.
+<!-- Copyright © 1991-2019 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/)
@@ -9,7 +9,7 @@
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 13911 $"/>
+		<version number="$Revision: 14982 $"/>
 		<language type="am"/>
 	</identity>
 	<localeDisplayNames>
@@ -49,7 +49,7 @@
 			<language type="as">አሳሜዛዊ</language>
 			<language type="asa">አሱ</language>
 			<language type="ase">የአሜሪካ የምልክት ቋንቋ</language>
-			<language type="ast">አውስትሪያን</language>
+			<language type="ast">አስቱሪያን</language>
 			<language type="av">አቫሪክ</language>
 			<language type="awa">አዋድሂ</language>
 			<language type="ay">አያማርኛ</language>
@@ -136,7 +136,7 @@
 			<language type="dsb">የታችኛው ሰርቢያንኛ</language>
 			<language type="dtp">ሴንተራል ዱሰን</language>
 			<language type="dua">ዱዋላኛ</language>
-			<language type="dv">ዲቬህ</language>
+			<language type="dv">ዲቬሂ</language>
 			<language type="dyo">ጆላ ፎንያኛ</language>
 			<language type="dyu">ድዩላ</language>
 			<language type="dz">ድዞንግኻኛ</language>
@@ -260,7 +260,7 @@
 			<language type="ks">ካሽሚርኛ</language>
 			<language type="ksb">ሻምባላ</language>
 			<language type="ksf">ባፊያ</language>
-			<language type="ksh">ኮሎኝያን</language>
+			<language type="ksh">ኮሎኝኛ</language>
 			<language type="ku">ኩርድሽኛ</language>
 			<language type="kum">ኩማይክ</language>
 			<language type="kv">ኮሚ</language>
@@ -304,7 +304,7 @@
 			<language type="min">ሚናንግካባኡ</language>
 			<language type="mk">ማሴዶንኛ</language>
 			<language type="ml">ማላያላምኛ</language>
-			<language type="mn">ሞንጎላዊኛ</language>
+			<language type="mn">ሞንጎሊያኛ</language>
 			<language type="mni">ማኒፑሪ</language>
 			<language type="moh">ሞሃውክ</language>
 			<language type="mos">ሞሲ</language>
@@ -327,7 +327,7 @@
 			<language type="nds">የታችኛው ጀርመን</language>
 			<language type="nds_NL">የታችኛው ሳክሰን</language>
 			<language type="ne">ኔፓሊኛ</language>
-			<language type="new">ነዋሪ</language>
+			<language type="new">ኒዋሪ(ኔፓል)</language>
 			<language type="ng">ንዶንጋ</language>
 			<language type="nia">ኒአስ</language>
 			<language type="niu">ኒዩአንኛ</language>
@@ -412,7 +412,7 @@
 			<language type="snk">ሶኒንኬ</language>
 			<language type="so">ሱማልኛ</language>
 			<language type="sq">አልባንያንኛ</language>
-			<language type="sr">ሰርቢኛ</language>
+			<language type="sr">ሰርብያኛ</language>
 			<language type="srn">ስራናን ቶንጎ</language>
 			<language type="ss">ስዋቲኛ</language>
 			<language type="ssy">ሳሆኛ</language>
@@ -450,7 +450,7 @@
 			<language type="twq">ታሳዋቅ</language>
 			<language type="ty">ታሂታንኛ</language>
 			<language type="tyv">ቱቪንያንኛ</language>
-			<language type="tzm">መካከለኛ አትላስ ታማዚግት</language>
+			<language type="tzm">መካከለኛው አትላስ ታማዚኛ</language>
 			<language type="udm">ኡድሙርት</language>
 			<language type="ug">ኡዊግሁርኛ</language>
 			<language type="ug" alt="variant">ኡይገር</language>
@@ -578,17 +578,17 @@
 			<territory type="019">አሜሪካ</territory>
 			<territory type="021">ሰሜናዊ አሜሪካ</territory>
 			<territory type="029">ካሪቢያን</territory>
-			<territory type="030">ምዕራባዊ እሲያ</territory>
+			<territory type="030">ምስራቃዊ እስያ</territory>
 			<territory type="034">ደቡባዊ እሲያ</territory>
 			<territory type="035">ምዕራባዊ ደቡብ እሲያ</territory>
 			<territory type="039">ደቡባዊ አውሮፓ</territory>
-			<territory type="053">አውስትራሊያ</territory>
+			<territory type="053">አውስትራሌዥያ</territory>
 			<territory type="054">ሜላኔዥያ</territory>
 			<territory type="057">የማይክሮኔዥያን ክልል</territory>
 			<territory type="061">ፖሊኔዥያ</territory>
 			<territory type="142">እሲያ</territory>
 			<territory type="143">መካከለኛው እሲያ</territory>
-			<territory type="145">ምስራቃዊ እሲያ</territory>
+			<territory type="145">ምዕራባዊ እስያ</territory>
 			<territory type="150">አውሮፓ</territory>
 			<territory type="151">ምዕራባዊ አውሮፓ</territory>
 			<territory type="154">ሰሜናዊ አውሮፓ</territory>
@@ -653,9 +653,9 @@
 			<territory type="CU">ኩባ</territory>
 			<territory type="CV">ኬፕ ቬርዴ</territory>
 			<territory type="CW">ኩራሳዎ</territory>
-			<territory type="CX">የገና ደሴት</territory>
+			<territory type="CX">ክሪስማስ ደሴት</territory>
 			<territory type="CY">ሳይፕረስ</territory>
-			<territory type="CZ">ቼችኒያ</territory>
+			<territory type="CZ">ቼቺያ</territory>
 			<territory type="CZ" alt="variant">ቼክ ሪፑብሊክ</territory>
 			<territory type="DE">ጀርመን</territory>
 			<territory type="DG">ዲዬጎ ጋርሺያ</territory>
@@ -683,7 +683,7 @@
 			<territory type="FR">ፈረንሳይ</territory>
 			<territory type="GA">ጋቦን</territory>
 			<territory type="GB">ዩናይትድ ኪንግደም</territory>
-			<territory type="GB" alt="short">ዩናይትድ ኪንግደም</territory>
+			<territory type="GB" alt="short">ዩኬ</territory>
 			<territory type="GD">ግሬናዳ</territory>
 			<territory type="GE">ጆርጂያ</territory>
 			<territory type="GF">የፈረንሳይ ጉዊአና</territory>
@@ -752,8 +752,7 @@
 			<territory type="MF">ሴንት ማርቲን</territory>
 			<territory type="MG">ማዳጋስካር</territory>
 			<territory type="MH">ማርሻል አይላንድ</territory>
-			<territory type="MK">መቄዶንያ</territory>
-			<territory type="MK" alt="variant">መቄዶንያ (የቀድሞ የዩጎስላቭ መቄዶንያ ሪፐብሊክ)</territory>
+			<territory type="MK">ሰሜን መቄዶንያ</territory>
 			<territory type="ML">ማሊ</territory>
 			<territory type="MM">ማይናማር(በርማ)</territory>
 			<territory type="MN">ሞንጎሊያ</territory>
@@ -826,6 +825,7 @@
 			<territory type="SX">ሲንት ማርተን</territory>
 			<territory type="SY">ሲሪያ</territory>
 			<territory type="SZ">ሱዋዚላንድ</territory>
+			<territory type="SZ" alt="variant">ስዋዚላንድ</territory>
 			<territory type="TA">ትሪስታን ዲ ኩንሃ</territory>
 			<territory type="TC">የቱርኮችና የካኢኮስ ደሴቶች</territory>
 			<territory type="TD">ቻድ</territory>
@@ -834,7 +834,7 @@
 			<territory type="TH">ታይላንድ</territory>
 			<territory type="TJ">ታጃኪስታን</territory>
 			<territory type="TK">ቶክላው</territory>
-			<territory type="TL">ምስራቅ ሌስት</territory>
+			<territory type="TL">ቲሞር ሌስቴ</territory>
 			<territory type="TL" alt="variant">ምስራቅ ቲሞር</territory>
 			<territory type="TM">ቱርክሜኒስታን</territory>
 			<territory type="TN">ቱኒዚያ</territory>
@@ -900,7 +900,7 @@
 			<type key="calendar" type="gregorian">የግሪጎሪያን የቀን አቆጣጠር</type>
 			<type key="calendar" type="hebrew">የእብራዊያን የቀን አቆጣጠር</type>
 			<type key="calendar" type="indian">የህንድ ብሔራዊ የቀን አቆጣጠር</type>
-			<type key="calendar" type="islamic">የእስላማዊ የሰዓት አቆጣጠር</type>
+			<type key="calendar" type="islamic">እስላማዊ የቀን አቆጣጠር</type>
 			<type key="calendar" type="islamic-civil">የእስላም ህዝባዊ የቀን አቆጣጠር</type>
 			<type key="calendar" type="iso8601">ISO-8601 የቀን አቆጣጠር</type>
 			<type key="calendar" type="japanese">የጃፓን የቀን አቆጣጠር</type>
@@ -941,7 +941,7 @@
 			<type key="colStrength" type="secondary">የፊደል ጭረቶችን ደርድር</type>
 			<type key="colStrength" type="tertiary">የፊደል ጭረቶች/መልከፊደል/ስፋት ደርድር</type>
 			<type key="d0" type="fwidth">ሙሉ ወርድ</type>
-			<type key="d0" type="hwidth">ሃልፍዊድዝ</type>
+			<type key="d0" type="hwidth">ግማሽ ወርድ</type>
 			<type key="d0" type="npinyin">አሃዛዊ</type>
 			<type key="hc" type="h11">የ12 ሰዓት ስርዓት (0–11)</type>
 			<type key="hc" type="h12">የ12 ሰዓት ስርዓት (1–12)</type>
@@ -961,7 +961,7 @@
 			<type key="numbers" type="armnlow">የአሜሪካን ንዑስ ሆሄ አሃዞች</type>
 			<type key="numbers" type="beng">የቤንጋሊ አሃዞች</type>
 			<type key="numbers" type="deva">የዴቫንጋሪ አሃዞች</type>
-			<type key="numbers" type="ethi">የኢትዮፒክ ቁጥሮች</type>
+			<type key="numbers" type="ethi">የኢትዮጵያ ቁጥሮች</type>
 			<type key="numbers" type="finance">የፋይናንስ ቁጥሮች</type>
 			<type key="numbers" type="fullwide">የሙሉ ወርድ አሃዞች</type>
 			<type key="numbers" type="geor">የጆርጂያን ቁጥሮች</type>
@@ -1009,8 +1009,7 @@
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[ሀ ሁ ሂ ሃ ሄ ህ ሆ ለ ሉ ሊ ላ ሌ ል ሎ ሏ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ሗ መ ሙ ሚ ማ ሜ ም ሞ ሟ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ሧ ረ ሩ ሪ ራ ሬ ር ሮ ሯ ሰ ሱ ሲ ሳ ሴ ስ ሶ ሷ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቈ ቊ ቋ ቌ ቍ በ ቡ ቢ ባ ቤ ብ ቦ ቧ ቨ ቩ ቪ ቫ ቬ ቭ ቮ ቯ ተ ቱ ቲ ታ ቴ ት ቶ ቷ ቸ ቹ ቺ ቻ ቼ ች ቾ ቿ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ ኗ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ኟ አ ኡ ኢ ኣ ኤ እ ኦ ኧ ከ ኩ ኪ ካ ኬ ክ ኮ ኰ ኲ ኳ ኴ ኵ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ወ ዉ ዊ ዋ ዌ ው ዎ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ዟ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ የ ዩ ዪ ያ ዬ ይ ዮ ደ ዱ ዲ ዳ ዴ ድ ዶ ዷ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ገ ጉ ጊ ጋ ጌ ግ ጎ ጐ ጒ ጓ ጔ ጕ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጧ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ጷ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ጿ ፀ ፁ ፂ ፃ ፄ ፅ ፆ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፏ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ፗ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
-		<exemplarCharacters type="index" draft="unconfirmed">[ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ]</exemplarCharacters>
+		<exemplarCharacters type="index" draft="contributed">[ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[‐ – , ፡ ፣ ፤ ፥ ፦ ! ? . ። ‹ › « » ( ) \[ \]]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
@@ -1531,6 +1530,19 @@
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="ethiopic-amete-alem">
+				<eras>
+					<eraNames>
+						<era type="0">ERA0</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">ERA0</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">ERA0</era>
+					</eraNarrow>
+				</eras>
+			</calendar>
 			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -1589,7 +1601,7 @@
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d፣ y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E MMM d፣ y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
@@ -1630,6 +1642,15 @@
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">h B – h B</greatestDifference>
+							<greatestDifference id="h">h–h B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm B</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
@@ -1944,7 +1965,7 @@
 							<dayPeriod type="noon">ቀትር</dayPeriod>
 							<dayPeriod type="pm">ከሰዓት</dayPeriod>
 							<dayPeriod type="morning1">ጥዋት1</dayPeriod>
-							<dayPeriod type="afternoon1">ከሰዓት1</dayPeriod>
+							<dayPeriod type="afternoon1">ከሰዓት 7</dayPeriod>
 							<dayPeriod type="evening1">ማታ1</dayPeriod>
 							<dayPeriod type="night1">ሌሊት1</dayPeriod>
 						</dayPeriodWidth>
@@ -1964,7 +1985,7 @@
 							<dayPeriod type="noon">ቀትር</dayPeriod>
 							<dayPeriod type="pm">ከሰዓት</dayPeriod>
 							<dayPeriod type="morning1">ጥዋት1</dayPeriod>
-							<dayPeriod type="afternoon1">ከሰዓት1</dayPeriod>
+							<dayPeriod type="afternoon1">ከሰዓት 7 ሰዓት</dayPeriod>
 							<dayPeriod type="evening1">ማታ1</dayPeriod>
 							<dayPeriod type="night1">ሌሊት1</dayPeriod>
 						</dayPeriodWidth>
@@ -2012,7 +2033,6 @@
 					<eraAbbr>
 						<era type="0">ዓ/ዓ</era>
 						<era type="1">ዓ/ም</era>
-						<era type="1" alt="variant">CE</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">ዓ/ዓ</era>
@@ -2022,7 +2042,7 @@
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE ፣d MMMM y</pattern>
+							<pattern>y MMMM d, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -2099,8 +2119,8 @@
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">MMM d፣ y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E፣ MMM d፣ y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
@@ -2119,8 +2139,6 @@
 						<dateFormatItem id="MMMEd">E፣ MMM d</dateFormatItem>
 						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E፣ MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="one">'week' W 'of' MMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other">'week' W 'of' MMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
@@ -2132,17 +2150,62 @@
 						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
-						<dateFormatItem id="yw" count="one">'week' w 'of' Y</dateFormatItem>
-						<dateFormatItem id="yw" count="other">'week' w 'of' Y</dateFormatItem>
 					</availableFormats>
 					<appendItems>
 						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">h B – h B</greatestDifference>
+							<greatestDifference id="h">h–h B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm B</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">GGGGG M/y – GGGGG M/y</greatestDifference>
+							<greatestDifference id="M">GGGGG M/y – M/y</greatestDifference>
+							<greatestDifference id="y">GGGGG M/y – M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">GGGGG d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="G">GGGGG d/M/y – GGGGG d/M/y</greatestDifference>
+							<greatestDifference id="M">GGGGG d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">GGGGG d/M/y – d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd, E – GGGGG y-MM-dd, E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G MMM y – G MMM y</greatestDifference>
+							<greatestDifference id="M">G MMM–MMM፣ y</greatestDifference>
+							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G MMM d–d፣ y</greatestDifference>
+							<greatestDifference id="G">G MMM d፣ y – G MMM d፣ y</greatestDifference>
+							<greatestDifference id="M">G MMM d – MMM d፣ y</greatestDifference>
+							<greatestDifference id="y">G MMM d፣ y – MMM d፣ y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G E MMM d – E MMM d፣ y</greatestDifference>
+							<greatestDifference id="G">G E፣ MMM d፣ y – G E፣ MMM d፣ y</greatestDifference>
+							<greatestDifference id="M">G E MMM d፣ y – E MMM d</greatestDifference>
+							<greatestDifference id="y">G E፣ MMM d፣ y – E፣ MMM d፣ y</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
@@ -2195,7 +2258,7 @@
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E d – E d፣ MMM</greatestDifference>
-							<greatestDifference id="M">E፣ MMM d – E፣ MMM d</greatestDifference>
+							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
@@ -2210,7 +2273,7 @@
 							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E፣ d/M/y – E፣ d/M/y</greatestDifference>
+							<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
 							<greatestDifference id="M">E d/M/ – E d/M፣ y</greatestDifference>
 							<greatestDifference id="y">E፣ d/M/y – E፣ d/M/y</greatestDifference>
 						</intervalFormatItem>
@@ -4260,16 +4323,16 @@
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>የመካከለኛ ሰዓት አቆጣጠር</generic>
-					<standard>የመካከለኛ መደበኛ ሰዓት አቆጣጠር</standard>
+					<generic>የሰሜን አሜሪካ የመካከለኛ ሰዓት አቆጣጠር</generic>
+					<standard>የሰሜን አሜሪካ የመካከለኛ መደበኛ ሰዓት አቆጣጠር</standard>
 					<daylight>የመካከለኛ የቀን ሰዓት አቆጣጠር</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>የምዕራባዊ ሰዓት አቆጣጠር</generic>
-					<standard>የምዕራባዊ መደበኛ የሰዓት አቆጣጠር</standard>
-					<daylight>የምዕራባዊ የቀን ሰዓት አቆጣጠር</daylight>
+					<generic>ምስራቃዊ ሰዓት አቆጣጠር</generic>
+					<standard>ምስራቃዊ መደበኛ ሰዓት አቆጣጠር</standard>
+					<daylight>ምስራቃዊ የቀን ሰዓት አቆጣጠር</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
@@ -5120,32 +5183,20 @@
 		</timeZoneNames>
 	</dates>
 	<numbers>
-		<defaultNumberingSystem>latn</defaultNumberingSystem>
 		<otherNumberingSystems>
-			<native>latn</native>
 			<traditional>ethi</traditional>
 		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
 		<symbols numberSystem="latn">
-			<decimal>.</decimal>
-			<group>,</group>
 			<list>;</list>
 			<percentSign>%</percentSign>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
 			<exponential>E</exponential>
 			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
 			<decimalFormatLength type="long">
 				<decimalFormat>
 					<pattern type="1000" count="one">0 ሺ</pattern>
@@ -5262,44 +5313,37 @@
 				<displayName>የተባበሩት የአረብ ኤምሬትስ ድርሀም</displayName>
 				<displayName count="one">የተባበሩት የአረብ ኤምሬትስ ድርሀም</displayName>
 				<displayName count="other">የተባበሩት የአረብ ኤምሬትስ ድርሀም</displayName>
-				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFN">
 				<displayName>የአፍጋን አፍጋኒ</displayName>
 				<displayName count="one">የአፍጋን አፍጋኒ</displayName>
 				<displayName count="other">የአፍጋን አፍጋኒ</displayName>
-				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALL">
 				<displayName>የአልባንያ ሌክ</displayName>
 				<displayName count="one">የአልባንያ ሌክ</displayName>
 				<displayName count="other">የአልባንያ ሌክ</displayName>
-				<symbol>ALL</symbol>
 			</currency>
 			<currency type="AMD">
 				<displayName>የአርመን ድራም</displayName>
 				<displayName count="one">የአርመን ድራም</displayName>
 				<displayName count="other">የአርመን ድራም</displayName>
-				<symbol>AMD</symbol>
 			</currency>
 			<currency type="ANG">
 				<displayName>ኔዘርላንድስ አንቲሊአን ጊልደር</displayName>
 				<displayName count="one">ኔዘርላንድስ አንቲሊአን ጊልደር</displayName>
 				<displayName count="other">ኔዘርላንድስ አንቲሊአን ጊልደር</displayName>
-				<symbol>ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>የአንጎላ ኩዋንዛ</displayName>
 				<displayName count="one">የአንጎላ ኩዋንዛ</displayName>
 				<displayName count="other">የአንጎላ ኩዋንዛ</displayName>
-				<symbol>AOA</symbol>
 				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>የአርጀንቲና ፔሶ</displayName>
 				<displayName count="one">የአርጀንቲና ፔሶ</displayName>
 				<displayName count="other">የአርጀንቲና ፔሶ</displayName>
-				<symbol>ARS</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AUD">
@@ -5313,145 +5357,123 @@
 				<displayName>አሩባን ፍሎሪን</displayName>
 				<displayName count="one">አሩባን ፍሎሪን</displayName>
 				<displayName count="other">አሩባን ፍሎሪን</displayName>
-				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZN">
 				<displayName>የአዛርባጃን ማናት</displayName>
 				<displayName count="one">የአዛርባጃን ማናት</displayName>
 				<displayName count="other">የአዛርባጃን ማናት</displayName>
-				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAM">
 				<displayName>የቦስኒያ ሄርዞጎቪና የሚመነዘር ማርክ</displayName>
 				<displayName count="one">የቦስኒያ ሄርዞጎቪና የሚመነዘር ማርክ</displayName>
 				<displayName count="other">የቦስኒያ ሄርዞጎቪና የሚመነዘር ማርክ</displayName>
-				<symbol>BAM</symbol>
 				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>የባርቤዶስ ዶላር</displayName>
 				<displayName count="one">የባርቤዶስ ዶላር</displayName>
 				<displayName count="other">የባርቤዶስ ዶላር</displayName>
-				<symbol>BBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>የባንግላዲሽ ታካ</displayName>
 				<displayName count="one">የባንግላዲሽ ታካ</displayName>
 				<displayName count="other">የባንግላዲሽ ታካ</displayName>
-				<symbol>BDT</symbol>
 				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BGN">
 				<displayName>የቡልጋሪያ ሌቭ</displayName>
 				<displayName count="one">የቡልጋሪያ ሌቭ</displayName>
 				<displayName count="other">የቡልጋሪያ ሌቭ</displayName>
-				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BHD">
 				<displayName>የባኽሬን ዲናር</displayName>
 				<displayName count="one">የባኽሬን ዲናር</displayName>
 				<displayName count="other">የባኽሬን ዲናር</displayName>
-				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>የብሩንዲ ፍራንክ</displayName>
 				<displayName count="one">የብሩንዲ ፍራንክ</displayName>
 				<displayName count="other">የብሩንዲ ፍራንክ</displayName>
-				<symbol>BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>የቤርሙዳ ዶላር</displayName>
 				<displayName count="one">የቤርሙዳ ዶላር</displayName>
 				<displayName count="other">የቤርሙዳ ዶላር</displayName>
-				<symbol>BMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>የብሩኔ ዶላር</displayName>
 				<displayName count="one">የብሩኔ ዶላር</displayName>
 				<displayName count="other">የብሩኔ ዶላር</displayName>
-				<symbol>BND</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>የቦሊቪያ ቦሊቪያኖ</displayName>
 				<displayName count="one">የቦሊቪያ ቦሊቪያኖ</displayName>
 				<displayName count="other">የቦሊቪያ ቦሊቪያኖ</displayName>
-				<symbol>BOB</symbol>
 				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>የብራዚል ሪል</displayName>
 				<displayName count="one">የብራዚል ሪል</displayName>
 				<displayName count="other">የብራዚል ሪል</displayName>
-				<symbol>R$</symbol>
 				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
 			<currency type="BSD">
 				<displayName>የባሃማስ ዶላር</displayName>
 				<displayName count="one">የባሃማስ ዶላር</displayName>
 				<displayName count="other">የባሃማስ ዶላር</displayName>
-				<symbol>BSD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>ብሁታኒዝ ንጉልትረም</displayName>
 				<displayName count="one">ብሁታኒዝ ንጉልትረም</displayName>
 				<displayName count="other">ብሁታኒዝ ንጉልትረም</displayName>
-				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BWP">
 				<displayName>የቦትስዋና ፑላ</displayName>
 				<displayName count="one">የቦትስዋና ፑላ</displayName>
 				<displayName count="other">የቦትስዋና ፑላ</displayName>
-				<symbol>BWP</symbol>
 				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYN">
 				<displayName>የቤላሩስያ ሩብል</displayName>
 				<displayName count="one">የቤላሩስያ ሩብል</displayName>
 				<displayName count="other">የቤላሩስያ ሩብል</displayName>
-				<symbol>BYN</symbol>
 				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>የቤላሩስያ ሩብል (2000–2016)</displayName>
 				<displayName count="one">የቤላሩስያ ሩብል (2000–2016)</displayName>
 				<displayName count="other">የቤላሩስያ ሩብል (2000–2016)</displayName>
-				<symbol>BYR</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>የቤሊዝ ዶላር</displayName>
 				<displayName count="one">የቤሊዝ ዶላር</displayName>
 				<displayName count="other">የቤሊዝ ዶላር</displayName>
-				<symbol>BZD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>የካናዳ ዶላር</displayName>
 				<displayName count="one">የካናዳ ዶላር</displayName>
 				<displayName count="other">የካናዳ ዶላር</displayName>
-				<symbol>CA$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>የኮንጐ ፍራንክ ኮንጐሌዝ</displayName>
 				<displayName count="one">የኮንጐ ፍራንክ ኮንጐሌዝ</displayName>
 				<displayName count="other">የኮንጐ ፍራንክ ኮንጐሌዝ</displayName>
-				<symbol>CDF</symbol>
 			</currency>
 			<currency type="CHF">
 				<displayName>የስዊስ ፍራንክ</displayName>
 				<displayName count="one">የስዊስ ፍራንክ</displayName>
 				<displayName count="other">የስዊስ ፍራንክ</displayName>